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
---
 spss/server/serverws/.classpath                    | 27 ----------------------
 spss/server/serverws/.gitignore                    |  2 --
 .../.settings/org.eclipse.core.resources.prefs     |  2 --
 .../serverws/.settings/org.eclipse.m2e.core.prefs  |  4 ----
 .../.settings/org.eclipse.wst.validation.prefs     |  2 --
 spss/server/serverws/pom.xml                       |  6 ++---
 6 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 spss/server/serverws/.classpath
 delete mode 100644 spss/server/serverws/.gitignore
 delete mode 100644 spss/server/serverws/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 spss/server/serverws/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 spss/server/serverws/.settings/org.eclipse.wst.validation.prefs

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath
deleted file mode 100644
index 0cbbeaa3d..000000000
--- a/spss/server/serverws/.classpath
+++ /dev/null
@@ -1,27 +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 kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</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/spss/server/serverws/.gitignore b/spss/server/serverws/.gitignore
deleted file mode 100644
index 934e0e06f..000000000
--- a/spss/server/serverws/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin
-/target
diff --git a/spss/server/serverws/.settings/org.eclipse.core.resources.prefs b/spss/server/serverws/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/server/serverws/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/server/serverws/.settings/org.eclipse.m2e.core.prefs b/spss/server/serverws/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/server/serverws/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/server/serverws/.settings/org.eclipse.wst.validation.prefs b/spss/server/serverws/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/spss/server/serverws/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 56168a586..ac06946a4 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -10,7 +10,7 @@
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>${moa-spss-version}</version>
+    <version>2.0.1</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
@@ -67,7 +67,7 @@
                 </configuration>
             </plugin>
 
-<!--         		<plugin>
+        		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -84,7 +84,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
         	</plugins>
        </build>
     <dependencies>
-- 
cgit v1.2.3