get language preference from config.ini

[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 d05da58e66efd7cd6333b9bc487ed902b45f3963..8cb965aa290a946c9bbf63a5137f2ab2a158a354 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.35.0-SNAPSHOT</version>\r
+    <version>5.41.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
@@ -13,6 +13,7 @@
       <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
@@ -65,19 +66,20 @@
               <includeArtifactIds>\r
                 httpclient,JavaAPIforKml,iiif-apis,commons-lang3,commons-lang,commons-text,\r
                 commons-codec,commons-io,\r
-                json,json-lib,ezmorph,\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,\r
+                jakarta.validation-api,validation-api,\r
                 ehcache,\r
                 hibernate-validator,\r
                 spring-context,spring-aspects,spring-beans,\r
                 spring-tx,spring-web,spring-core,spring-aop,\r
-                spring-jdbc,spring-security-core,\r
+                spring-jdbc,spring-orm,\r
+                spring-security-core,\r
                 aspectjweaver,\r
                 byte-buddy,\r
-                hibernate-core,hibernate-envers,antlr,\r
+                hibernate-core,hibernate-envers,hibernate-search-engine,\r
+                antlr,\r
                 javax.persistence-api,\r
                 xml-apis,lsid-client,jdom,\r
                 commons-collections4,commons-math3,\r
@@ -333,13 +335,13 @@
       <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
@@ -427,8 +429,7 @@
       <artifactId>commons-collections4</artifactId>\r
       <version>4.4</version>\r
     </dependency>\r
-    \r
-    <!-- used by taxeditor.local -->\r
+        <!-- used by taxeditor.local -->\r
     <dependency>\r
       <!-- used by datasource dialogue finish button  -->\r
       <groupId>com.mchange</groupId>\r
@@ -477,6 +478,18 @@
     \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
@@ -517,6 +530,14 @@
         <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
@@ -525,7 +546,7 @@
     </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
@@ -539,7 +560,7 @@
     <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