IGNITE-9687: Fixed JTA tests for Java 9+. This closes #4858.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37eedfc1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37eedfc1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37eedfc1 Branch: refs/heads/ignite-5797 Commit: 37eedfc1824c8d2c62dbb860f08f5397c1b4033a Parents: 4da48e6 Author: tledkov-gridgain <[email protected]> Authored: Fri Sep 28 17:55:14 2018 +0300 Committer: devozerov <[email protected]> Committed: Fri Sep 28 17:55:14 2018 +0300 ---------------------------------------------------------------------- modules/jta/pom.xml | 12 +++++++++++- .../cache/GridJtaTransactionManagerSelfTest.java | 2 +- .../jta/GridPartitionedCacheJtaFactorySelfTest.java | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/37eedfc1/modules/jta/pom.xml ---------------------------------------------------------------------- diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml index 35c5582..9c3bd6c 100644 --- 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.1.9</version> + <version>2.2.3</version> <scope>test</scope> </dependency> @@ -89,6 +89,16 @@ <version>6.0.43</version> <scope>test</scope> </dependency> + + <!-- JDK9+ --> + + <dependency> + <groupId>org.jboss.spec.javax.rmi</groupId> + <artifactId>jboss-rmi-api_1.0_spec</artifactId> + <version>1.0.6.Final</version> + <scope>test</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/ignite/blob/37eedfc1/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java index e2ffa34..a7bb785 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import javax.cache.configuration.Factory; import javax.transaction.Transaction; +import javax.transaction.TransactionManager; import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; @@ -27,7 +28,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.objectweb.jotm.Current; import org.objectweb.jotm.Jotm; -import org.objectweb.transaction.jta.TransactionManager; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.transactions.TransactionState.ACTIVE; http://git-wip-us.apache.org/repos/asf/ignite/blob/37eedfc1/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java index 14b7fae..ec9f8e8 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.internal.processors.cache.jta; import javax.cache.configuration.Factory; +import javax.transaction.TransactionManager; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; -import org.objectweb.transaction.jta.TransactionManager; /** * Factory JTA integration test using PARTITIONED cache.
