Merge branch 'release/5.30.0' into develop

[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 225498f6964ce06cf35c2a3965f33be04b6b6988..b753f4c7bce88a36a5e0a31baee5def9a618682e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>5.29.0-SNAPSHOT</version>\r
+    <version>5.31.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
@@ -16,6 +16,7 @@
       <lucene.version>5.4.1</lucene.version>\r
       <spring.version>4.3.30.RELEASE</spring.version>                                 <!-- checked 2021-12, further upgrade possible -->\r
       <spring-security.version>4.2.20.RELEASE</spring-security.version>               <!-- checked 2021-12, further upgrade possible -->\r
+      <aspectj.version>1.9.7</aspectj.version>\r
   </properties>\r
   <name>CDM Library Dependencies Plugin</name>\r
   <description>CDM Library and dependencies as a plugin</description>\r
@@ -25,7 +26,7 @@
         <plugin>\r
           <groupId>org.apache.maven.plugins</groupId>\r
           <artifactId>maven-surefire-plugin</artifactId>\r
-          <version>2.22.2</version>\r
+          <version>3.0.0-M5</version>\r
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
@@ -33,7 +34,7 @@
       <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
         <artifactId>maven-dependency-plugin</artifactId>\r
-        <version>2.4</version>\r
+        <version>3.2.0</version>\r
         <executions>\r
           <execution>\r
             <id>copy-dependencies</id>\r
@@ -171,7 +172,7 @@
           <plugin>\r
             <groupId>org.apache.maven.plugins</groupId>\r
             <artifactId>maven-dependency-plugin</artifactId>\r
-            <version>2.4</version>\r
+            <version>3.2.0</version>\r
             <executions>\r
               <execution>\r
                 <id>copy-all-dependencies</id>\r
@@ -294,7 +295,7 @@
     <dependency>\r
            <groupId>joda-time</groupId>\r
            <artifactId>joda-time</artifactId>\r
-           <version>2.10.6</version>\r
+           <version>2.10.13</version>\r
        </dependency>\r
        <dependency>\r
            <groupId>org.jadira.usertype</groupId>\r
@@ -425,6 +426,17 @@
     <dependency>\r
       <groupId>org.apache.httpcomponents</groupId>\r
       <artifactId>httpclient</artifactId>\r
+      <!-- version defined in parent pom -->\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.httpcomponents</groupId>\r
+      <artifactId>httpclient-cache</artifactId>\r
+      <!-- version defined in parent pom -->\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.httpcomponents</groupId>\r
+      <artifactId>httpcore</artifactId>\r
+      <version>4.4.15</version>\r
     </dependency>\r
 \r
     <dependency>\r
@@ -460,18 +472,18 @@
         <!-- needed? -->\r
         <groupId>xerces</groupId>\r
         <artifactId>xercesImpl</artifactId>\r
-        <version>2.12.0</version>\r
+        <version>2.12.1</version>\r
     </dependency>\r
     \r
     <dependency>\r
        <groupId>org.aspectj</groupId>\r
        <artifactId>aspectjweaver</artifactId>\r
-       <version>1.9.6</version>\r
+       <version>${aspectj.version}</version>\r
     </dependency>\r
     <dependency>\r
        <groupId>org.aspectj</groupId>\r
        <artifactId>aspectjrt</artifactId>\r
-       <version>1.9.6</version>\r
+       <version>${aspectj.version}</version>\r
     </dependency>\r
     <dependency>\r
        <groupId>org.hibernate.javax.persistence</groupId>\r
@@ -481,7 +493,7 @@
     <dependency>\r
         <groupId>org.javassist</groupId>\r
         <artifactId>javassist</artifactId>\r
-        <version>3.27.0-GA</version>\r
+        <version>3.28.0-GA</version>\r
     </dependency>\r
     <dependency>\r
         <groupId>org.hibernate.common</groupId>\r
@@ -574,7 +586,7 @@
     <dependency>\r
         <groupId>org.json</groupId>\r
         <artifactId>json</artifactId>\r
-        <version>20090211</version>\r
+        <version>20211205</version>\r
     </dependency>    \r
     <dependency>\r
         <groupId>net.sf.json-lib</groupId>\r
@@ -667,7 +679,7 @@
        <dependency>\r
         <groupId>junit</groupId>\r
         <artifactId>junit</artifactId>\r
-        <version>4.13.1</version>\r
+        <version>4.13.2</version>\r
         <scope>test</scope>\r
     </dependency>\r
     <dependency>\r
@@ -744,7 +756,7 @@
     <dependency>\r
         <groupId>de.digitalcollections.iiif</groupId>\r
         <artifactId>iiif-apis</artifactId>\r
-        <version>0.3.7</version>\r
+        <version>0.3.9</version>\r
     </dependency>\r
     \r
     <!-- database related, should be moved to local/test when possible -->\r
@@ -752,7 +764,7 @@
     <dependency>\r
       <groupId>mysql</groupId>\r
       <artifactId>mysql-connector-java</artifactId>\r
-      <version>8.0.21</version>\r
+      <version>8.0.27</version>\r
     </dependency>\r
        <dependency>\r
            <groupId>com.h2database</groupId>\r
@@ -762,7 +774,7 @@
     <dependency>\r
         <groupId>org.postgresql</groupId>\r
         <artifactId>postgresql</artifactId>\r
-        <version>42.2.18</version>\r
+        <version>42.3.1</version>\r
     </dependency>\r
     \r
     <!-- mchange dependencies, needed in datasource view dialog for finish button (ClassName is needed for datasource.xml -->\r