merge of security branch with 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 7312c6efb455e5e0607dba6b7f943540bb246773..3fe59615ed36ff5c8853a546f8388bd504b12b67 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -383,6 +383,7 @@ Export-Package: com.google.api,
    org.hibernate.type,
    org.hibernate.event,
    eu.etaxonomy.cdm.model.common",
+ eu.etaxonomy.cdm.persistence.hibernate.permission,
  eu.etaxonomy.cdm.persistence.query;uses:="org.hibernate,org.hibernate.envers.query,org.hibernate.criterion",
  eu.etaxonomy.cdm.print,
  eu.etaxonomy.cdm.print.out,
@@ -880,19 +881,19 @@ Bundle-ClassPath: .,
  lib/postgresql-9.1-901.jdbc4.jar,
  lib/identificationKeyAPI-1.0-SNAPSHOT-sources.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
+ lib/cdmlib-commons-3.1-sources.jar,
+ lib/cdmlib-commons-3.1.jar,
+ lib/cdmlib-ext-3.1-sources.jar,
+ lib/cdmlib-ext-3.1.jar,
+ lib/cdmlib-io-3.1-sources.jar,
+ lib/cdmlib-io-3.1.jar,
+ lib/cdmlib-model-3.1-sources.jar,
+ lib/cdmlib-model-3.1.jar,
+ lib/cdmlib-persistence-3.1-sources.jar,
+ lib/cdmlib-persistence-3.1.jar,
+ lib/cdmlib-print-3.1-sources.jar,
+ lib/cdmlib-print-3.1.jar,
+ lib/cdmlib-remote-3.1-sources.jar,
+ lib/cdmlib-remote-3.1.jar,
+ lib/cdmlib-services-3.1-sources.jar,
+ lib/cdmlib-services-3.1.jar