IGNITE-11191: Fixing Hibernate dependencies for Java 11: JAXB API & i…

…mplementation were provided, CORBA 3rd party implementation (apache#6029)
gridgain · Feb 6, 2019 · 4c0f0e7 · 4c0f0e7
1 parent 731f740
commit 4c0f0e7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 12 deletions.
diff --git a/modules/hibernate-4.2/pom.xml b/modules/hibernate-4.2/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.ow2.jotm</groupId>
             <artifactId>jotm-core</artifactId>
-            <version>2.1.9</version>
+            <version>${jotm.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -136,14 +136,14 @@
         <dependency>
             <groupId>org.jboss.spec.javax.rmi</groupId>
             <artifactId>jboss-rmi-api_1.0_spec</artifactId>
-            <version>1.0.6.Final</version>
+            <version>${jboss.rmi.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>${jaxb.api.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/modules/hibernate-5.1/pom.xml b/modules/hibernate-5.1/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.ow2.jotm</groupId>
             <artifactId>jotm-core</artifactId>
-            <version>2.1.9</version>
+            <version>${jotm.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -136,28 +136,28 @@
         <dependency>
             <groupId>org.jboss.spec.javax.rmi</groupId>
             <artifactId>jboss-rmi-api_1.0_spec</artifactId>
-            <version>1.0.6.Final</version>
+            <version>${jboss.rmi.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>${jaxb.api.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>2.1.14</version>
+            <version>${jaxb.impl.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.1.14</version>
+            <version>${jaxb.impl.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/modules/hibernate-5.3/pom.xml b/modules/hibernate-5.3/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.ow2.jotm</groupId>
             <artifactId>jotm-core</artifactId>
-            <version>2.1.9</version>
+            <version>${jotm.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -130,6 +130,34 @@
             <version>1.4.8</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.api.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${jaxb.impl.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb.impl.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.spec.javax.rmi</groupId>
+            <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+            <version>${jboss.rmi.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/modules/ignored-tests/pom.xml b/modules/ignored-tests/pom.xml
@@ -227,7 +227,7 @@
         <dependency>
             <groupId>org.ow2.jotm</groupId>
             <artifactId>jotm-core</artifactId>
-            <version>2.1.9</version>
+            <version>${jotm.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.ow2.jotm</groupId>
             <artifactId>jotm-core</artifactId>
-            <version>2.2.3</version>
+            <version>${jotm.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.jboss.spec.javax.rmi</groupId>
             <artifactId>jboss-rmi-api_1.0_spec</artifactId>
-            <version>1.0.6.Final</version>
+            <version>${jboss.rmi.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -77,16 +77,20 @@
         <httpcore.version>4.4.3</httpcore.version>
         <jackson.version>2.9.6</jackson.version>
         <jackson1.version>1.9.13</jackson1.version>
+        <jaxb.api.version>2.1</jaxb.api.version>
+        <jaxb.impl.version>2.1.14</jaxb.impl.version>
         <javassist.version>3.20.0-GA</javassist.version>
         <javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
         <javax.cache.tck.version>1.0.1</javax.cache.tck.version>
         <javax.cache.version>1.0.0</javax.cache.version>
+        <jboss.rmi.version>1.0.6.Final</jboss.rmi.version>
         <jetbrains.annotations.version>16.0.3</jetbrains.annotations.version>
         <jetty.version>9.4.11.v20180605</jetty.version>
         <jmh.version>1.13</jmh.version>
         <jms.spec.version>1.1.1</jms.spec.version>
         <jna.version>4.5.2</jna.version>
         <jnr.posix.version>3.0.46</jnr.posix.version>
+        <jotm.version>2.2.3</jotm.version>
         <jsch.bundle.version>0.1.54_1</jsch.bundle.version>
         <jsch.version>0.1.54</jsch.version>
         <jsonlib.bundle.version>2.4_1</jsonlib.bundle.version>