Revert "fixing cdm version directly in master for release 4.1.1"

This reverts commit 8a6eac640318fe5a4e4b20a44023d41686263123.

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 01561fd5903906759c6b7e9158ac359eff077137..c197e2e6cedaf3a02deb0b90ff39ff8066e921cc 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -28,15 +28,15 @@
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>\r

-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.1.1.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.1.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.1.0-SNAPSHOT/cdmlib-services-4.1.1-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.1.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.1.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.1.0-SNAPSHOT/cdmlib-services-4.1.0-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.1.0.jar"/>\r

        <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 76c9b7cb32bc12667183d3d2e1d1fcdf2c0269e9..9f09d75fa5a0bcf59346fd0abcaa3b055bccc76f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -497,15 +497,15 @@ Bundle-ClassPath: .,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.5.2.jar,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.5.2.jar,

- lib/cdmlib-commons-4.1.1.jar,
- lib/cdmlib-ext-4.1.1.jar,
- lib/cdmlib-io-4.1.1.jar,
- lib/cdmlib-model-4.1.1.jar,
- lib/cdmlib-persistence-4.1.1.jar,
- lib/cdmlib-print-4.1.1.jar,
- lib/cdmlib-remote-4.1.1.jar,
- lib/cdmlib-services-4.1.1.jar,
- lib/cdmlib-test-4.1.1.jar,
+ lib/cdmlib-commons-4.1.0.jar,
+ lib/cdmlib-ext-4.1.0.jar,
+ lib/cdmlib-io-4.1.0.jar,
+ lib/cdmlib-model-4.1.0.jar,
+ lib/cdmlib-persistence-4.1.0.jar,
+ lib/cdmlib-print-4.1.0.jar,
+ lib/cdmlib-remote-4.1.0.jar,
+ lib/cdmlib-services-4.1.0.jar,
+ lib/cdmlib-test-4.1.0.jar,

  lib/cglib-3.2.0.jar,
  lib/cglib-nodep-3.2.0.jar,
  lib/classmate-1.3.1.jar,
  lib/cglib-3.2.0.jar,
  lib/cglib-nodep-3.2.0.jar,
  lib/classmate-1.3.1.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index c3047dc51e808747c58794d867abf08446e838ad..598af2d1e147545b9d396162afa7946115efea98 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -25,15 +25,15 @@ bin.includes = META-INF/,\
                lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
                lib/c3p0-0.9.5.2.jar,\
                lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
                lib/c3p0-0.9.5.2.jar,\

-               lib/cdmlib-commons-4.1.1.jar,\
-               lib/cdmlib-ext-4.1.1.jar,\
-               lib/cdmlib-io-4.1.1.jar,\
-               lib/cdmlib-model-4.1.1.jar,\
-               lib/cdmlib-persistence-4.1.1.jar,\
-               lib/cdmlib-print-4.1.1.jar,\
-               lib/cdmlib-remote-4.1.1.jar,\
-               lib/cdmlib-services-4.1.1.jar,\
-               lib/cdmlib-test-4.1.1.jar,\
+               lib/cdmlib-commons-4.1.0.jar,\
+               lib/cdmlib-ext-4.1.0.jar,\
+               lib/cdmlib-io-4.1.0.jar,\
+               lib/cdmlib-model-4.1.0.jar,\
+               lib/cdmlib-persistence-4.1.0.jar,\
+               lib/cdmlib-print-4.1.0.jar,\
+               lib/cdmlib-remote-4.1.0.jar,\
+               lib/cdmlib-services-4.1.0.jar,\
+               lib/cdmlib-test-4.1.0.jar,\

                lib/cglib-3.2.0.jar,\
                lib/cglib-nodep-3.2.0.jar,\
                lib/classmate-1.3.1.jar,\
                lib/cglib-3.2.0.jar,\
                lib/cglib-nodep-3.2.0.jar,\
                lib/classmate-1.3.1.jar,\

diff --git a/pom.xml b/pom.xml
index afac11bd62f9af4133ff60e68f79b4351c9287b4..68c5e0a313954f3b7f528eb08301f6bd068f7bac 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <cdmlib.version>4.1.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
     <cdmlib.version>4.1.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>

-    <taxeditor.version>4.1.1</taxeditor.version>
+    <taxeditor.version>4.1.0</taxeditor.version>

     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>