diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-21 08:57:31 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-21 08:57:31 +0200 |
commit | e46fd963799f681d69b1eb7f886979e87e0d6340 (patch) | |
tree | f704d0effa2cc07bbcfb402da99aa2c2961472d9 /spss/server/serverws | |
parent | 9766fca0bafff04a06b617d63c89c4b26cc21db4 (diff) | |
download | moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.tar.gz moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.tar.bz2 moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.zip |
Revert "update version management"
This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.
Conflicts:
id/ConfigWebTool/pom.xml
Diffstat (limited to 'spss/server/serverws')
-rw-r--r-- | spss/server/serverws/.classpath | 27 | ||||
-rw-r--r-- | spss/server/serverws/.gitignore | 2 | ||||
-rw-r--r-- | spss/server/serverws/.settings/org.eclipse.core.resources.prefs | 2 | ||||
-rw-r--r-- | spss/server/serverws/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
-rw-r--r-- | spss/server/serverws/.settings/org.eclipse.wst.validation.prefs | 2 | ||||
-rw-r--r-- | spss/server/serverws/pom.xml | 6 |
6 files changed, 3 insertions, 40 deletions
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> |