From e46fd963799f681d69b1eb7f886979e87e0d6340 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 21 May 2014 08:57:31 +0200
Subject: Revert "update version management"

This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.

Conflicts:
	id/ConfigWebTool/pom.xml
---
 id/server/stork2-saml-engine/.classpath            | 32 -------------------
 id/server/stork2-saml-engine/.gitignore            |  1 -
 id/server/stork2-saml-engine/.project              | 36 ----------------------
 .../.settings/org.eclipse.core.resources.prefs     |  5 ---
 .../.settings/org.eclipse.jdt.core.prefs           | 12 --------
 .../.settings/org.eclipse.m2e.core.prefs           |  4 ---
 .../.settings/org.eclipse.wst.common.component     |  5 ---
 .../org.eclipse.wst.common.project.facet.core.xml  |  5 ---
 .../.settings/org.eclipse.wst.validation.prefs     |  2 --
 id/server/stork2-saml-engine/pom.xml               |  4 +--
 10 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 id/server/stork2-saml-engine/.classpath
 delete mode 100644 id/server/stork2-saml-engine/.gitignore
 delete mode 100644 id/server/stork2-saml-engine/.project
 delete mode 100644 id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component
 delete mode 100644 id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs

(limited to 'id/server/stork2-saml-engine')

diff --git a/id/server/stork2-saml-engine/.classpath b/id/server/stork2-saml-engine/.classpath
deleted file mode 100644
index d2bdee1ba..000000000
--- a/id/server/stork2-saml-engine/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/stork2-saml-engine/.gitignore b/id/server/stork2-saml-engine/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/server/stork2-saml-engine/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/server/stork2-saml-engine/.project b/id/server/stork2-saml-engine/.project
deleted file mode 100644
index 74b9c25ba..000000000
--- a/id/server/stork2-saml-engine/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>SamlEngine</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cdfe4f1b6..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 107056a36..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component b/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 5ba2e3ad2..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="SamlEngine">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-    </wb-module>
-</project-modules>
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5c9bd7532..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.6"/>
-</faceted-project>
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index ed5dfa973..5a6621f12 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -156,7 +156,7 @@
 		</pluginManagement>
 		<plugins>
 		
-<!-- 		           	 <plugin>
+		           	 <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -173,7 +173,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
 		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-- 
cgit v1.2.3