updating develop poms to master versions to avoid merge conflicts

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 91869d1f6a474e7b9405d4a583f2481e78e641f9..f60338b1977f38f2678ea69be2efb2cd23d280a8 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.21.0</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>
   
@@ -799,6 +799,11 @@
           </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>
@@ -1173,10 +1178,20 @@
         <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>
@@ -1237,7 +1252,7 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.12</version>
+        <version>1.4.14</version>
       </dependency>
       <dependency>
       <groupId>xmlpull</groupId>
@@ -1326,6 +1341,12 @@
         -->
         <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>
@@ -1588,7 +1609,7 @@
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
-         <version>42.2.15</version>
+         <version>42.2.18</version>
       </dependency>
          <dependency>
         <groupId>com.h2database</groupId>