From e46fd963799f681d69b1eb7f886979e87e0d6340 Mon Sep 17 00:00:00 2001 From: Thomas Lenz 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/.project | 17 --------- .../.settings/org.eclipse.core.resources.prefs | 2 -- spss/server/.settings/org.eclipse.jdt.core.prefs | 7 ---- spss/server/.settings/org.eclipse.m2e.core.prefs | 4 --- spss/server/.settings/org.maven.ide.eclipse.prefs | 8 ----- spss/server/pom.xml | 4 +-- spss/server/serverlib/.classpath | 32 ----------------- spss/server/serverlib/.gitignore | 2 -- spss/server/serverlib/.project | 35 ------------------ .../.settings/org.eclipse.core.resources.prefs | 5 --- .../serverlib/.settings/org.eclipse.jdt.core.prefs | 8 ----- .../serverlib/.settings/org.eclipse.m2e.core.prefs | 4 --- .../.settings/org.eclipse.wst.common.component | 8 ----- .../org.eclipse.wst.common.project.facet.core.xml | 7 ---- .../.settings/org.eclipse.wst.validation.prefs | 2 -- .../.settings/org.maven.ide.eclipse.prefs | 8 ----- spss/server/serverlib/pom.xml | 6 ++-- 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 ++-- spss/server/tools/.classpath | 31 ---------------- spss/server/tools/.gitignore | 2 -- spss/server/tools/.project | 42 ---------------------- .../.settings/org.eclipse.core.resources.prefs | 4 --- .../tools/.settings/org.eclipse.jdt.core.prefs | 9 ----- .../tools/.settings/org.eclipse.m2e.core.prefs | 4 --- .../tools/.settings/org.maven.ide.eclipse.prefs | 9 ----- spss/server/tools/pom.xml | 6 ++-- 31 files changed, 11 insertions(+), 298 deletions(-) delete mode 100644 spss/server/.project delete mode 100644 spss/server/.settings/org.eclipse.core.resources.prefs delete mode 100644 spss/server/.settings/org.eclipse.jdt.core.prefs delete mode 100644 spss/server/.settings/org.eclipse.m2e.core.prefs delete mode 100644 spss/server/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spss/server/serverlib/.classpath delete mode 100644 spss/server/serverlib/.gitignore delete mode 100644 spss/server/serverlib/.project delete mode 100644 spss/server/serverlib/.settings/org.eclipse.core.resources.prefs delete mode 100644 spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs delete mode 100644 spss/server/serverlib/.settings/org.eclipse.m2e.core.prefs delete mode 100644 spss/server/serverlib/.settings/org.eclipse.wst.common.component delete mode 100644 spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs delete mode 100644 spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs 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 delete mode 100644 spss/server/tools/.classpath delete mode 100644 spss/server/tools/.gitignore delete mode 100644 spss/server/tools/.project delete mode 100644 spss/server/tools/.settings/org.eclipse.core.resources.prefs delete mode 100644 spss/server/tools/.settings/org.eclipse.jdt.core.prefs delete mode 100644 spss/server/tools/.settings/org.eclipse.m2e.core.prefs delete mode 100644 spss/server/tools/.settings/org.maven.ide.eclipse.prefs (limited to 'spss/server') diff --git a/spss/server/.project b/spss/server/.project deleted file mode 100644 index e9b8d8502..000000000 --- a/spss/server/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - moa-spss - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/spss/server/.settings/org.eclipse.core.resources.prefs b/spss/server/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/spss/server/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/spss/server/.settings/org.eclipse.jdt.core.prefs b/spss/server/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 046ca3fd3..000000000 --- a/spss/server/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Thu Jan 03 11:06:02 CET 2013 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/spss/server/.settings/org.eclipse.m2e.core.prefs b/spss/server/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/spss/server/.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/.settings/org.maven.ide.eclipse.prefs b/spss/server/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 5fed4cf5a..000000000 --- a/spss/server/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spss/server/pom.xml b/spss/server/pom.xml index eb37775c1..08e740cd3 100644 --- a/spss/server/pom.xml +++ b/spss/server/pom.xml @@ -24,7 +24,7 @@ - + diff --git a/spss/server/serverlib/.classpath b/spss/server/serverlib/.classpath deleted file mode 100644 index c2e154781..000000000 --- a/spss/server/serverlib/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spss/server/serverlib/.gitignore b/spss/server/serverlib/.gitignore deleted file mode 100644 index 4dc009173..000000000 --- a/spss/server/serverlib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/bin diff --git a/spss/server/serverlib/.project b/spss/server/serverlib/.project deleted file mode 100644 index 0d5bb33b5..000000000 --- a/spss/server/serverlib/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - moa-spss-lib - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - - diff --git a/spss/server/serverlib/.settings/org.eclipse.core.resources.prefs b/spss/server/serverlib/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647ee..000000000 --- a/spss/server/serverlib/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs b/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd49..000000000 --- a/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +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.compliance=1.6 -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/spss/server/serverlib/.settings/org.eclipse.m2e.core.prefs b/spss/server/serverlib/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/spss/server/serverlib/.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/serverlib/.settings/org.eclipse.wst.common.component b/spss/server/serverlib/.settings/org.eclipse.wst.common.component deleted file mode 100644 index d4b85674b..000000000 --- a/spss/server/serverlib/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 0c619da6d..000000000 --- a/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs b/spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs b/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 5fed4cf5a..000000000 --- a/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 3c29cd88c..fb95746da 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -64,7 +64,7 @@ javax.servlet servlet-api - provided + compile xalan-bin-dist @@ -177,7 +177,7 @@ - + org.apache.maven.plugins 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/=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 @@ MOA.spss.server moa-spss-ws war - ${moa-spss-version} + 2.0.1 MOA SP/SS WebService @@ -67,7 +67,7 @@ - + diff --git a/spss/server/tools/.classpath b/spss/server/tools/.classpath deleted file mode 100644 index 9ae7bca0f..000000000 --- a/spss/server/tools/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spss/server/tools/.gitignore b/spss/server/tools/.gitignore deleted file mode 100644 index 4dc009173..000000000 --- a/spss/server/tools/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/bin diff --git a/spss/server/tools/.project b/spss/server/tools/.project deleted file mode 100644 index d7cefdfa8..000000000 --- a/spss/server/tools/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - moa-spss-tools - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - diff --git a/spss/server/tools/.settings/org.eclipse.core.resources.prefs b/spss/server/tools/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac0..000000000 --- a/spss/server/tools/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/spss/server/tools/.settings/org.eclipse.jdt.core.prefs b/spss/server/tools/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 793f907b5..000000000 --- a/spss/server/tools/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Aug 05 10:52:30 CEST 2013 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/spss/server/tools/.settings/org.eclipse.m2e.core.prefs b/spss/server/tools/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/spss/server/tools/.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/tools/.settings/org.maven.ide.eclipse.prefs b/spss/server/tools/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index de7b9a186..000000000 --- a/spss/server/tools/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Jul 07 16:06:50 CEST 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index f139e962d..880eac2c1 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -9,7 +9,7 @@ MOA.spss.server moa-spss-tools jar - ${moa-spss-version} + 2.0.1 MOA SP/SS Tools @@ -81,7 +81,7 @@ - + -- cgit v1.2.3