From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 4 Feb 2021 22:05:32 +0000 (+0100)
Subject: ref  #9359 try to fix compile error in TaxEditor due to missing objenesis class ... 
X-Git-Tag: 5.20.0^2~8
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/658ad63186a8c39f10806834ef8bf42b185efa7c

ref  #9359 try to fix compile error in TaxEditor due to missing objenesis class (cont.) - move objenesis from printpublisher to cdmlib
---

diff --git a/.gitignore b/.gitignore
index 6d5518a48..5430705dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@ eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
 eu.etaxonomy.taxeditor.local/lib/postgresql-42.*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp-*.war
+eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-*.jar
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 8347b0e6d..67ed88a7f 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -659,7 +659,8 @@ Bundle-ClassPath: .,
  lib/mchange-commons-java-0.2.11.jar,
  lib/iiif-apis-0.3.7.jar,
  lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar,
- lib/mysql-connector-java-8.0.21.jar
+ lib/mysql-connector-java-8.0.21.jar,
+ lib/objenesis-3.1.jar
 Comment: currently excluded - 
  lib/activation-1.1.1.jar,
  lib/avro-1.6.3.jar,
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 5aa27c132..d4f011c89 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -98,7 +98,8 @@ bin.includes = META-INF/,\
                lib/iiif-apis-0.3.7.jar,\
                lib/c3p0-0.9.5.2.jar,\
                lib/mchange-commons-java-0.2.11.jar,\
-               lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar
+               lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar,\
+                lib/objenesis-3.1.jar
 
 #  currently excluded  lib/jta-1.1.jar,lib/hibernate-c3p0-5.0.7.Final.jar,lib/jaxen-1.2.0.jar,lib/lsid-server-1.1.2.jar,\
 #  currently excluded  lib/wsdl4j-1.6.3.jar,lib/avro-1.6.3.jar,lib/activation-1.1.1.jar,\     
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 925b29d08..5958c7c71 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -77,7 +77,8 @@
                 apache-log4j-extras,
                 h2,mysql-connector-java,postgresql,
                 junit,hamcrest-core,commons-dbcp,commons-pool,
-                jboss-transaction-api_1.2_spec
+                jboss-transaction-api_1.2_spec,
+                objenesis
               </includeArtifactIds>
               <outputDirectory>
                 ${basedir}/lib
@@ -523,7 +524,12 @@
        poi:   com.zaxxer:SparseBitSet
        poi-ooxml   commons-compress,curvesapi
      -->
- 
+    <!-- required for dozer, which is probably loaded as spring bean, TODO remove bean -->
+    <dependency>
+        <groupId>org.objenesis</groupId>
+        <artifactId>objenesis</artifactId>
+        <version>3.1</version>
+    </dependency>
 	<!-- logging -->
     <dependency>
         <!-- needed? -->
@@ -569,7 +575,7 @@
 
     <!-- For Unit Tests Start -->
 	<!-- keep junit and its dependency hamcrest here as long as each plugin
-	     has its own unit tests and they junit is not yet added there in a way
+	     has its own unit tests and junit is not yet added there in a way
 	     that it does not appear in production bundles -->
 	<dependency>
         <groupId>junit</groupId>
diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 9118465e3..cbc636f5c 100644
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -50,7 +50,6 @@ Require-Bundle: org.eclipse.osgi,
 Bundle-ClassPath: .,
  lib/cdmlib-print-5.20.0-SNAPSHOT.jar,
  lib/cdmlib-remote-5.20.0-SNAPSHOT.jar
- lib/objenesis-3.1.jar
 Import-Package: org.apache.log4j,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
diff --git a/eu.etaxonomy.taxeditor.printpublisher/build.properties b/eu.etaxonomy.taxeditor.printpublisher/build.properties
index a3a74a514..a7ce066e4 100644
--- a/eu.etaxonomy.taxeditor.printpublisher/build.properties
+++ b/eu.etaxonomy.taxeditor.printpublisher/build.properties
@@ -4,6 +4,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                lib/cdmlib-print-5.20.0-SNAPSHOT.jar,\
                lib/cdmlib-remote-5.20.0-SNAPSHOT.jar,\
-               lib/objenesis-3.1.jar,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index 825a64fd3..32e717d0d 100644
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -78,11 +78,5 @@
 	        <artifactId>fop</artifactId>
 	        <version>2.5</version>
         </dependency>
-        <!-- required for dozer, which is probably loaded as spring bean, TODO remove bean -->
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <version>3.1</version>
-        </dependency>
     </dependencies>
 </project>