Updated version in pom / project files to taxeditor version : 5.44.0 and cdmlib versi...
[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / pom.xml
index e6e7c334bb163eb0134b96ed71c0778a3852d442..8103a2164d4287390554ca1f4acfb1c905c8abf0 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>5.32.0-SNAPSHOT</version>\r
+    <version>5.44.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
       <jackson.version>2.13.3</jackson.version>\r
       <poi.version>4.1.2</poi.version>\r
       <hibernate.version>5.4.33.Final</hibernate.version>\r
+      <hibernate-search.version>5.11.10.Final</hibernate-search.version>\r
       <lucene.version>5.5.5</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
+      <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
             <configuration>\r
               <includeArtifactIds>\r
                 httpclient,JavaAPIforKml,iiif-apis,commons-lang3,commons-lang,commons-text,\r
-                commons-codec,commons-collections,commons-io,commons-logging,ezmorph,\r
-                hibernate-search-engine,hibernate-search-orm,itextpdf,\r
-                json,json-lib,log4j,log4j-core,log4j-api,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
-                jakarta.validation-api,classmate,javax.el-api,slf4j-api,\r
+                commons-codec,commons-io,\r
+                log4j-core,log4j-api,slf4j-api,jboss-logging,jcl-over-slf4j,log4j-slf4j-impl,\r
+                lucene-analyzers-common,lucene-core,lucene-queryparser,lucene-suggest,lucene-sandbox,\r
+                commons-imaging,jackson-databind,jackson-annotations,jackson-core,\r
+                jakarta.validation-api,validation-api,\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
-                aopalliance,aspectjweaver,aspectjrt,\r
-                byte-buddy,hibernate-commons-annotations,\r
-                hibernate-core,hibernate-envers,antlr,cglib-nodep,\r
+                spring-context,spring-aspects,spring-beans,\r
+                spring-tx,spring-web,spring-core,spring-aop,\r
+                spring-jdbc,spring-orm,\r
+                spring-security-core,\r
+                aspectjweaver,\r
+                byte-buddy,\r
+                hibernate-core,hibernate-envers,hibernate-search-engine,\r
+                antlr,\r
                 javax.persistence-api,\r
-                xml-apis,lsid-client,jdom,jdom2,\r
-                poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,\r
+                xml-apis,lsid-client,jdom,\r
+                commons-collections4,commons-math3,\r
                 c3p0,mchange-commons-java,\r
-                opencsv,joda-time,usertype.core,\r
-                apache-log4j-extras,\r
+                opencsv,joda-time,\r
                 h2,mysql-connector-java,postgresql,\r
                 junit,hamcrest-core,commons-dbcp,commons-pool,\r
                 jboss-transaction-api_1.2_spec\r
             </goals>\r
             <configuration>\r
               <includeArtifactIds>\r
-                httpclient-cache,httpcore,xercesImpl\r
+                httpclient-cache,httpcore\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r
       </build>\r
     </profile>\r
   </profiles>\r
-  <repositories>\r
-    <repository>\r
-      <id>SpringSource Enterprise Bundle Repository - External Bundle\r
-        Milestones\r
-      </id>\r
-      <url>http://repository.springsource.com/maven/bundles/milestone\r
-      </url>\r
-    </repository>\r
-    <repository>\r
-      <id>SpringSource Enterprise Bundle Repository - SpringSource\r
-        Bundle\r
-        Releases\r
-      </id>\r
-      <url>http://repository.springsource.com/maven/bundles/release\r
-      </url>\r
-    </repository>\r
-    <repository>\r
-      <id>SpringSource Enterprise Bundle Repository - External Bundle\r
-        Releases\r
-      </id>\r
-      <url>http://repository.springsource.com/maven/bundles/external\r
-      </url>\r
-    </repository>\r
-        <repository>\r
-        <id>repository.springsource.release</id>\r
-        <name>SpringSource GA Repository</name>\r
-        <url>https://repo.springsource.org/release</url>\r
-    </repository>\r
-  </repositories>\r
   <dependencies>\r
   \r
     <!-- direct dependencies (used within this module) -->\r
       <!-- used e.g. by CdmServerUtils -->\r
       <groupId>org.apache.commons</groupId>\r
       <artifactId>commons-text</artifactId>\r
-      <version>1.9</version>\r
+      <version>1.10.0</version>\r
     </dependency>\r
       <dependency>\r
       <!-- used in AuthenticatingHttpInvokerRequestExecutor -->\r
       <artifactId>commons-codec</artifactId>\r
       <version>1.15</version>\r
     </dependency>\r
-    <dependency>\r
-      <!-- TODO adapt TaxEditor code to log4j2, then this can be removed -->\r
-      <groupId>log4j</groupId>\r
-      <artifactId>log4j</artifactId>\r
-      <version>1.2.17</version>\r
-    </dependency>\r
     <dependency>\r
       <!-- CdmServiceCacher -->\r
       <groupId>org.apache.logging.log4j</groupId>\r
       <artifactId>log4j-core</artifactId>\r
-      <version>2.17.2</version>\r
+      <version>${log4j.version}</version>\r
     </dependency>\r
     <dependency>\r
       <!-- CdmServiceCacher -->\r
       <groupId>org.apache.logging.log4j</groupId>\r
       <artifactId>log4j-api</artifactId>\r
-      <version>2.17.2</version>\r
+      <version>${log4j.version}</version>\r
     </dependency>\r
     <dependency>\r
        <groupId>org.aspectj</groupId>\r
       <artifactId>httpcore</artifactId>\r
       <version>4.4.15</version>\r
     </dependency>\r
-    <dependency>\r
-      <!-- used e.g. by CdmServerInfo -->\r
+    <!--<dependency>\r
+     \r
       <groupId>org.json</groupId>\r
       <artifactId>json</artifactId>\r
       <version>20220320</version>\r
-    </dependency>\r
-    <dependency>\r
+    </dependency>-->\r
+      <dependency>\r
       <!-- used e.g. by CdmServerInfo -->\r
       <groupId>com.fasterxml.jackson.core</groupId>\r
       <artifactId>jackson-core</artifactId>\r
       <artifactId>lsid-client</artifactId>\r
       <version>1.1.2</version>\r
     </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.commons</groupId>\r
+      <artifactId>commons-imaging</artifactId>\r
+      <version>1.0-alpha3</version>\r
+    </dependency>\r
+    \r
+    <!-- used by taxeditor.editor -> character matrix -->\r
+    <dependency>\r
+      <groupId>org.apache.commons</groupId>\r
+      <artifactId>commons-math3</artifactId>\r
+      <version>3.6.1</version>\r
+    </dependency>\r
     \r
     <!-- used by bulkeditor -->\r
     <dependency>\r
-      <!-- used by CharacterMatrix/bulkeditor (LinkedList)  -->\r
+      <!-- used by CharacterMatrix/bulkeditor (LinkedList) and UpdateResult.exceptions (CircularFifoQueue)  -->\r
       <groupId>org.apache.commons</groupId>\r
       <artifactId>commons-collections4</artifactId>\r
       <version>4.4</version>\r
     </dependency>\r
+        <!-- used by taxeditor.local -->\r
+    <dependency>\r
+      <!-- used by datasource dialogue finish button  -->\r
+      <groupId>com.mchange</groupId>\r
+      <artifactId>mchange-commons-java</artifactId>\r
+      <version>0.2.11</version>\r
+    </dependency>\r
     \r
     <!-- needed by taxeditor.test during test run, maybe move to test package only -->\r
     <dependency>\r
-      <!-- when using bytebuddy for hibernate -->\r
+      <!-- used by hibernate -->\r
       <groupId>net.bytebuddy</groupId>\r
       <artifactId>byte-buddy</artifactId>\r
       <version>1.12.10</version>\r
     \r
     <!-- required during RUNTIME -->\r
     \r
+    <dependency>\r
+      <!-- for handling HibernateSystemException, see #10277, TODO try to handle without adding dependency  -->\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>spring-orm</artifactId>\r
+      <version>${spring.version}</version>\r
+    </dependency>\r
+  <dependency>\r
+      <!-- for handling BridgeException, see #10277, TODO try to handle without adding dependency  -->\r
+      <groupId>org.hibernate</groupId>\r
+      <artifactId>hibernate-search-engine</artifactId>\r
+      <version>${hibernate-search.version}</version>\r
+    </dependency>\r
     <dependency>\r
       <!-- throws exception in bulk editor after search if not present -->\r
       <groupId>org.hibernate</groupId>\r
         <version>1.1.1.Final</version>\r
     </dependency>\r
     \r
+    <dependency>\r
+        <!-- for showing maps in distribution details view -->\r
+        <groupId>de.micromata.jak</groupId>\r
+        <!-- Java11 required <groupId>uk.m0nom</groupId>  -->\r
+        <artifactId>JavaAPIforKml</artifactId>\r
+        <version>2.2.1</version>\r
+    </dependency>\r
+    \r
+    <dependency>\r
+      <!-- used if a validation result is returned, see https://dev.e-taxonomy.eu/redmine/issues/10182#note-10  -->\r
+      <!-- can probably be removed after switching to jakarta.validation-api with spring 6.x -->\r
+      <groupId>javax.validation</groupId>\r
+      <artifactId>validation-api</artifactId>\r
+      <version>2.0.1.Final</version>\r
+    </dependency>\r
+    \r
     <dependency>\r
       <!-- used in datasource view and in test, maybe enough if in taxeditor.local and taxeditor.test -->\r
       <groupId>com.mchange</groupId>\r
     </dependency>\r
     \r
     <!-- database related, should be moved to local/test when possible -->\r
-    <!-- only for supporting test button in datasource dialogue, dialogue should be moved to taxeditor.webapp -->\r
+    <!-- only for supporting test button in datasource dialogue, dialogue should be moved to taxeditor.local -->\r
     <dependency>\r
       <groupId>mysql</groupId>\r
       <artifactId>mysql-connector-java</artifactId>\r
     <dependency>\r
         <groupId>org.postgresql</groupId>\r
         <artifactId>postgresql</artifactId>\r
-        <version>42.3.6</version>\r
+        <version>42.5.1</version>\r
     </dependency>\r
     \r
     <!-- Only added for correct package export, but reported as needed -->\r
       <artifactId>commons-lang</artifactId>\r
       <version>2.6</version>\r
     </dependency>\r
-    \r
-    <!-- poi -->\r
-    <!-- needed -->\r
-    <!-- .... -->\r
     <dependency>\r
-      <groupId>org.apache.commons</groupId>\r
-      <artifactId>commons-math3</artifactId>\r
-      <version>3.6.1</version>\r
+      <!-- required when running test -->\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>spring-jdbc</artifactId>\r
+      <version>${spring.version}</version>\r
     </dependency>\r
     \r
     <!-- logging -->\r
         <version>1.7.36</version>\r
     </dependency>\r
     <dependency>\r
-        <!-- not necessarily required but probably wanted -->\r
-        <groupId>org.slf4j</groupId>\r
-        <artifactId>slf4j-reload4j</artifactId>\r
-        <version>1.7.36</version>\r
-    </dependency>\r
-    <!-- slf4j-nop is not needed -->\r
-    \r
-    <!-- Only added for correct package export -->\r
-    <dependency>\r
-      <groupId>commons-collections</groupId>\r
-      <artifactId>commons-collections</artifactId>\r
-      <version>3.2.2</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.apache.commons</groupId>\r
-      <artifactId>commons-imaging</artifactId>\r
-      <version>1.0-alpha3</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>commons-logging</groupId>\r
-      <artifactId>commons-logging</artifactId>\r
-      <version>1.2</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>xerces</groupId>\r
-      <artifactId>xercesImpl</artifactId>\r
-      <version>2.12.2</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.hibernate.common</groupId>\r
-      <artifactId>hibernate-commons-annotations</artifactId>\r
-      <version>5.1.2.Final</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.hibernate</groupId>\r
-      <artifactId>hibernate-search-orm</artifactId>\r
-      <version>5.11.10.Final</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.hibernate</groupId>\r
-      <artifactId>hibernate-search-engine</artifactId>\r
-      <version>5.11.10.Final</version>\r
-    </dependency> \r
\r
-    <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>spring-context-support</artifactId>\r
-      <version>${spring.version}</version>\r
+      <groupId>org.apache.logging.log4j</groupId>\r
+      <artifactId>log4j-slf4j-impl</artifactId>\r
+      <version>${log4j.version}</version>\r
     </dependency>\r
     <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>spring-jdbc</artifactId>\r
-      <version>${spring.version}</version>\r
+      <groupId>org.slf4j</groupId>\r
+      <artifactId>jcl-over-slf4j</artifactId>\r
+      <version>1.7.36</version>\r
     </dependency>\r
+\r
     <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>spring-orm</artifactId>\r
-      <version>${spring.version}</version>\r
+      <!-- https://stackoverflow.com/questions/38727655/maven-dependency-plugin-nosuchelementexception-for-aether-repositorysystem -->\r
+      <groupId>org.apache.maven.resolver</groupId>\r
+      <artifactId>maven-resolver-api</artifactId>\r
+      <version>1.4.1</version>\r
     </dependency>\r
-    <dependency>\r
-      <groupId>org.springframework.security</groupId>\r
-      <artifactId>spring-security-config</artifactId>\r
-      <version>${spring-security.version}</version>\r
-    </dependency>\r
-    \r
-    <!-- preliminary removed     \r
-    <dependency>\r
-      <groupId>org.jadira.usertype</groupId>\r
-      <artifactId>usertype.core</artifactId>\r
-      <version>7.0.0.CR1</version>\r
-    </dependency> -->\r
-    \r
-    \r
-    <!-- serialVersionUID problem if not present -->\r
-    <!-- not true, the reason was serialVersionUID of AbstractPersistentCollection \r
-    <dependency>\r
-      <groupId>org.springframework.security</groupId>\r
-      <artifactId>spring-security-remoting</artifactId>\r
-      <version>${spring-security.version}</version>\r
-    </dependency> -->\r
-\r
-    \r
+     \r
   </dependencies>\r
 </project>\r
 \r