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 --- .../moa-id-commons/.settings/org.eclipse.core.resources.prefs | 5 ----- id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs | 5 ----- id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs | 3 --- id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs | 4 ---- .../moa-id-commons/.settings/org.eclipse.wst.common.component | 7 ------- .../.settings/org.eclipse.wst.common.project.facet.core.prefs.xml | 7 ------- .../.settings/org.eclipse.wst.common.project.facet.core.xml | 6 ------ .../moa-id-commons/.settings/org.eclipse.wst.validation.prefs | 2 -- 8 files changed, 39 deletions(-) delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.common.component delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs (limited to 'id/server/moa-id-commons/.settings') diff --git a/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs b/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 95c6d7ddd..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/resources=UTF-8 -encoding//src/main/resources/config=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index abec6ca38..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs deleted file mode 100644 index 3e2d23923..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jpt.core.platform=generic -org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true diff --git a/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/id/server/moa-id-commons/.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/moa-id-commons/.settings/org.eclipse.wst.common.component b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 9e5e3ed1c..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml deleted file mode 100644 index 7961132fd..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 8956fb143..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs b/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 -- cgit v1.2.3