From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 24 Oct 2012 14:04:41 +0000 (+0000)
Subject: final commits for move of trunk to 3.0.14-SNAPSHOT
X-Git-Tag: 3.6.0~1024
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d4bf286996d02143ee71dd32c2389297ba0345a8

final commits for move of trunk to 3.0.14-SNAPSHOT
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index e624b3be9..30bc0fc47 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
@@ -110,21 +108,23 @@
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.14-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.14-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.14-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index a2ae2c35b..7312c6efb 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -878,21 +878,21 @@ Bundle-ClassPath: .,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/spring-xml-1.5.6.jar,
  lib/postgresql-9.1-901.jdbc4.jar,
- lib/cdmlib-commons-3.0.13-sources.jar,
- lib/cdmlib-commons-3.0.13.jar,
- lib/cdmlib-ext-3.0.13-sources.jar,
- lib/cdmlib-ext-3.0.13.jar,
- lib/cdmlib-io-3.0.13-sources.jar,
- lib/cdmlib-io-3.0.13.jar,
- lib/cdmlib-model-3.0.13-sources.jar,
- lib/cdmlib-model-3.0.13.jar,
- lib/cdmlib-persistence-3.0.13-sources.jar,
- lib/cdmlib-persistence-3.0.13.jar,
- lib/cdmlib-print-3.0.13-sources.jar,
- lib/cdmlib-print-3.0.13.jar,
- lib/cdmlib-remote-3.0.13-sources.jar,
- lib/cdmlib-remote-3.0.13.jar,
- lib/cdmlib-services-3.0.13-sources.jar,
- lib/cdmlib-services-3.0.13.jar,
  lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
- lib/identificationKeyAPI-1.0-SNAPSHOT.jar
+ lib/identificationKeyAPI-1.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-io-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-model-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-print-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.0.14-SNAPSHOT.jar,
+ lib/cdmlib-services-3.0.14-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.0.14-SNAPSHOT.jar
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 3dab30dfe..e2fcb862f 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -121,24 +121,24 @@ bin.includes = META-INF/,\
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\
                lib/spring-xml-1.5.6.jar,\
                lib/postgresql-9.1-901.jdbc4.jar,\
-               lib/cdmlib-commons-3.0.13-sources.jar,\
-               lib/cdmlib-commons-3.0.13.jar,\
-               lib/cdmlib-ext-3.0.13-sources.jar,\
-               lib/cdmlib-ext-3.0.13.jar,\
-               lib/cdmlib-io-3.0.13-sources.jar,\
-               lib/cdmlib-io-3.0.13.jar,\
-               lib/cdmlib-model-3.0.13-sources.jar,\
-               lib/cdmlib-model-3.0.13.jar,\
-               lib/cdmlib-persistence-3.0.13-sources.jar,\
-               lib/cdmlib-persistence-3.0.13.jar,\
-               lib/cdmlib-print-3.0.13-sources.jar,\
-               lib/cdmlib-print-3.0.13.jar,\
-               lib/cdmlib-remote-3.0.13-sources.jar,\
-               lib/cdmlib-remote-3.0.13.jar,\
-               lib/cdmlib-services-3.0.13-sources.jar,\
-               lib/cdmlib-services-3.0.13.jar,\
                lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\
-               lib/identificationKeyAPI-1.0-SNAPSHOT.jar
+               lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\
+               lib/cdmlib-commons-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-commons-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-ext-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-ext-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-io-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-io-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-model-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-model-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-persistence-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-print-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-print-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-remote-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-remote-3.0.14-SNAPSHOT.jar,\
+               lib/cdmlib-services-3.0.14-SNAPSHOT-sources.jar,\
+               lib/cdmlib-services-3.0.14-SNAPSHOT.jar
 jars.compile.order = cdmLibrary.jar
 src.includes = lib/
 bin.excludes = lib/activation-1.1src.zip,\
diff --git a/pom.xml b/pom.xml
index f315297e7..d16c22629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,9 @@
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.0.13</cdmlib.version><!-- TODO can we use project.version ????? -->
+    <cdmlib.version>3.0.14-SNAPSHOT</cdmlib.version><!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.0.13-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.0.14-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>