Merge branch 'release/5.43.0'

[cdmlib.git] / cdmlib-persistence / pom.xml

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index c0a484b4489ac16fe8f8ed2c178bc934844739cb..b8cab1c3f53f6f1056056624be169c34394f4924 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.29.1-SNAPSHOT</version>
+    <version>5.43.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -30,10 +30,6 @@
     </plugins>
   </build>
   <dependencies>
-     <dependency>
-       <groupId>org.hibernate.javax.persistence</groupId>
-       <artifactId>hibernate-jpa-2.1-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-model</artifactId>
@@ -42,10 +38,6 @@
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-api</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hibernate.common</groupId>
       <artifactId>hibernate-commons-annotations</artifactId>
@@ -53,6 +45,18 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <!-- has overlaps with jakarta-activation -->
+          <groupId>javax.activation</groupId>
+          <artifactId>javax.activation-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <!-- we use jakarta.xml.bind-api instead -->
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -92,11 +96,13 @@
         <artifactId>lucene-queryparser</artifactId>
     </dependency>
     <dependency>
+        <!-- used by Abstract... and AdvancedBeanInitializer -->
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
     </dependency>
     <dependency>
         <!-- used for class LocalH2 (base class is from commons-dbcp) -->
+        <!-- TODO we should try to remove this dependency -->
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
     </dependency>