merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / META-INF / MANIFEST.MF

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index d1ac59def13ca9fdbe27be1fd5a353afff2eb151..3a8274a3d5c918bbb978933d67e17c2757c4db20 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.6.0
+Bundle-Version: 3.6.1.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -258,7 +258,6 @@ Export-Package: com.google.api,
  org.apache.lucene.util,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
- org.eclipse.osgi.internal.loader,
  org.eclipse.osgi.util,
  org.h2.jdbc,
  org.hamcrest,
@@ -303,7 +302,6 @@ Export-Package: com.google.api,
  org.joda.time.format;uses:="org.joda.time",
  org.joda.time.tz;uses:="org.joda.time",
  org.junit;uses:="org.hamcrest",
- org.junit.runner,
  org.odftoolkit.odfdom,
  org.odftoolkit.odfdom.doc,
  org.odftoolkit.odfdom.doc.office,
@@ -607,22 +605,22 @@ 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.6.0-sources.jar,
- lib/cdmlib-commons-3.6.0.jar,
- lib/cdmlib-ext-3.6.0-sources.jar,
- lib/cdmlib-ext-3.6.0.jar,
- lib/cdmlib-io-3.6.0-sources.jar,
- lib/cdmlib-io-3.6.0.jar,
- lib/cdmlib-model-3.6.0-sources.jar,
- lib/cdmlib-model-3.6.0.jar,
- lib/cdmlib-persistence-3.6.0-sources.jar,
- lib/cdmlib-persistence-3.6.0.jar,
- lib/cdmlib-print-3.6.0-sources.jar,
- lib/cdmlib-print-3.6.0.jar,
- lib/cdmlib-remote-3.6.0-sources.jar,
- lib/cdmlib-remote-3.6.0.jar,
- lib/cdmlib-services-3.6.0-sources.jar,
- lib/cdmlib-services-3.6.0.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,