ref #9204 remove cdmlib.print dependency Saxon from taxeditor.cdmlib (should be added...

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index d4161051e1bc6494b0eb54b2f07d0cb149dcd7ed..b528d42d71660b4257d5ef925d08e2a185dc3104 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -22,7 +22,7 @@
         <plugin>\r
           <groupId>org.apache.maven.plugins</groupId>\r
           <artifactId>maven-surefire-plugin</artifactId>\r
-          <version>2.7</version>\r
+          <version>2.22.2</version>\r
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
@@ -43,7 +43,7 @@
                 cdmlib-remote-webapp\r
               </excludeArtifactIds>\r
               <includeArtifactIds>\r
-                cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io,cdmlib-remote,cdmlib-print\r
+                cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io\r
               </includeArtifactIds>\r
               <outputDirectory>${basedir}/lib</outputDirectory>\r
               <overWriteReleases>true</overWriteReleases>\r
@@ -62,7 +62,8 @@
                 httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-lang,commons-codec,\r
                 commons-imaging,jackson-databind,jackson-annotations,jackson-core,jboss-logging,\r
                 validation-api,classmate,javax.el-api,slf4j-api,slf4j-log4j12,\r
-                hibernate-validator,hibernate-validator-cdi,\r
+                ehcache,\r
+                hibernate-validator,\r
                 spring-context,spring-context-support,spring-aspects,spring-test,spring-beans,\r
                 spring-tx,spring-web,spring-core,spring-aop,spring-expression,spring-orm,\r
                 spring-oxm,spring-jdbc,spring-security-config,spring-security-core,\r
@@ -74,7 +75,9 @@
                 jaxb-api,javax.activation-api,\r
                 c3p0,opencsv,joda-time,usertype.jodatime,usertype.spi,\r
                 apache-log4j-extras,\r
-                h2,mysql-connector-java,postgresql\r
+                h2,mysql-connector-java,postgresql,\r
+                junit,hamcrest-core,commons-dbcp,commons-pool,\r
+                jboss-transaction-api_1.2_spec\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r
@@ -230,16 +233,6 @@
       <artifactId>cdmlib-persistence</artifactId>\r
       <version>${cdmlib.version}</version>\r
     </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-remote</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-print</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
     <dependency>\r
       <groupId>eu.etaxonomy</groupId>\r
       <artifactId>cdmlib-services</artifactId>\r
@@ -261,6 +254,13 @@
       <version>${cdmlib.version}</version>\r
     </dependency>\r
     \r
+    <!-- required -->\r
+    <dependency>\r
+           <groupId>net.sf.ehcache</groupId>\r
+           <artifactId>ehcache</artifactId>\r
+           <version>2.10.6</version>\r
+       </dependency>\r
+    \r
     <!-- needed, but should try to remove -->\r
     <dependency>\r
        <!-- see #9205 for how to remove -->\r
@@ -268,7 +268,12 @@
        <artifactId>apache-log4j-extras</artifactId>\r
        <version>1.2.17</version>\r
        </dependency>\r
-    \r
+    <dependency>\r
+           <!-- somehow this is required for logging, covered by tests, but maybe can be removed somehow -->\r
+           <groupId>org.jboss.spec.javax.transaction</groupId>\r
+           <artifactId>jboss-transaction-api_1.2_spec</artifactId>\r
+           <version>1.1.1.Final</version>\r
+       </dependency>\r
     \r
     <dependency>\r
       <groupId>dom4j</groupId>\r
@@ -569,11 +574,6 @@
        <artifactId>hibernate-validator</artifactId>\r
        <version>6.1.5.Final</version>\r
        </dependency>\r
-       <dependency>\r
-       <groupId>org.hibernate.validator</groupId>\r
-       <artifactId>hibernate-validator-cdi</artifactId>\r
-       <version>6.1.5.Final</version>\r
-       </dependency>\r
     <dependency>\r
         <groupId>com.fasterxml</groupId>\r
         <artifactId>classmate</artifactId>\r
@@ -610,8 +610,26 @@
     </dependency>\r
       \r
     <!-- For Unit Tests Start -->\r
-       <!-- still needed? -->\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
+            that it does not appear in production bundles -->\r
+       <dependency>\r
+        <groupId>junit</groupId>\r
+        <artifactId>junit</artifactId>\r
+        <version>4.13</version>\r
+        <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.hamcrest</groupId>\r
+        <artifactId>hamcrest-core</artifactId>\r
+        <version>1.3</version>\r
+<!--         <scope>test</scope> -->\r
+    </dependency>\r
+        \r
+<!-- For Unit Tests End -->\r
 \r
+<!-- dbcp and pool needed for H2Local and unitils, \r
+     move to taxeditor.webapp and taxedtior.test once all db dependencies are moved to webapp-->    \r
     <dependency>\r
       <groupId>commons-dbcp</groupId>\r
       <artifactId>commons-dbcp</artifactId>\r
@@ -620,10 +638,9 @@
     <dependency>\r
       <groupId>commons-pool</groupId>\r
       <artifactId>commons-pool</artifactId>\r
-      <version>1.5.4</version>\r
+      <version>1.6</version>\r
     </dependency>\r
- \r
-    <!-- For Unit Tests End -->\r
+\r
 \r
     <!-- For Hibernate Mapping Start -->\r
     <dependency>\r