BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 9c50bf4ef94bd99b2adb61cbc54b1842a61b2f81..b753f4c7bce88a36a5e0a31baee5def9a618682e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,15 +4,19 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>5.19.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
   <packaging>eclipse-plugin</packaging>\r
   <properties>\r
-      <jackson.version>2.11.2</jackson.version>\r
+      <jackson.version>2.13.1</jackson.version>\r
       <poi.version>4.1.2</poi.version>\r
       <hibernate.version>5.1.17.Final</hibernate.version>\r
+      <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
@@ -22,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
@@ -30,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
@@ -43,7 +47,7 @@
                 cdmlib-remote-webapp\r
               </excludeArtifactIds>\r
               <includeArtifactIds>\r
-                cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io\r
+                cdmlib-commons,cdmlib-model,cdmlib-api,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io\r
               </includeArtifactIds>\r
               <outputDirectory>${basedir}/lib</outputDirectory>\r
               <overWriteReleases>true</overWriteReleases>\r
@@ -60,6 +64,10 @@
             <configuration>\r
               <includeArtifactIds>\r
                 httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-lang,commons-codec,\r
+                commons-collections,commons-io,commons-logging,ezmorph,\r
+                hibernate-search-engine,hibernate-search-orm,itextpdf,\r
+                json,json-lib,log4j,lucene-analyzers-common,lucene-core,lucene-queryparser,lucene-suggest,lucene-sandbox,\r
+                xalan,\r
                 commons-imaging,jackson-databind,jackson-annotations,jackson-core,jboss-logging,\r
                 validation-api,classmate,javax.el-api,slf4j-api,slf4j-log4j12,\r
                 ehcache,\r
@@ -164,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
@@ -214,7 +222,7 @@
         <repository>\r
         <id>repository.springsource.release</id>\r
         <name>SpringSource GA Repository</name>\r
-        <url>http://repo.springsource.org/release</url>\r
+        <url>https://repo.springsource.org/release</url>\r
     </repository>\r
   </repositories>\r
   <dependencies>\r
@@ -228,6 +236,11 @@
       <artifactId>cdmlib-model</artifactId>\r
       <version>${cdmlib.version}</version>\r
     </dependency>\r
+    <dependency>\r
+      <groupId>eu.etaxonomy</groupId>\r
+      <artifactId>cdmlib-api</artifactId>\r
+      <version>${cdmlib.version}</version>\r
+    </dependency>\r
     <dependency>\r
       <groupId>eu.etaxonomy</groupId>\r
       <artifactId>cdmlib-persistence</artifactId>\r
@@ -282,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
@@ -309,82 +322,82 @@
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-context</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-context-support</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-aspects</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-test</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-beans</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-tx</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-web</artifactId>\r
-               <version>4.3.28.RELEASE</version>\r
+               <version>${spring.version}</version>\r
        </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-core</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-aop</artifactId>\r
-      <version>4.3.28.RELEASE</version>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-expression</artifactId>\r
-               <version>4.3.28.RELEASE</version>\r
+               <version>${spring.version}</version>\r
        </dependency>\r
     <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-orm</artifactId>\r
-               <version>4.3.28.RELEASE</version>\r
+               <version>${spring.version}</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-oxm</artifactId>\r
-               <version>4.3.28.RELEASE</version>\r
+               <version>${spring.version}</version>\r
        </dependency>\r
     <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-jdbc</artifactId>\r
-               <version>4.3.28.RELEASE</version>\r
+               <version>${spring.version}</version>\r
        </dependency>\r
     <dependency>\r
       <groupId>org.springframework.security</groupId>\r
       <artifactId>spring-security-core</artifactId>\r
-      <version>4.2.18.RELEASE</version>\r
+      <version>${spring-security.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework.security</groupId>\r
       <artifactId>spring-security-config</artifactId>\r
-      <version>4.2.18.RELEASE</version>\r
+      <version>${spring-security.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework.security</groupId>\r
       <artifactId>spring-security-remoting</artifactId>\r
-      <version>4.2.18.RELEASE</version>\r
+      <version>${spring-security.version}</version>\r
     </dependency>\r
     <dependency>\r
        <!-- dependency of spring security core, can be removed after\r
@@ -413,12 +426,23 @@
     <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
         <groupId>org.apache.commons</groupId>\r
         <artifactId>commons-lang3</artifactId>\r
-        <version>3.11</version>\r
+        <version>3.12.0</version>\r
     </dependency>\r
     <dependency>\r
         <!-- needed at least in taxeditor.test by BundleLoader; try to move there but test carefully -->\r
@@ -448,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
@@ -469,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
@@ -523,7 +547,88 @@
        poi:   com.zaxxer:SparseBitSet\r
        poi-ooxml   commons-compress,curvesapi\r
      -->\r
- \r
+     \r
+    <!-- the following were all taken without check if needed -->\r
+    <dependency>\r
+        <groupId>commons-collections</groupId>\r
+        <artifactId>commons-collections</artifactId>\r
+        <version>3.2.2</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>commons-io</groupId>\r
+        <artifactId>commons-io</artifactId>\r
+        <version>2.11.0</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>commons-logging</groupId>\r
+        <artifactId>commons-logging</artifactId>\r
+        <version>1.2</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>net.sf.ezmorph</groupId>\r
+        <artifactId>ezmorph</artifactId>\r
+        <version>1.0.6</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.hibernate</groupId>\r
+        <artifactId>hibernate-search-engine</artifactId>\r
+        <version>5.5.2.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.hibernate</groupId>\r
+        <artifactId>hibernate-search-orm</artifactId>\r
+        <version>5.5.2.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>com.itextpdf</groupId>\r
+        <artifactId>itextpdf</artifactId>  \r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.json</groupId>\r
+        <artifactId>json</artifactId>\r
+        <version>20211205</version>\r
+    </dependency>    \r
+    <dependency>\r
+        <groupId>net.sf.json-lib</groupId>\r
+        <artifactId>json-lib</artifactId>\r
+        <version>2.4</version>\r
+        <!-- classifier required as json-lib exists on maven central as json-lib-2.4-jdk15.jar and xxx-jdk13.jar, see #9887 -->\r
+        <classifier>jdk15</classifier>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.apache.lucene</groupId>\r
+        <artifactId>lucene-core</artifactId>\r
+        <version>${lucene.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.apache.lucene</groupId>\r
+        <artifactId>lucene-analyzers-common</artifactId>\r
+        <version>${lucene.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.apache.lucene</groupId>\r
+        <artifactId>lucene-queryparser</artifactId>\r
+        <version>${lucene.version}</version>\r
+    </dependency>    \r
+    <dependency>\r
+        <groupId>org.apache.lucene</groupId>\r
+        <artifactId>lucene-suggest</artifactId>\r
+        <version>${lucene.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.apache.lucene</groupId>\r
+        <artifactId>lucene-sandbox</artifactId>\r
+        <version>${lucene.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>xalan</groupId>\r
+        <artifactId>xalan</artifactId>\r
+        <version>2.7.2</version>\r
+    </dependency>\r
+    \r
+    <!-- end without check if needed --> \r
+     \r
+     \r
        <!-- logging -->\r
     <dependency>\r
         <!-- needed? -->\r
@@ -569,12 +674,12 @@
 \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
         <artifactId>junit</artifactId>\r
-        <version>4.13.1</version>\r
+        <version>4.13.2</version>\r
         <scope>test</scope>\r
     </dependency>\r
     <dependency>\r
@@ -651,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
@@ -659,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
@@ -669,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