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 /common | |
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 'common')
-rw-r--r-- | common/.classpath | 32 | ||||
-rw-r--r-- | common/.gitignore | 1 | ||||
-rw-r--r-- | common/.project | 35 | ||||
-rw-r--r-- | common/.settings/org.eclipse.core.resources.prefs | 5 | ||||
-rw-r--r-- | common/.settings/org.eclipse.jdt.core.prefs | 8 | ||||
-rw-r--r-- | common/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
-rw-r--r-- | common/.settings/org.eclipse.wst.common.component | 8 | ||||
-rw-r--r-- | common/.settings/org.eclipse.wst.common.project.facet.core.xml | 7 | ||||
-rw-r--r-- | common/.settings/org.eclipse.wst.validation.prefs | 2 | ||||
-rw-r--r-- | common/.settings/org.maven.ide.eclipse.prefs | 9 | ||||
-rw-r--r-- | common/pom.xml | 4 |
11 files changed, 2 insertions, 113 deletions
diff --git a/common/.classpath b/common/.classpath deleted file mode 100644 index c2e154781..000000000 --- a/common/.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 excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <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.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/common/.gitignore b/common/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/common/.project b/common/.project deleted file mode 100644 index 38406751b..000000000 --- a/common/.project +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>moa-common</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.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - </natures> -</projectDescription> diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647ee..000000000 --- a/common/.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/<project>=UTF-8 diff --git a/common/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd49..000000000 --- a/common/.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/common/.settings/org.eclipse.m2e.core.prefs b/common/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/common/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/common/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 66fea0f1d..000000000 --- a/common/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> - <wb-module deploy-name="moa-common"> - <wb-resource deploy-path="/" source-path="src/main/java"/> - <wb-resource deploy-path="/" source-path="src/main/resources"/> - <wb-resource deploy-path="/" source-path="/src/main/java"/> - <wb-resource deploy-path="/" source-path="/src/main/resources"/> - </wb-module> -</project-modules> diff --git a/common/.settings/org.eclipse.wst.common.project.facet.core.xml b/common/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 0c619da6d..000000000 --- a/common/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faceted-project> - <fixed facet="jst.java"/> - <fixed facet="jst.utility"/> - <installed facet="jst.utility" version="1.0"/> - <installed facet="jst.java" version="1.6"/> -</faceted-project> diff --git a/common/.settings/org.eclipse.wst.validation.prefs b/common/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/common/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/common/.settings/org.maven.ide.eclipse.prefs b/common/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index fa32b3074..000000000 --- a/common/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Jul 07 16:06:47 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/common/pom.xml b/common/pom.xml index b2f7f652c..cde0c6ed8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -103,7 +103,7 @@ <build> <plugins> -<!-- <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> <version>1.0-alpha-2</version> @@ -120,7 +120,7 @@ </configuration> </execution> </executions> - </plugin> --> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |