ref #9326, ref #3764 fix secion in book-section handling and some cleanup in Referen...
[cdmlib.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 96d86c08841dd201cc2a42099a03d8c1ecbcfe53..7e54a504b624804ad2c63d9a3970572b7aaf2ed7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>5.18.0-SNAPSHOT</version>
+  <version>5.23.0-SNAPSHOT</version>
   <name>CDM Library</name>
   <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
   <url>http://cybertaxonomy.eu/cdmlib/</url>
@@ -47,7 +47,7 @@
        <cglib.version>3.3.0</cglib.version>
        <aspectj.version>1.9.6</aspectj.version>            <!-- checked 2020-08 -->
        <geotools.version>23.2</geotools.version>           <!-- checked 2020-08 -->
-    
+    <dozer.version>6.5.0</dozer.version>                <!-- checked 2021-02 -->
     <javadoc.opts>-Xdoclint:none</javadoc.opts>         
   </properties>
   
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.0</version>
+          <version>3.0.0</version>
         </plugin>
       </plugins>  
     </pluginManagement>
   <!-- **** DEPENDENCIES **** -->
   <dependencies>
     <dependency>
+      <!-- junit is required for all module tests, also those not depending on cdmlib-test, so it is added here on parent level with test scope -->
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <dependencyManagement>
       
       <!--*********** JAXB********* -->
       <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.1</version>
-        <!-- checked 2020-08 -->
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${jaxb.version}</version>  <!-- not sure if jaxb.version is always the same -->
       </dependency>
+<!--       <dependency> -->
+<!--         replaced by jakarta.xml.bind-api -->
+<!--         <groupId>javax.xml.bind</groupId> -->
+<!--         <artifactId>jaxb-api</artifactId> -->
+<!--         <version>2.3.1</version> -->
+<!--         checked 2020-08 -->
+<!--       </dependency> -->
       <dependency>
          <!-- dependency for jaxb-api -->
          <groupId>javax.activation</groupId>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.13</version>
+        <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.objenesis</groupId>
+        <artifactId>objenesis</artifactId>
+        <version>3.1</version>
+      </dependency>
       <dependency>
         <groupId>org.unitils</groupId>
         <artifactId>unitils-dbunit</artifactId>
          </dependency>
       <!-- ******* aspect ******* -->
       <dependency>
+        <!-- not really needed as long as aspectjweaver is on classpath which is a superset of aspectjrt -->
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
         <version>${aspectj.version}</version>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.14</version>
+        <version>1.15</version>
       </dependency>
       <!-- only for version management, httpcore:4.2.4, commons-beanutils:1.8.3, 
         commons-collections:3.2.1 currently require 1.1.1 , httpclient:4.2.3, spring-modules-cache 
         <version>3.4.1.Final</version>
         <!-- checked 2020-08 -->
       </dependency>
-         <dependency>
-           <!-- since hibernate 5.0.4 Dialect throws exception if jta is missing  -->
-        <groupId>javax.transaction</groupId>
-        <artifactId>jta</artifactId>
-        <version>1.1</version>
-      </dependency>  
+<!--     <dependency> -->
+<!--       see note in cdmib-persistence pom  -->
+<!--         <groupId>javax.transaction</groupId> -->
+<!--         <artifactId>jta</artifactId> -->
+<!--         <version>1.1</version> -->
+<!--       </dependency>   -->
                
       <!-- TODO xerces xmlParserAPIs duplicates many classes from jre and 
         xml-apis. It is a dependency that comes with xom:xom -->
         <artifactId>commons-imaging</artifactId>
         <version>1.0-alpha2</version>
       </dependency>
+      <dependency>
+        <groupId>org.cybertaxonomy.media</groupId>
+        <artifactId>media-info-model</artifactId>
+        <version>1.1.0</version>
+      </dependency>
       <!-- joda-time -->
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>wsdl4j</artifactId>
         <version>1.6.3</version>
       </dependency>
+<!--       <dependency> -->
+<!--         <groupId>net.sf.dozer</groupId> -->
+<!--         <artifactId>dozer</artifactId> -->
+<!--         <version>5.5.1</version> -->
+<!--       </dependency> -->
+      <dependency>
+          <groupId>com.github.dozermapper</groupId>
+          <artifactId>dozer-core</artifactId>
+          <version>${dozer.version}</version>
+      </dependency>
       <dependency>
-        <groupId>net.sf.dozer</groupId>
-        <artifactId>dozer</artifactId>
-        <version>5.3.0</version>
+        <groupId>com.github.dozermapper</groupId>
+        <artifactId>dozer-spring4</artifactId>
+        <version>${dozer.version}</version>
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
       </dependency>
       <!-- ******* XML ******* -->
       <dependency>
+<!--        xml-apis seems to be ALMOST fully included in java8 but ElementTraversal seems to be missing, therefore SDDDocumentBuilder does not compile -->
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <!-- 
-            WARNING: do not upgrade to later versions 2.0.x of xml-apis
-            since these are effectivly reloaded to the early beta version
-            1.0.b2
-        -->
+<!--             WARNING: do not upgrade to later versions 2.0.x of xml-apis -->
+<!--             since these are effectivly reloaded to the early beta version -->
+<!--             1.0.b2 -->
         <version>1.4.01</version>
       </dependency>
       <dependency>
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.12</version>
+        <version>1.4.14</version>
       </dependency>
       <dependency>
       <groupId>xmlpull</groupId>
         <artifactId>xpp3</artifactId>
         <version>1.1.4c</version>
       </dependency>
-      <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax</artifactId>
-        <version>1.2.0</version>
-      </dependency>
+<!--       <dependency> -->
+<!--        stax is part of java8 and therefore not needed anymore -->
+<!--         <groupId>stax</groupId> -->
+<!--         <artifactId>stax</artifactId> -->
+<!--         <version>1.2.0</version> -->
+<!--       </dependency> -->
       <dependency>
         <groupId>xom</groupId>
         <artifactId>xom</artifactId>
         -->
         <version>0.9.5.2</version>
       </dependency>
+      <dependency>
+        <groupId>com.mchange</groupId>
+        <artifactId>mchange-commons-java</artifactId>
+        <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->
+        <version>0.2.11</version>
+      </dependency>
       <dependency>
         <groupId>org.hibernate.common</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
-         <version>42.2.15</version>
+         <version>42.2.18</version>
       </dependency>
          <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>ojdbc</artifactId>
         <version>14</version>
         </dependency>   -->      
-      <dependency>
-        <groupId>com.taskadapter</groupId>
-        <artifactId>redmine-java-api</artifactId>
-        <version>3.1.0</version>
-      </dependency>
       <!-- GIS/KML -->
          <dependency>
             <groupId>de.micromata.jak</groupId>