ref #9359 try to fix compile error in TaxEditor due to missing objenesis class ...

diff --git a/.gitignore b/.gitignore
index 6d5518a4830d7b433126763087bfc75c9d64f005..5430705dc1d2baf506cc33100a5a3ea83cd47109 100644 (file)
--- 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 8347b0e6d05509a5de3ae7f021a5b53b36338f75..67ed88a7fbe2799f102d44cbf24bbb8e35c5d05b 100644 (file)
--- 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 5aa27c13267adba419670ce9bcbe649ec1a6d254..d4f011c89bf3c8798456f4239607e9398ece447e 100644 (file)
--- 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 925b29d0833bb18f355d87facbf67feba7458a40..5958c7c71e2c278fe5e751e6d666bfb086bfd370 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -77,7 +77,8 @@
                 apache-log4j-extras,\r
                 h2,mysql-connector-java,postgresql,\r
                 junit,hamcrest-core,commons-dbcp,commons-pool,\r
-                jboss-transaction-api_1.2_spec\r
+                jboss-transaction-api_1.2_spec,\r
+                objenesis\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r
@@ -523,7 +524,12 @@
        poi:   com.zaxxer:SparseBitSet\r
        poi-ooxml   commons-compress,curvesapi\r
      -->\r
- \r
+    <!-- required for dozer, which is probably loaded as spring bean, TODO remove bean -->\r
+    <dependency>\r
+        <groupId>org.objenesis</groupId>\r
+        <artifactId>objenesis</artifactId>\r
+        <version>3.1</version>\r
+    </dependency>\r
        <!-- logging -->\r
     <dependency>\r
         <!-- needed? -->\r
@@ -569,7 +575,7 @@
 \r
     <!-- For Unit Tests Start -->\r
        <!-- keep junit and its dependency hamcrest here as long as each plugin\r
-            has its own unit tests and they junit is not yet added there in a way\r
+            has its own unit tests and junit is not yet added there in a way\r
             that it does not appear in production bundles -->\r
        <dependency>\r
         <groupId>junit</groupId>\r

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 9118465e34ff7a1ef24e36f6b0c6bd8dc5c33b4b..cbc636f5c26b95d83583d3d3b2bdbf1fa3e3d210 100644 (file)
--- 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 a3a74a51404f3c1f560ee9f5c7db9572e2789daa..a7ce066e4204721a1326c524692685f2e8be6d00 100644 (file)
--- 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 825a64fd355a71ad06da075148bd7c9e39e63389..32e717d0d1421976cbe0903b81c6aa71a0e9b0e0 100644 (file)
--- 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>