You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/03/22 09:43:24 UTC

[camel] 01/01: camel-infinispan-embedded - Fix infinispan tests depending on JTA

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a commit to branch fix-infinispan-tests
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 34f7e942300c5f69ae18aad5f812afa2cbdcd755
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Wed Mar 22 10:43:01 2023 +0100

    camel-infinispan-embedded - Fix infinispan tests depending on JTA
---
 components/camel-infinispan/camel-infinispan-embedded/pom.xml     | 8 +++++++-
 .../embedded/InfinispanEmbeddedClusteredConsumerTest.java         | 2 --
 .../SpringInfinispanEmbeddedIdempotentRepositorySpringTest.java   | 2 --
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/camel-infinispan/camel-infinispan-embedded/pom.xml b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
index e7bb5ff45fd..71ab27fbb77 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
@@ -87,7 +87,7 @@
         <!-- testing - infinispan -->
         <dependency>
             <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-core</artifactId>
+            <artifactId>infinispan-core-jakarta</artifactId>
             <version>${infinispan-version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -98,6 +98,12 @@
             <version>${infinispan-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-spring6-embedded</artifactId>
+            <version>${infinispan-version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.infinispan.protostream</groupId>
             <artifactId>sample-domain-implementation</artifactId>
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredConsumerTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredConsumerTest.java
index ceedaff33c9..90af4d356f9 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredConsumerTest.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredConsumerTest.java
@@ -25,12 +25,10 @@ import org.infinispan.commons.test.TestResourceTracker;
 import org.infinispan.distribution.MagicKey;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-@Disabled("Jakarta Transactions are not yet supported by Infinispan")
 public class InfinispanEmbeddedClusteredConsumerTest extends InfinispanEmbeddedClusteredTestSupport {
 
     private static final long WAIT_TIMEOUT = 5000;
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositorySpringTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositorySpringTest.java
index 188cb900f78..d73b24fcac1 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositorySpringTest.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositorySpringTest.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.component.infinispan.embedded.spring;
 
-import org.junit.jupiter.api.Disabled;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.annotation.DirtiesContext;
 
-@Disabled("Jakarta Transactions are not yet supported by Infinispan")
 @DirtiesContext
 public class SpringInfinispanEmbeddedIdempotentRepositorySpringTest
         extends SpringInfinispanEmbeddedIdempotentRepositoryTestSupport {