Update cdmlib version to 3.6.3-SNAPSHOT

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 508f6193f46740039ff0f46f52bac418fff2486f..cd1058349ad3c212bebc4bf12b7d992fd731ca8e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>

+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.3-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.3-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 kind="src" path="src/main/java"/>
        <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 kind="src" path="src/main/java"/>


@@ -193,22 +201,6 @@
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>

-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT.jar"/>

        <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index a455f7ddba87a2e5fc6e09f8cca4dcb8fa36617d..879087a8b1a1cd314fe813a5d07a5812bee0be83 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -607,25 +607,17 @@ Bundle-ClassPath: .,
  lib/spring-security-remoting-3.1.3.RELEASE.jar,
  lib/jena-core-2.11.2.jar,
  lib/jena-iri-1.0.2.jar,
  lib/spring-security-remoting-3.1.3.RELEASE.jar,
  lib/jena-core-2.11.2.jar,
  lib/jena-iri-1.0.2.jar,

- lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.6.1-SNAPSHOT.jar,

  lib/poi-3.10-FINAL.jar,
  lib/poi-ooxml-3.10-FINAL.jar,
  lib/xmlbeans-2.3.0.jar,
  lib/poi-ooxml-schemas-3.10-FINAL.jar,
  lib/poi-3.10-FINAL.jar,
  lib/poi-ooxml-3.10-FINAL.jar,
  lib/xmlbeans-2.3.0.jar,
  lib/poi-ooxml-schemas-3.10-FINAL.jar,

- lib/swagger-annotations-1.3.5.jar
+ lib/swagger-annotations-1.3.5.jar,
+ lib/cdmlib-commons-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-io-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-model-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-print-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.6.3-SNAPSHOT.jar,
+ lib/cdmlib-services-3.6.3-SNAPSHOT.jar

 Import-Package: eu.etaxonomy.cdm.api.application
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index e4b3cee83275367360bf150d123a09c0f356a025..c73beec449393674a902c2ad298404ee885ee4d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -193,23 +193,15 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-3.10-FINAL.jar,\\r
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                lib/xmlbeans-2.3.0.jar,\\r
                lib/poi-ooxml-3.10-FINAL.jar,\\r
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                lib/xmlbeans-2.3.0.jar,\\r

-               lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.6.1-SNAPSHOT.jar,\\r
-               lib/swagger-annotations-1.3.5.jar\r
+               lib/swagger-annotations-1.3.5.jar,\\r
+               lib/cdmlib-commons-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.6.3-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.6.3-SNAPSHOT.jar\r

 \r
 jars.compile.order = .\r
 output.. = bin/\r
 \r
 jars.compile.order = .\r
 output.. = bin/\r

diff --git a/pom.xml b/pom.xml
index fe14b1771183c15d86bb651b8f33f7b2947f5f90..512e6c2984ec798e565434ca68344b7d049b0a9d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-    <cdmlib.version>3.6.1-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.6.3-SNAPSHOT</cdmlib.version>

     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
     <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
     <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>