updating develop poms to master versions to avoid merge conflicts

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

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 1c72b6061c50f76fc8b03b6e432cab0ac7ac584e..1d027b40149f51d4bd9a2bc1a9aa850a68a54c2c 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.18.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -18,7 +18,7 @@
         <!-- TODO do we need this? At all or move it in cdmlib-test? -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.2</version>
         <executions>
           <execution>
             <goals>
@@ -30,17 +30,13 @@
     </plugins>
   </build>
   <dependencies>
-     <dependency>
-       <groupId>org.hibernate.javax.persistence</groupId>
-       <artifactId>hibernate-jpa-2.1-api</artifactId>
-     </dependency>
-     <dependency>
+    <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-model</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate.common</groupId>
@@ -49,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>
@@ -88,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>