From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 9 Dec 2014 17:05:29 +0000 (+0000)
Subject: merge from trunk
X-Git-Tag: remoting-3.9.0~234
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d59e5382ea29417d778b89146ac0fef4056c7df2

merge from trunk
---

d59e5382ea29417d778b89146ac0fef4056c7df2
diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index cb24e554d,06b551fc6..b0f6b6896
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -635,19 -597,20 +635,19 @@@ 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/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-io-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-model-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-print-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-services-3.4.0-SNAPSHOT.jar
+  lib/cdmlib-commons-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-commons-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-ext-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-io-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-model-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-print-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-remote-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-services-3.5.0-SNAPSHOT.jar
 -Import-Package: eu.etaxonomy.cdm.api.application