diff --git a/build/bom/pom.xml b/build/bom/pom.xml index 56256426296..c623abe55c1 100644 --- a/build/bom/pom.xml +++ b/build/bom/pom.xml @@ -75,21 +75,11 @@ infinispan-cachestore-jdbc ${version.infinispan} - - org.infinispan - infinispan-cachestore-jdbc-jakarta - ${version.infinispan} - org.infinispan infinispan-cachestore-jdbc-common ${version.infinispan} - - org.infinispan - infinispan-cachestore-jdbc-common-jakarta - ${version.infinispan} - org.infinispan infinispan-cachestore-sql @@ -110,31 +100,16 @@ infinispan-cdi-common ${version.infinispan} - - org.infinispan - infinispan-cdi-common-jakarta - ${version.infinispan} - org.infinispan infinispan-cdi-embedded ${version.infinispan} - - org.infinispan - infinispan-cdi-embedded-jakarta - ${version.infinispan} - org.infinispan infinispan-cdi-remote ${version.infinispan} - - org.infinispan - infinispan-cdi-remote-jakarta - ${version.infinispan} - org.infinispan infinispan-checkstyle @@ -150,21 +125,11 @@ infinispan-hotrod ${version.infinispan} - - org.infinispan - infinispan-hotrod-jakarta - ${version.infinispan} - org.infinispan infinispan-client-hotrod ${version.infinispan} - - org.infinispan - infinispan-client-hotrod-jakarta - ${version.infinispan} - org.infinispan infinispan-client-rest @@ -190,11 +155,6 @@ infinispan-commons ${version.infinispan} - - org.infinispan - infinispan-commons-jakarta - ${version.infinispan} - org.infinispan @@ -217,11 +177,6 @@ infinispan-core ${version.infinispan} - - org.infinispan - infinispan-core-jakarta - ${version.infinispan} - org.infinispan infinispan-jboss-marshalling @@ -267,11 +222,6 @@ infinispan-query ${version.infinispan} - - org.infinispan - infinispan-query-jakarta - ${version.infinispan} - org.infinispan infinispan-query-dsl @@ -304,11 +254,6 @@ infinispan-server-hotrod ${version.infinispan} - - org.infinispan - infinispan-server-hotrod-jakarta - ${version.infinispan} - org.infinispan @@ -403,11 +348,6 @@ infinispan-tools ${version.infinispan} - - org.infinispan - infinispan-tools-jakarta - ${version.infinispan} - org.infinispan infinispan-anchored-keys diff --git a/build/configuration/pom.xml b/build/configuration/pom.xml index 16d36b9b339..096759d5876 100644 --- a/build/configuration/pom.xml +++ b/build/configuration/pom.xml @@ -124,14 +124,14 @@ 1.8.1 1.0b3 3.5.2 - 1.6.0.Final + 1.7.0.Alpha14 1.0.6.RELEASE 1.70 4.0.9 3.1.1 1.21 14.0.1.Final - 5.12.2 + 6.5.1 2.3.1 1.1.4 2.4.8 @@ -151,17 +151,16 @@ 2.1.1 2.0.0 2.0.0 - 1.3.3 2.0.1 - 2.0.2 + 4.0.1 3.1.0 3.5.0.Final 2.1.1.Final 5.0.6.CR1 - 5.13.1.Final + 5.13.1.Final + 6.0.0.Final 3.0.6.Final 1.2.6 - 2.0.0 3.1.3 1.0 5.2.12.Final @@ -192,6 +191,7 @@ 5.0.3.Final 2.5.5.SP12 4.6.2.Final + 3.0.0.CR2 1.0.3 7.1.2 3.1.4 @@ -205,7 +205,7 @@ 1.15.0 1.15.0-alpha - 1.3.1 + 2.1.0 6.0.7 3.0.5 @@ -320,109 +320,6 @@ - - jakarta-transform - - - ${basedir}/jakarta.txt - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - jakarta-transform - - regex-property - - - original.artifactId - ${project.artifactId} - \-jakarta$ - false - - - - - - org.eclipse.transformer - transformer-maven-plugin - true - - - true - - - - - default-jar - - jar - - package - - - ${project.groupId} - ${original.artifactId} - ${project.version} - - - - - source-jar - - jar - - package - - - ${project.groupId} - ${original.artifactId} - ${project.version} - sources - - - - - test-jar - - jar - - package - - ${transform.tests.skip} - - ${project.groupId} - ${original.artifactId} - ${project.version} - tests - - - - - test-source-jar - - jar - - package - - ${transform.tests.skip} - - ${project.groupId} - ${original.artifactId} - ${project.version} - test-sources - - - - - - - - community-release diff --git a/cdi/common-jakarta/pom.xml b/cdi/common-jakarta/pom.xml deleted file mode 100644 index e654971a09b..00000000000 --- a/cdi/common-jakarta/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - - org.infinispan - infinispan-cdi-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-cdi-common-jakarta - Infinispan CDI Jakarta EE support common - - - true - true - false - - - - - org.infinispan - infinispan-commons-jakarta - ${project.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - 4.0.1 - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - provided - - - diff --git a/cdi/common-jakarta/src/main/java/org/infinispan/cdi/common/package-info.java b/cdi/common-jakarta/src/main/java/org/infinispan/cdi/common/package-info.java deleted file mode 100644 index 009f9c8880e..00000000000 --- a/cdi/common-jakarta/src/main/java/org/infinispan/cdi/common/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan CDI Common using the Jakarta EE APIs. - */ -package org.infinispan.cdi.common; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/AbstractImmutableBean.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/AbstractImmutableBean.java index 17989a93b9c..8f48cc9b593 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/AbstractImmutableBean.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/AbstractImmutableBean.java @@ -6,11 +6,11 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; import org.infinispan.cdi.common.util.logging.Log; import org.infinispan.commons.logging.LogFactory; @@ -149,7 +149,6 @@ public boolean isAlternative() { return alternative; } - @Override public boolean isNullable() { return nullable; } diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Annotateds.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Annotateds.java index 6f5f8754530..9b53b96b96a 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Annotateds.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Annotateds.java @@ -12,13 +12,13 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedCallable; -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedCallable; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; /** *

diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/AnyLiteral.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/AnyLiteral.java index 7cef75668ce..417776b07a0 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/AnyLiteral.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/AnyLiteral.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.common.util; -import javax.enterprise.inject.Any; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.util.AnnotationLiteral; public class AnyLiteral extends AnnotationLiteral implements Any { private static final long serialVersionUID = -6858406907917381581L; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanBuilder.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanBuilder.java index 7d50eec93a6..b806315cda3 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanBuilder.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanBuilder.java @@ -6,15 +6,15 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.InjectionTarget; -import javax.enterprise.inject.spi.PassivationCapable; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.inject.spi.PassivationCapable; +import jakarta.inject.Named; /** *

@@ -90,7 +90,9 @@ public BeanBuilder readFromType(AnnotatedType type) { this.beanClass = type.getJavaClass(); InjectionTarget injectionTarget; if (!type.getJavaClass().isInterface()) { - injectionTarget = beanManager.createInjectionTarget(type); + injectionTarget = beanManager + .getInjectionTargetFactory(beanManager.createAnnotatedType(type.getJavaClass())) + .createInjectionTarget(null); } else { injectionTarget = new DummyInjectionTarget(); } diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanManagerProvider.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanManagerProvider.java index cbf490ed474..8d211a38c0a 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanManagerProvider.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/BeanManagerProvider.java @@ -4,12 +4,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.AfterDeploymentValidation; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.BeforeShutdown; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeforeShutdown; +import jakarta.enterprise.inject.spi.Extension; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Beans.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Beans.java index 7e3d5db2593..175bea5bd76 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Beans.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Beans.java @@ -9,14 +9,14 @@ import java.util.List; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; /** * A set of utility methods for working with beans. diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/CDIHelper.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/CDIHelper.java index c34a8f94638..610b7a40750 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/CDIHelper.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/CDIHelper.java @@ -1,12 +1,12 @@ package org.infinispan.cdi.common.util; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; public class CDIHelper { public static final boolean isCDIAvailable() { try { - CDIHelper.class.getClassLoader().loadClass("javax.enterprise.inject.spi.BeanManager"); + CDIHelper.class.getClassLoader().loadClass("jakarta.enterprise.inject.spi.BeanManager"); return true; } catch(ClassNotFoundException e) { return false; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualLifecycle.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualLifecycle.java index 30d4f39b6fb..13a609afa96 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualLifecycle.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualLifecycle.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.common.util; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; /** * Callbacks used by {@link BeanBuilder} and {@link ImmutableBean} to allow control diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualReference.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualReference.java index c60a7115653..9dd8bb1e81b 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualReference.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ContextualReference.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; /** * Represents a non-contextual instance diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/DefaultLiteral.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/DefaultLiteral.java index 75f0d1c520b..ddd12d8ad4d 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/DefaultLiteral.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/DefaultLiteral.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.common.util; -import javax.enterprise.inject.Default; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.util.AnnotationLiteral; public class DefaultLiteral extends AnnotationLiteral implements Default { private static final long serialVersionUID = -8137340248362361317L; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/DelegatingContextualLifecycle.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/DelegatingContextualLifecycle.java index ed52d587851..ec2db2e6094 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/DelegatingContextualLifecycle.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/DelegatingContextualLifecycle.java @@ -1,8 +1,8 @@ package org.infinispan.cdi.common.util; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionTarget; /** * An implementation of {@link ContextualLifecycle} that is backed by an diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/DummyInjectionTarget.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/DummyInjectionTarget.java index ad78aa30a1e..a30b17d36b8 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/DummyInjectionTarget.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/DummyInjectionTarget.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InjectionTarget; /** * Injection target implementation that does nothing diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingBean.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingBean.java index 9d6f09b65d6..69826074bfc 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingBean.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingBean.java @@ -4,9 +4,9 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; /** * An implementation of {@link Bean} that forwards all calls to the @@ -58,7 +58,7 @@ public boolean isAlternative() { } public boolean isNullable() { - return delegate().isNullable(); + return false; } public T create(CreationalContext creationalContext) { diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingObserverMethod.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingObserverMethod.java index 36da71c690b..6615d186f69 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingObserverMethod.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ForwardingObserverMethod.java @@ -4,9 +4,9 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.spi.ObserverMethod; /** * An implementation of {@link ObserverMethod} that forwards all calls to diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableBean.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableBean.java index c1cb62ce4e3..9d5768f8999 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableBean.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableBean.java @@ -4,11 +4,11 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; /** *

diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableInjectionPoint.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableInjectionPoint.java index d00f061a758..8b375bd51ec 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableInjectionPoint.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutableInjectionPoint.java @@ -8,12 +8,12 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; /** *

diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutablePassivationCapableBean.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutablePassivationCapableBean.java index d1045e9df1d..798e019492f 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutablePassivationCapableBean.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ImmutablePassivationCapableBean.java @@ -4,9 +4,9 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.PassivationCapable; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.PassivationCapable; /** *

diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/InjectableMethod.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/InjectableMethod.java index 45932f3e69c..eb562f45c0c 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/InjectableMethod.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/InjectableMethod.java @@ -4,11 +4,11 @@ import java.util.Collection; import java.util.List; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; /** *

diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ParameterValueRedefiner.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ParameterValueRedefiner.java index 4136a2666a9..aa37e5f23b9 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/ParameterValueRedefiner.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/ParameterValueRedefiner.java @@ -1,8 +1,8 @@ package org.infinispan.cdi.common.util; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; /** * Provides the ability to redefine the value of a parameter on an diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Reflections.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Reflections.java index 66fef99e3dd..040286813df 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Reflections.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Reflections.java @@ -12,8 +12,8 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.BeanManager; /** * Utility class for working with JDK Reflection and also CDI's diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Synthetic.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Synthetic.java index 492da53b412..0b4b68339e4 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/Synthetic.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/Synthetic.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** *

diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedCallableImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedCallableImpl.java index f61ef5ca189..fbafc4479fe 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedCallableImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedCallableImpl.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; -import javax.enterprise.inject.spi.AnnotatedCallable; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.AnnotatedCallable; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; /** * @author Stuart Douglas diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedConstructorImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedConstructorImpl.java index 76405c770f1..78acca91d52 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedConstructorImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedConstructorImpl.java @@ -4,7 +4,7 @@ import java.lang.reflect.Type; import java.util.Map; -import javax.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; /** * @author Stuart Douglas diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedFieldImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedFieldImpl.java index 32a44c10121..6106c81dd0e 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedFieldImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedFieldImpl.java @@ -3,8 +3,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Type; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedType; /** * @author Stuart Douglas diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedImpl.java index 3232b17e764..59dbdd567b3 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedImpl.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.Annotated; import org.infinispan.cdi.common.util.HierarchyDiscovery; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMemberImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMemberImpl.java index b8019a04987..39d6f8aa8c2 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMemberImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMemberImpl.java @@ -4,8 +4,8 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.AnnotatedType; /** * @author Stuart Douglas diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMethodImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMethodImpl.java index 25c437f4424..e76dcff4c20 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMethodImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedMethodImpl.java @@ -4,8 +4,8 @@ import java.lang.reflect.Type; import java.util.Map; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedType; /** * @author Stuart Douglas diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedParameterImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedParameterImpl.java index d2107c19fd8..b1d6388cbb8 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedParameterImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedParameterImpl.java @@ -2,8 +2,8 @@ import java.lang.reflect.Type; -import javax.enterprise.inject.spi.AnnotatedCallable; -import javax.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedCallable; +import jakarta.enterprise.inject.spi.AnnotatedParameter; /** * @author Stuart Douglas diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeBuilder.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeBuilder.java index 3322e10175c..c3928906072 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeBuilder.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeBuilder.java @@ -9,12 +9,12 @@ import java.util.Map; import java.util.Map.Entry; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; import org.infinispan.cdi.common.util.Reflections; import org.infinispan.cdi.common.util.logging.Log; diff --git a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeImpl.java b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeImpl.java index 8e08a13b464..cc2db7152aa 100644 --- a/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeImpl.java +++ b/cdi/common/src/main/java/org/infinispan/cdi/common/util/annotatedtypebuilder/AnnotatedTypeImpl.java @@ -10,10 +10,10 @@ import java.util.Map.Entry; import java.util.Set; -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedType; /** * AnnotatedType implementation for adding beans in the BeforeBeanDiscovery diff --git a/cdi/embedded-jakarta/jakarta.txt b/cdi/embedded-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cdi/embedded-jakarta/pom.xml b/cdi/embedded-jakarta/pom.xml deleted file mode 100644 index 0240e632068..00000000000 --- a/cdi/embedded-jakarta/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - - org.infinispan - infinispan-cdi-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-cdi-embedded-jakarta - Infinispan CDI embedded Jakarta EE support - - - true - true - false - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - 4.0.1 - - - - org.infinispan - infinispan-cdi-common-jakarta - ${project.version} - - - - org.infinispan - infinispan-core-jakarta - ${project.version} - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - diff --git a/cdi/embedded-jakarta/src/main/java/org/infinispan/cdi/embedded/package-info.java b/cdi/embedded-jakarta/src/main/java/org/infinispan/cdi/embedded/package-info.java deleted file mode 100644 index fe4353b16cd..00000000000 --- a/cdi/embedded-jakarta/src/main/java/org/infinispan/cdi/embedded/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan CDI Embedded using the Jakarta EE APIs. - */ -package org.infinispan.cdi.embedded; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/AdvancedCacheProducer.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/AdvancedCacheProducer.java index 30ae82ec3e1..ddbc0989e62 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/AdvancedCacheProducer.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/AdvancedCacheProducer.java @@ -3,11 +3,11 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/InfinispanExtensionEmbedded.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/InfinispanExtensionEmbedded.java index 5b9f54828e0..1dc229814a4 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/InfinispanExtensionEmbedded.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/InfinispanExtensionEmbedded.java @@ -4,19 +4,19 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.ProcessBean; -import javax.enterprise.inject.spi.ProcessProducer; -import javax.enterprise.inject.spi.Producer; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.ProcessBean; +import jakarta.enterprise.inject.spi.ProcessProducer; +import jakarta.enterprise.inject.spi.Producer; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.AdvancedCache; import org.infinispan.Cache; @@ -168,8 +168,8 @@ public void registerCacheConfigurations(CacheManagerEventBridge eventBridge, Ins /** * The default embedded cache configuration can be overridden by creating a producer which * produces the new default configuration. The configuration produced must have the scope - * {@linkplain javax.enterprise.context.Dependent Dependent} and the - * {@linkplain javax.enterprise.inject.Default Default} qualifier. + * {@linkplain jakarta.enterprise.context.Dependent Dependent} and the + * {@linkplain jakarta.enterprise.inject.Default Default} qualifier. * * @param beanManager * @return a custom bean @@ -196,7 +196,7 @@ public Configuration create(Bean bean, * {@link #createDefaultEmbeddedConfigurationBean(BeanManager, Configuration)} or provided by user). The default * cache manager can be overridden by creating a producer which produces the new default cache * manager. The cache manager produced must have the scope {@link ApplicationScoped} and the - * {@linkplain javax.enterprise.inject.Default Default} qualifier. + * {@linkplain jakarta.enterprise.inject.Default Default} qualifier. * * @param beanManager * @return a custom bean diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/AbstractEventBridge.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/AbstractEventBridge.java index 3139078968f..a2e4f9c5bf8 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/AbstractEventBridge.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/AbstractEventBridge.java @@ -2,9 +2,9 @@ import java.lang.annotation.Annotation; -import javax.enterprise.event.Event; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; /** * @author Pete Muir diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/AbstractAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/AbstractAdapter.java index 1c28ee96d7a..459ebc47bc2 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/AbstractAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/AbstractAdapter.java @@ -1,6 +1,6 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; /** * @author Pete Muir diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntriesEvictedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntriesEvictedAdapter.java index 81c1cccfd99..f974709a7f4 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntriesEvictedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntriesEvictedAdapter.java @@ -2,8 +2,8 @@ import java.util.Map; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.notifications.Listener; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryActivatedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryActivatedAdapter.java index aa06efccfa2..630310a30b6 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryActivatedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryActivatedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryCreatedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryCreatedAdapter.java index 442b953b620..3057043d382 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryCreatedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryCreatedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryExpiredAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryExpiredAdapter.java index 5cfb47c1e95..43827c475f6 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryExpiredAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryExpiredAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryInvalidatedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryInvalidatedAdapter.java index 5c34cbd1296..f2af53397a0 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryInvalidatedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryInvalidatedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryLoadedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryLoadedAdapter.java index 7f8ef403860..d255e2ab5f4 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryLoadedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryLoadedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryModifiedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryModifiedAdapter.java index 450080bc53d..a2da0b56f54 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryModifiedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryModifiedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryPassivatedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryPassivatedAdapter.java index 82d8a4a8405..2d6ee73ee99 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryPassivatedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryPassivatedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryRemovedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryRemovedAdapter.java index dfdff05b2d9..719156fdec7 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryRemovedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryRemovedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryVisitedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryVisitedAdapter.java index 9c689fee5cf..eaf874a20a8 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryVisitedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEntryVisitedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.metadata.Metadata; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEventBridge.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEventBridge.java index cb8221760c0..b454edb49ea 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEventBridge.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/CacheEventBridge.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.infinispan.cdi.embedded.event.AbstractEventBridge; import org.infinispan.notifications.Listenable; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/DataRehashedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/DataRehashedAdapter.java index 7fd3d5a212b..800154b383d 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/DataRehashedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/DataRehashedAdapter.java @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.distribution.ch.ConsistentHash; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TopologyChangedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TopologyChangedAdapter.java index f4895f695f5..ba67dd5000a 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TopologyChangedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TopologyChangedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.distribution.ch.ConsistentHash; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionCompletedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionCompletedAdapter.java index 1c05617b117..5e961f27407 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionCompletedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionCompletedAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.notifications.Listener; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionRegisteredAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionRegisteredAdapter.java index 1f1ee6afaf5..2e5cf18e6a2 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionRegisteredAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cache/TransactionRegisteredAdapter.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.event.cache; -import javax.enterprise.event.Event; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.util.TypeLiteral; import org.infinispan.Cache; import org.infinispan.notifications.Listener; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/AbstractAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/AbstractAdapter.java index 60e8b5b33cf..b119ce377f8 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/AbstractAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/AbstractAdapter.java @@ -1,6 +1,6 @@ package org.infinispan.cdi.embedded.event.cachemanager; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; /** * @author Pete Muir diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheManagerEventBridge.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheManagerEventBridge.java index 138ed369d85..fd84f0cde4b 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheManagerEventBridge.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheManagerEventBridge.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.infinispan.cdi.embedded.event.AbstractEventBridge; import org.infinispan.notifications.Listenable; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStartedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStartedAdapter.java index a2fd99edfb0..3dc9632d52a 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStartedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStartedAdapter.java @@ -1,6 +1,6 @@ package org.infinispan.cdi.embedded.event.cachemanager; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.notifications.Listener; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStoppedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStoppedAdapter.java index 893b7258aa9..2e7c4954607 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStoppedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/CacheStoppedAdapter.java @@ -1,6 +1,6 @@ package org.infinispan.cdi.embedded.event.cachemanager; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.notifications.Listener; diff --git a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/ViewChangedAdapter.java b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/ViewChangedAdapter.java index 12351913411..06162c20cc3 100644 --- a/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/ViewChangedAdapter.java +++ b/cdi/embedded/src/main/java/org/infinispan/cdi/embedded/event/cachemanager/ViewChangedAdapter.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.notifications.Listener; diff --git a/cdi/embedded/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/cdi/embedded/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from cdi/embedded/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to cdi/embedded/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/DefaultTestEmbeddedCacheManagerProducer.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/DefaultTestEmbeddedCacheManagerProducer.java index fa90d78b50a..48bacacad1d 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/DefaultTestEmbeddedCacheManagerProducer.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/DefaultTestEmbeddedCacheManagerProducer.java @@ -2,9 +2,9 @@ import static org.infinispan.test.fwk.TestCacheManagerFactory.createClusteredCacheManager; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.infinispan.configuration.cache.Configuration; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/ServiceLoaderTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/ServiceLoaderTest.java index 45f8c464415..4f7930818fe 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/ServiceLoaderTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/ServiceLoaderTest.java @@ -4,7 +4,7 @@ import java.util.ServiceLoader; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; import org.infinispan.cdi.embedded.InfinispanExtensionEmbedded; import org.testng.annotations.Test; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/DefaultCacheTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/DefaultCacheTest.java index e4740f1024d..3b234356a46 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/DefaultCacheTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/DefaultCacheTest.java @@ -3,7 +3,7 @@ import static org.infinispan.cdi.embedded.test.testutil.Deployments.baseDeployment; import static org.testng.Assert.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Config.java index 53f73a5d849..a3baf5c90d2 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Config.java @@ -1,6 +1,6 @@ package org.infinispan.cdi.embedded.test.cache.configured; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/ConfiguredCacheTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/ConfiguredCacheTest.java index b7cf4792296..cdae690026d 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/ConfiguredCacheTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/ConfiguredCacheTest.java @@ -2,7 +2,7 @@ import static org.testng.Assert.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.AdvancedCache; import org.infinispan.cdi.embedded.test.DefaultTestEmbeddedCacheManagerProducer; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Small.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Small.java index d8471a00a73..30769b0cd6a 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Small.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Small.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Tiny.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Tiny.java index cfb31dbb037..e89ad4be4ca 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Tiny.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/configured/Tiny.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Config.java index c6afffbff51..f8978ecbea8 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Config.java @@ -1,8 +1,8 @@ package org.infinispan.cdi.embedded.test.cache.specific; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Large.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Large.java index 6efa763cc6b..e7af8f0c8e0 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Large.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Large.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Small.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Small.java index 98688472803..aaa32e7efee 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Small.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/Small.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/SpecificCacheManagerTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/SpecificCacheManagerTest.java index 9c30c572bd9..ca601f4757a 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/SpecificCacheManagerTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cache/specific/SpecificCacheManagerTest.java @@ -5,8 +5,8 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.infinispan.Cache; import org.infinispan.cdi.embedded.InfinispanExtensionEmbedded; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/DefaultConfigurationTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/DefaultConfigurationTest.java index 1be2cb4d213..1f64454003c 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/DefaultConfigurationTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/DefaultConfigurationTest.java @@ -3,9 +3,9 @@ import static org.infinispan.cdi.embedded.test.testutil.Deployments.baseDeployment; import static org.testng.Assert.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.infinispan.Cache; import org.infinispan.cdi.embedded.test.DefaultTestEmbeddedCacheManagerProducer; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Config.java index 0f273f08baf..e4342a1e150 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Config.java @@ -1,8 +1,8 @@ package org.infinispan.cdi.embedded.test.cachemanager.external; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/ExternalCacheContainerTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/ExternalCacheContainerTest.java index 1eed8c275f6..7332ce4ae69 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/ExternalCacheContainerTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/ExternalCacheContainerTest.java @@ -3,7 +3,7 @@ import static org.infinispan.cdi.embedded.test.testutil.Deployments.baseDeployment; import static org.testng.Assert.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.AdvancedCache; import org.infinispan.commons.test.TestResourceTrackingListener; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Large.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Large.java index a1f939ecda1..ef3f3383da6 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Large.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Large.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Pete Muir diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Quick.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Quick.java index c33e2145f53..1ad16d171b4 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Quick.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/external/Quick.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Pete Muir diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Config.java index 27e26b98688..f1bfed19253 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Config.java @@ -1,9 +1,9 @@ package org.infinispan.cdi.embedded.test.cachemanager.programmatic; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/ProgrammaticCacheContainerTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/ProgrammaticCacheContainerTest.java index 05d927ca7d2..3963fb47f10 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/ProgrammaticCacheContainerTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/ProgrammaticCacheContainerTest.java @@ -2,8 +2,8 @@ import static org.testng.Assert.assertEquals; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.infinispan.AdvancedCache; import org.infinispan.cdi.embedded.test.testutil.Deployments; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Small.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Small.java index 8570f5a3e23..9f5badd442b 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Small.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/Small.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Pete Muir diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/SmallCacheObservers.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/SmallCacheObservers.java index 76d7ab13f15..bf638dfeda6 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/SmallCacheObservers.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/programmatic/SmallCacheObservers.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.test.cachemanager.programmatic; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/CacheRegistrationTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/CacheRegistrationTest.java index 036fa26f2eb..e221a5b7e59 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/CacheRegistrationTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/CacheRegistrationTest.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.Cache; import org.infinispan.cdi.embedded.test.DefaultTestEmbeddedCacheManagerProducer; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Config.java index 8a81f76bfea..da026456900 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Config.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.test.cachemanager.registration; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Large.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Large.java index abae58b5b1a..70014c2f471 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Large.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Large.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Small.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Small.java index 3dce24bdc1e..360b23dbaac 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Small.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/Small.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/VeryLarge.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/VeryLarge.java index f55d7cb7671..f7afb8565bb 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/VeryLarge.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/registration/VeryLarge.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Config.java index 0d79720ea06..308547e6fb6 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Config.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Quick.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Quick.java index e5524d568b8..d67b96f98f4 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Quick.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/Quick.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Pete Muir diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/VeryLarge.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/VeryLarge.java index 5803525cd4d..dfaf6fb5b9a 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/VeryLarge.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/VeryLarge.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Pete Muir diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/XMLConfiguredCacheContainerTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/XMLConfiguredCacheContainerTest.java index 806be5d6052..2bfa3484de3 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/XMLConfiguredCacheContainerTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/xml/XMLConfiguredCacheContainerTest.java @@ -3,7 +3,7 @@ import static org.infinispan.cdi.embedded.test.testutil.Deployments.baseDeployment; import static org.testng.AssertJUnit.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.AdvancedCache; import org.infinispan.commons.test.TestResourceTrackingListener; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache1.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache1.java index 63732efafad..8861ed1ac1f 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache1.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache1.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Qualifier for Cache1 diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache2.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache2.java index 49c6395a1c1..3dd5bb4d067 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache2.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Cache2.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Qualifier for Cache2 diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheEventTest.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheEventTest.java index 189daccf31d..5d2f9e60479 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheEventTest.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheEventTest.java @@ -5,7 +5,7 @@ import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.AdvancedCache; import org.infinispan.cdi.embedded.test.DefaultTestEmbeddedCacheManagerProducer; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheObserver.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheObserver.java index 20147196b39..25faffb4a7a 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheObserver.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/CacheObserver.java @@ -1,7 +1,7 @@ package org.infinispan.cdi.embedded.test.event; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.infinispan.notifications.cachelistener.event.CacheEntriesEvictedEvent; import org.infinispan.notifications.cachelistener.event.CacheEntryActivatedEvent; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Config.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Config.java index 9548d6a9ce3..cdeb2167b9a 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Config.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/event/Config.java @@ -1,6 +1,6 @@ package org.infinispan.cdi.embedded.test.event; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import org.infinispan.cdi.embedded.ConfigureCache; import org.infinispan.configuration.cache.Configuration; diff --git a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/testutil/Deployments.java b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/testutil/Deployments.java index 11a6e1f4b12..aa7ba3bc40c 100644 --- a/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/testutil/Deployments.java +++ b/cdi/embedded/src/test/java/org/infinispan/cdi/embedded/test/testutil/Deployments.java @@ -27,7 +27,7 @@ public static WebArchive baseDeployment() { .addPackage(CacheEventBridge.class.getPackage()) .addPackage(CacheManagerEventBridge.class.getPackage()) .addAsManifestResource(ConfigureCache.class.getResource("/META-INF/beans.xml"), "beans.xml") - .addAsManifestResource(ConfigureCache.class.getResource("/META-INF/services/javax.enterprise.inject.spi.Extension"), "services/javax.enterprise.inject.spi.Extension") + .addAsManifestResource(ConfigureCache.class.getResource("/META-INF/services/jakarta.enterprise.inject.spi.Extension"), "services/jakarta.enterprise.inject.spi.Extension") ); } } diff --git a/cdi/embedded/src/test/resources/META-INF/beans.xml b/cdi/embedded/src/test/resources/META-INF/beans.xml new file mode 100644 index 00000000000..1a39a49b81c --- /dev/null +++ b/cdi/embedded/src/test/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + diff --git a/cdi/remote-jakarta/jakarta.txt b/cdi/remote-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cdi/remote-jakarta/pom.xml b/cdi/remote-jakarta/pom.xml deleted file mode 100644 index 4f41e23472c..00000000000 --- a/cdi/remote-jakarta/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - - org.infinispan - infinispan-parent - 15.0.0-SNAPSHOT - ../../pom.xml - - - infinispan-cdi-remote-jakarta - Infinispan CDI remote Jakarta EE support - - - true - true - false - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - 4.0.1 - - - org.infinispan - infinispan-cdi-common-jakarta - ${project.version} - - - org.infinispan - infinispan-client-hotrod-jakarta - ${project.version} - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - org.infinispan - infinispan-query-dsl - true - - - org.infinispan - infinispan-commons - - - - - diff --git a/cdi/remote-jakarta/src/main/java/org/infinispan/cdi/remote/package-info.java b/cdi/remote-jakarta/src/main/java/org/infinispan/cdi/remote/package-info.java deleted file mode 100644 index dc0c6400d3b..00000000000 --- a/cdi/remote-jakarta/src/main/java/org/infinispan/cdi/remote/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan CDI Remote using the Jakarta EE APIs. - */ -package org.infinispan.cdi.remote; diff --git a/cdi/remote/src/main/java/org/infinispan/cdi/remote/InfinispanExtensionRemote.java b/cdi/remote/src/main/java/org/infinispan/cdi/remote/InfinispanExtensionRemote.java index a023ce419c7..69e2bbe92ca 100644 --- a/cdi/remote/src/main/java/org/infinispan/cdi/remote/InfinispanExtensionRemote.java +++ b/cdi/remote/src/main/java/org/infinispan/cdi/remote/InfinispanExtensionRemote.java @@ -6,22 +6,22 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.InjectionTarget; -import javax.enterprise.inject.spi.ProcessInjectionTarget; -import javax.enterprise.inject.spi.ProcessProducer; -import javax.enterprise.inject.spi.Producer; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.inject.spi.ProcessInjectionTarget; +import jakarta.enterprise.inject.spi.ProcessProducer; +import jakarta.enterprise.inject.spi.Producer; +import jakarta.enterprise.util.AnnotationLiteral; import org.infinispan.cdi.common.util.AnyLiteral; import org.infinispan.cdi.common.util.BeanBuilder; @@ -120,7 +120,7 @@ public void destroy(Bean> bean, RemoteCache instance, Cr /** * The default remote cache manager can be overridden by creating a producer which produces the new default remote * cache manager. The remote cache manager produced must have the scope {@link ApplicationScoped} and the - * {@linkplain javax.enterprise.inject.Default Default} qualifier. + * {@linkplain jakarta.enterprise.inject.Default Default} qualifier. * * @param beanManager * @return a custom bean diff --git a/cdi/remote/src/main/java/org/infinispan/cdi/remote/Remote.java b/cdi/remote/src/main/java/org/infinispan/cdi/remote/Remote.java index ac763835ac9..66a09844184 100644 --- a/cdi/remote/src/main/java/org/infinispan/cdi/remote/Remote.java +++ b/cdi/remote/src/main/java/org/infinispan/cdi/remote/Remote.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; /** * Qualifier used to specify which remote cache will be injected. diff --git a/cdi/remote/src/main/java/org/infinispan/cdi/remote/RemoteCacheProducer.java b/cdi/remote/src/main/java/org/infinispan/cdi/remote/RemoteCacheProducer.java index 9cea2f0b969..b4a2429c0c2 100644 --- a/cdi/remote/src/main/java/org/infinispan/cdi/remote/RemoteCacheProducer.java +++ b/cdi/remote/src/main/java/org/infinispan/cdi/remote/RemoteCacheProducer.java @@ -5,13 +5,13 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/cdi/remote/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/cdi/remote/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from cdi/remote/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to cdi/remote/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/Deployments.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/Deployments.java index 0a580a51598..d1d8bdfee75 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/Deployments.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/Deployments.java @@ -21,7 +21,7 @@ public static WebArchive baseDeployment() { ShrinkWrap.create(JavaArchive.class, "infinispan-cdi-remote.jar") .addPackage(Remote.class.getPackage()) .addAsManifestResource(Remote.class.getResource("/META-INF/beans.xml"), "beans.xml") - .addAsManifestResource(Remote.class.getResource("/META-INF/services/javax.enterprise.inject.spi.Extension"), "services/javax.enterprise.inject.spi.Extension") + .addAsManifestResource(Remote.class.getResource("/META-INF/services/jakarta.enterprise.inject.spi.Extension"), "services/jakarta.enterprise.inject.spi.Extension") ); } } diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/DefaultCacheTest.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/DefaultCacheTest.java index baac8bfe611..96f086ab9c7 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/DefaultCacheTest.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/DefaultCacheTest.java @@ -5,10 +5,10 @@ import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration; import static org.testng.Assert.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.infinispan.cdi.remote.Remote; import org.infinispan.client.hotrod.RemoteCache; diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/NamedCacheTest.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/NamedCacheTest.java index a1be5c50e32..6c00e3de69b 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/NamedCacheTest.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/NamedCacheTest.java @@ -5,10 +5,10 @@ import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration; import static org.testng.Assert.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.infinispan.cdi.remote.Remote; import org.infinispan.client.hotrod.RemoteCache; diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/Small.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/Small.java index d7598b98c83..3c38d1033c1 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/Small.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/Small.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.infinispan.cdi.remote.Remote; diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/SpecificCacheManagerTest.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/SpecificCacheManagerTest.java index 3fe48554732..752f7dae421 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/SpecificCacheManagerTest.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cache/remote/SpecificCacheManagerTest.java @@ -4,11 +4,11 @@ import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration; import static org.testng.Assert.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.infinispan.cdi.embedded.test.Deployments; import org.infinispan.client.hotrod.RemoteCache; diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java index 30bab7a7517..e59dd213319 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java @@ -4,10 +4,10 @@ import java.util.Properties; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.infinispan.cdi.embedded.test.Deployments; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerTest.java b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerTest.java index ee6c347856c..e9fed80e12b 100644 --- a/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerTest.java +++ b/cdi/remote/src/test/java/org/infinispan/cdi/embedded/test/cachemanager/remote/DefaultCacheManagerTest.java @@ -4,7 +4,7 @@ import java.util.Properties; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.infinispan.cdi.embedded.test.Deployments; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/cdi/remote/src/test/resources/META-INF/beans.xml b/cdi/remote/src/test/resources/META-INF/beans.xml new file mode 100644 index 00000000000..1a39a49b81c --- /dev/null +++ b/cdi/remote/src/test/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + diff --git a/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Uninstall.java b/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Uninstall.java index 4c80817a475..259a4daf28f 100644 --- a/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Uninstall.java +++ b/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Uninstall.java @@ -50,10 +50,10 @@ public CommandResult exec(ContextAwareCommandInvocation invocation) { } Map status = (Map) sub.getAdditionalProperties().get("status"); String csv = (String) status.get("installedCSV"); - boolean deleted = subscription.delete(); + boolean deleted = subscription.delete().size() > 0; if (deleted) { // Now delete the CSV - deleted = client.genericKubernetesResources(Kube.OPERATOR_CLUSTERSERVICEVERSION_CRD).inNamespace(namespace).withName(csv).delete(); + deleted = client.genericKubernetesResources(Kube.OPERATOR_CLUSTERSERVICEVERSION_CRD).inNamespace(namespace).withName(csv).delete().size() > 0; return deleted ? CommandResult.SUCCESS : CommandResult.FAILURE; } else { return CommandResult.FAILURE; diff --git a/client/hotrod-client-jakarta/jakarta.txt b/client/hotrod-client-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/client/hotrod-client-jakarta/pom.xml b/client/hotrod-client-jakarta/pom.xml deleted file mode 100644 index 5b9339ab33c..00000000000 --- a/client/hotrod-client-jakarta/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - infinispan-parent - org.infinispan - 15.0.0-SNAPSHOT - ../../pom.xml - - 4.0.0 - - infinispan-client-hotrod-jakarta - Infinispan Hot Rod Client Jakarta EE - Infinispan Hot Rod Client Jakarta EE - - - true - true - false - - - - - org.infinispan - infinispan-commons-jakarta - ${project.version} - - - - org.wildfly.security - wildfly-elytron-sasl-digest - - - - org.wildfly.security - wildfly-elytron-sasl-external - - - - org.wildfly.security - wildfly-elytron-sasl-gs2 - - - - org.wildfly.security - wildfly-elytron-sasl-gssapi - - - - org.wildfly.security - wildfly-elytron-sasl-oauth2 - - - - org.wildfly.security - wildfly-elytron-sasl-plain - - - - org.wildfly.security - wildfly-elytron-sasl-scram - - - - org.wildfly.security - wildfly-elytron-password-impl - - - - io.netty - netty-handler - - - - io.reactivex.rxjava3 - rxjava - - - - io.netty - netty-transport-native-epoll - linux-x86_64 - - - - io.netty - netty-transport-native-epoll - linux-aarch_64 - - - - io.netty.incubator - netty-incubator-transport-native-io_uring - true - - - - io.netty.incubator - netty-incubator-transport-native-io_uring - linux-x86_64 - true - - - - io.netty.incubator - netty-incubator-transport-native-io_uring - linux-aarch_64 - true - - - - org.infinispan - infinispan-query-dsl - true - - - org.infinispan - infinispan-commons - - - - - - org.infinispan - infinispan-remote-query-client - true - - - org.infinispan - infinispan-commons - - - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - - io.opentelemetry - opentelemetry-api - true - - - diff --git a/client/hotrod-client-jakarta/src/main/java/org/infinispan/client/hotrod/package-info.java b/client/hotrod-client-jakarta/src/main/java/org/infinispan/client/hotrod/package-info.java deleted file mode 100644 index 99ac61f399a..00000000000 --- a/client/hotrod-client-jakarta/src/main/java/org/infinispan/client/hotrod/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Hot Rod Client using the Jakarta EE APIs. - */ -package org.infinispan.client.hotrod; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheContainer.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheContainer.java index e275883f464..d2cc1760e1c 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheContainer.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheContainer.java @@ -1,6 +1,6 @@ package org.infinispan.client.hotrod; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.configuration.Configuration; import org.infinispan.client.hotrod.configuration.TransactionMode; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java index decd173953a..32c69829c61 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java @@ -26,7 +26,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.client.hotrod.configuration.Configuration; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java index af1f34c40ac..175e21c7784 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import javax.transaction.xa.XAResource; import org.infinispan.client.hotrod.FailoverRequestBalancingStrategy; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/RemoteCacheConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/RemoteCacheConfigurationBuilder.java index cab852e8ba3..acc86aff4cc 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/RemoteCacheConfigurationBuilder.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/RemoteCacheConfigurationBuilder.java @@ -23,7 +23,7 @@ import java.util.Scanner; import java.util.function.Consumer; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.DefaultTemplate; import org.infinispan.client.hotrod.RemoteCache; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionConfigurationBuilder.java index 13842df3dee..f018da64d1d 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionConfigurationBuilder.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionConfigurationBuilder.java @@ -10,8 +10,8 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; -import javax.transaction.Synchronization; -import javax.transaction.TransactionManager; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.client.hotrod.RemoteCache; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionMode.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionMode.java index 7717ebcb641..9840fc4dfa1 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionMode.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/TransactionMode.java @@ -1,7 +1,7 @@ package org.infinispan.client.hotrod.configuration; -import javax.transaction.Synchronization; -import javax.transaction.Transaction; +import jakarta.transaction.Synchronization; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAResource; import org.infinispan.client.hotrod.RemoteCache; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/SyncModeTransactionTable.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/SyncModeTransactionTable.java index 8d7708b0efc..eae949f9d93 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/SyncModeTransactionTable.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/SyncModeTransactionTable.java @@ -9,11 +9,11 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAResource; import org.infinispan.client.hotrod.RemoteCache; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionContext.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionContext.java index c394b503a0d..f7b31595173 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionContext.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionContext.java @@ -13,7 +13,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionTable.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionTable.java index ea7080ffcec..a75d1b83907 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionTable.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionTable.java @@ -1,6 +1,6 @@ package org.infinispan.client.hotrod.impl.transaction; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; /** * A {@link Transaction} table that knows how to interact with the {@link Transaction} and how the {@link diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java index 7f2db5a9b80..e779025e700 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java @@ -6,9 +6,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.MetadataValue; import org.infinispan.client.hotrod.RemoteCache; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/XaModeTransactionTable.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/XaModeTransactionTable.java index 0b3b78033ba..5e64a878eb8 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/XaModeTransactionTable.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/XaModeTransactionTable.java @@ -10,9 +10,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/CompleteTransactionOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/CompleteTransactionOperation.java index 2f19121a2fa..7a4df2fac61 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/CompleteTransactionOperation.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/CompleteTransactionOperation.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicReference; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/PrepareTransactionOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/PrepareTransactionOperation.java index 3227f5d767e..94924062b60 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/PrepareTransactionOperation.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/PrepareTransactionOperation.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.Xid; import org.infinispan.client.hotrod.configuration.Configuration; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/RecoveryOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/RecoveryOperation.java index 8ce93efb495..fd0544048aa 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/RecoveryOperation.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transaction/operations/RecoveryOperation.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.concurrent.atomic.AtomicReference; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.Xid; import org.infinispan.client.hotrod.configuration.Configuration; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/GenericTransactionManagerLookup.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/GenericTransactionManagerLookup.java index 040d937338b..28091b5323a 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/GenericTransactionManagerLookup.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/GenericTransactionManagerLookup.java @@ -4,7 +4,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.transaction.manager.RemoteTransactionManager; import org.infinispan.commons.util.Util; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java index 2e81e4ce961..b66d15f2fdc 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java @@ -1,6 +1,6 @@ package org.infinispan.client.hotrod.transaction.lookup; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.transaction.manager.RemoteTransactionManager; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransaction.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransaction.java index f3958919b72..12859802512 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransaction.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransaction.java @@ -1,6 +1,6 @@ package org.infinispan.client.hotrod.transaction.manager; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.tx.TransactionImpl; diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransactionManager.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransactionManager.java index 780c09fee97..7ea1c891977 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransactionManager.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/transaction/manager/RemoteTransactionManager.java @@ -2,8 +2,8 @@ import java.util.UUID; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.tx.TransactionManagerImpl; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/APITxTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/APITxTest.java index 8f0c9c62f73..0016d05d69f 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/APITxTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/APITxTest.java @@ -23,9 +23,9 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.MetadataValue; import org.infinispan.client.hotrod.RemoteCache; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/InvalidServerConfigTxTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/InvalidServerConfigTxTest.java index 85d1d33a4a1..9b42f1d92db 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/InvalidServerConfigTxTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/InvalidServerConfigTxTest.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.configuration.TransactionMode; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/LCROTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/LCROTest.java index 900b57be6c9..e8b6f44dd81 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/LCROTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/LCROTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collection; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/MultipleCacheTxFunctionalTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/MultipleCacheTxFunctionalTest.java index 31f41d96572..a63ebc66948 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/MultipleCacheTxFunctionalTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/MultipleCacheTxFunctionalTest.java @@ -11,9 +11,9 @@ import java.util.Arrays; import java.util.stream.Stream; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/RecoveryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/RecoveryTest.java index 49ee324fbff..a59382999a2 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/RecoveryTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/RecoveryTest.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/TxFunctionalTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/TxFunctionalTest.java index 60d975ef6bd..b655943ef52 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/TxFunctionalTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/TxFunctionalTest.java @@ -10,9 +10,9 @@ import java.util.Arrays; import java.util.stream.Stream; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/util/TransactionSetup.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/util/TransactionSetup.java index 67d60d80060..47cc1c106d3 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/util/TransactionSetup.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/tx/util/TransactionSetup.java @@ -7,7 +7,7 @@ import org.infinispan.configuration.global.GlobalConfigurationBuilder; import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * Setup the {@link TransactionManager} for test classes. diff --git a/client/hotrod-jakarta/jakarta.txt b/client/hotrod-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/client/hotrod-jakarta/pom.xml b/client/hotrod-jakarta/pom.xml deleted file mode 100644 index 71b61409a20..00000000000 --- a/client/hotrod-jakarta/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - infinispan-parent - org.infinispan - 15.0.0-SNAPSHOT - ../../pom.xml - - 4.0.0 - - infinispan-hotrod-jakarta - Infinispan Hot Rod Client Jakarta EE - Infinispan Hot Rod Client Jakarta EE - - - true - true - false - - - - - org.infinispan - infinispan-api - - - org.infinispan - infinispan-commons-jakarta - ${project.version} - - - io.smallrye.reactive - mutiny - - - org.wildfly.security - wildfly-elytron-sasl-digest - - - org.wildfly.security - wildfly-elytron-sasl-external - - - org.wildfly.security - wildfly-elytron-sasl-gs2 - - - org.wildfly.security - wildfly-elytron-sasl-gssapi - - - org.wildfly.security - wildfly-elytron-sasl-oauth2 - - - org.wildfly.security - wildfly-elytron-sasl-plain - - - org.wildfly.security - wildfly-elytron-sasl-scram - - - org.wildfly.security - wildfly-elytron-password-impl - - - io.netty - netty-handler - - - io.reactivex.rxjava3 - rxjava - - - io.netty - netty-transport-native-epoll - linux-x86_64 - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - true - - - org.kohsuke.metainf-services - metainf-services - true - - - io.opentelemetry - opentelemetry-api - true - - - diff --git a/client/hotrod-jakarta/src/main/java/org/infinispan/hotrod/package-info.java b/client/hotrod-jakarta/src/main/java/org/infinispan/hotrod/package-info.java deleted file mode 100644 index 709c51bfa6b..00000000000 --- a/client/hotrod-jakarta/src/main/java/org/infinispan/hotrod/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Hot Rod Client using the Jakarta EE APIs. - */ -package org.infinispan.hotrod; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyCache.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyCache.java index abed8a48b18..5e680271f9b 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyCache.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyCache.java @@ -1,8 +1,7 @@ package org.infinispan.hotrod; -import java.util.Map; -import java.util.Set; - +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; import org.infinispan.api.common.CacheEntry; import org.infinispan.api.common.CacheEntryVersion; import org.infinispan.api.common.CacheOptions; @@ -17,10 +16,9 @@ import org.infinispan.api.mutiny.MutinyQuery; import org.infinispan.api.mutiny.MutinyStreamingCache; import org.infinispan.hotrod.impl.cache.RemoteCache; -import org.reactivestreams.FlowAdapters; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; +import java.util.Map; +import java.util.Set; /** * @since 14.0 @@ -91,27 +89,27 @@ public Uni> getAndRemove(K key, CacheOptions options) { @Override public Multi keys(CacheOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.keys(options))); + return Multi.createFrom().publisher(remoteCache.keys(options)); } @Override public Multi> entries(CacheOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.entries(options))); + return Multi.createFrom().publisher(remoteCache.entries(options)); } @Override public Multi> getAll(Set keys, CacheOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.getAll(keys, options))); + return Multi.createFrom().publisher(remoteCache.getAll(keys, options)); } @Override public Multi> getAll(CacheOptions options, K... keys) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.getAll(options, keys))); + return Multi.createFrom().publisher(remoteCache.getAll(options, keys)); } @Override public Uni putAll(Multi> entries, CacheWriteOptions options) { - return Uni.createFrom().completionStage(() -> remoteCache.putAll(FlowAdapters.toFlowPublisher(entries.convert().toPublisher()), options)); + return Uni.createFrom().completionStage(() -> remoteCache.putAll(entries.convert().toPublisher(), options)); } @Override @@ -131,19 +129,17 @@ public Uni> getOrReplaceEntry(K key, V value, CacheEntryVersion @Override public Multi removeAll(Set keys, CacheWriteOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.removeAll(keys, options))); + return Multi.createFrom().publisher(remoteCache.removeAll(keys, options)); } @Override public Multi removeAll(Multi keys, CacheWriteOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.removeAll( - FlowAdapters.toFlowPublisher(keys.convert().toPublisher()), options))); + return Multi.createFrom().publisher(remoteCache.removeAll(keys.convert().toPublisher(), options)); } @Override public Multi> getAndRemoveAll(Multi keys, CacheWriteOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.getAndRemoveAll( - FlowAdapters.toFlowPublisher(keys.convert().toPublisher()), options))); + return Multi.createFrom().publisher(remoteCache.getAndRemoveAll(keys.convert().toPublisher(), options)); } @Override @@ -163,17 +159,16 @@ public MutinyQuery query(String query, CacheOptions options) { @Override public Multi> listen(CacheListenerOptions options, CacheEntryEventType... types) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher(remoteCache.listen(options, types))); + return Multi.createFrom().publisher(remoteCache.listen(options, types)); } @Override public Multi> process(Set keys, MutinyCacheEntryProcessor processor, CacheOptions options) { - return Multi.createFrom().publisher(FlowAdapters.toPublisher( - remoteCache.process(keys, new MutinyToAsyncCacheEntryProcessor<>(processor), options))); + return Multi.createFrom().publisher(remoteCache.process(keys, new MutinyToAsyncCacheEntryProcessor<>(processor), options)); } @Override public MutinyStreamingCache streaming() { - return new HotRodMutinyStreamingCache(hotrod, remoteCache); + return new HotRodMutinyStreamingCache<>(hotrod, remoteCache); } } diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/MutinyToAsyncCacheEntryProcessor.java b/client/hotrod/src/main/java/org/infinispan/hotrod/MutinyToAsyncCacheEntryProcessor.java index 3d2064ca689..1908e44b84b 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/MutinyToAsyncCacheEntryProcessor.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/MutinyToAsyncCacheEntryProcessor.java @@ -1,15 +1,13 @@ package org.infinispan.hotrod; -import java.util.concurrent.Flow; - +import io.smallrye.mutiny.Multi; import org.infinispan.api.async.AsyncCacheEntryProcessor; import org.infinispan.api.common.MutableCacheEntry; import org.infinispan.api.common.process.CacheEntryProcessorContext; import org.infinispan.api.common.process.CacheEntryProcessorResult; import org.infinispan.api.mutiny.MutinyCacheEntryProcessor; -import org.reactivestreams.FlowAdapters; -import io.smallrye.mutiny.Multi; +import java.util.concurrent.Flow; public class MutinyToAsyncCacheEntryProcessor implements AsyncCacheEntryProcessor { private final MutinyCacheEntryProcessor mutinyCacheEntryProcessor; @@ -20,7 +18,6 @@ public MutinyToAsyncCacheEntryProcessor(MutinyCacheEntryProcessor mutin @Override public Flow.Publisher> process(Flow.Publisher> entries, CacheEntryProcessorContext context) { - return FlowAdapters.toFlowPublisher(mutinyCacheEntryProcessor.process(Multi.createFrom().publisher(FlowAdapters.toPublisher(entries)), context) - .convert().toPublisher()); + return mutinyCacheEntryProcessor.process(Multi.createFrom().publisher(entries), context).convert().toPublisher(); } } diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/HotRodTransport.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/HotRodTransport.java index 97f586e5465..b16b79d5412 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/HotRodTransport.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/HotRodTransport.java @@ -18,7 +18,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.api.common.CacheOptions; import org.infinispan.commons.configuration.StringConfiguration; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/DelegatingRemoteCache.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/DelegatingRemoteCache.java index 763269f6b3f..1a583d583b7 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/DelegatingRemoteCache.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/DelegatingRemoteCache.java @@ -6,7 +6,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.Flow; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.api.async.AsyncCacheEntryProcessor; import org.infinispan.api.common.CacheEntry; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCache.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCache.java index b501921cf46..822ad020d97 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCache.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCache.java @@ -6,7 +6,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.Flow; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.api.async.AsyncCacheEntryProcessor; import org.infinispan.api.common.CacheEntry; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCacheImpl.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCacheImpl.java index ca79d6d5194..c7477ec7297 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCacheImpl.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/cache/RemoteCacheImpl.java @@ -13,7 +13,7 @@ import java.util.concurrent.Flow; import java.util.stream.Collectors; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.api.async.AsyncCacheEntryProcessor; import org.infinispan.api.common.CacheEntry; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/SyncModeTransactionTable.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/SyncModeTransactionTable.java index 4be5b1b7a38..fa4913a3481 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/SyncModeTransactionTable.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/SyncModeTransactionTable.java @@ -9,11 +9,11 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAResource; import org.infinispan.commons.CacheException; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionContext.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionContext.java index fb04ae96f70..ddc5e1ea290 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionContext.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionContext.java @@ -13,7 +13,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionTable.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionTable.java index 639b6da2611..ec5ff7e5f11 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionTable.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionTable.java @@ -1,6 +1,6 @@ package org.infinispan.hotrod.impl.transaction; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; /** * A {@link Transaction} table that knows how to interact with the {@link Transaction} and how the {@link diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java index 4dacc3c0662..7191cf9be42 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/TransactionalRemoteCacheImpl.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.time.TimeService; import org.infinispan.hotrod.impl.HotRodTransport; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/XaModeTransactionTable.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/XaModeTransactionTable.java index b82b9de3df4..f8a2dc5b86e 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/XaModeTransactionTable.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/XaModeTransactionTable.java @@ -10,9 +10,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/CompleteTransactionOperation.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/CompleteTransactionOperation.java index b9d737fbbb4..2875b0994ca 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/CompleteTransactionOperation.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/CompleteTransactionOperation.java @@ -1,6 +1,6 @@ package org.infinispan.hotrod.impl.transaction.operations; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/PrepareTransactionOperation.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/PrepareTransactionOperation.java index 7c337aeaa76..41f6f0a27d5 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/PrepareTransactionOperation.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/PrepareTransactionOperation.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.Xid; import org.infinispan.api.common.CacheOptions; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/RecoveryOperation.java b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/RecoveryOperation.java index bd6e0ca9de4..8da1fdfd138 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/RecoveryOperation.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/impl/transaction/operations/RecoveryOperation.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.Xid; import org.infinispan.api.common.CacheOptions; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/GenericTransactionManagerLookup.java b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/GenericTransactionManagerLookup.java index d90de229873..30c62ec8642 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/GenericTransactionManagerLookup.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/GenericTransactionManagerLookup.java @@ -4,7 +4,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.hotrod.transaction.manager.RemoteTransactionManager; import org.infinispan.commons.util.Util; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java index 02e0609b462..68c0209891c 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/lookup/RemoteTransactionManagerLookup.java @@ -1,6 +1,6 @@ package org.infinispan.hotrod.transaction.lookup; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.hotrod.transaction.manager.RemoteTransactionManager; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransaction.java b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransaction.java index 4620369c805..61b4299508a 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransaction.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransaction.java @@ -1,6 +1,6 @@ package org.infinispan.hotrod.transaction.manager; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.tx.TransactionImpl; diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransactionManager.java b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransactionManager.java index 00d3461f621..f733b875341 100644 --- a/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransactionManager.java +++ b/client/hotrod/src/main/java/org/infinispan/hotrod/transaction/manager/RemoteTransactionManager.java @@ -2,8 +2,8 @@ import java.util.UUID; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.tx.TransactionManagerImpl; diff --git a/commons/all-jakarta/jakarta.txt b/commons/all-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/commons/all-jakarta/pom.xml b/commons/all-jakarta/pom.xml deleted file mode 100644 index d67c89a7ce3..00000000000 --- a/commons/all-jakarta/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - - org.infinispan - infinispan-commons-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-commons-jakarta - jar - Infinispan Commons Jakarta EE - Infinispan Commons Jakarta EE - - - true - true - false - - - - - org.infinispan - infinispan-logging-processor - - - - org.infinispan.protostream - protostream - - - - org.infinispan.protostream - protostream-types - - - - org.infinispan.protostream - protostream-processor - - - - com.github.ben-manes.caffeine - caffeine - - - - io.reactivex.rxjava3 - rxjava - - - - org.jboss.logging - jboss-logging - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - provided - - - - org.wildfly.openssl - wildfly-openssl-java - true - - - - io.projectreactor.tools - blockhound - true - - - - org.kohsuke.metainf-services - metainf-services - - - diff --git a/commons/all-jakarta/src/main/java/org/infinispan/package-info.java b/commons/all-jakarta/src/main/java/org/infinispan/package-info.java deleted file mode 100644 index b92151f76a1..00000000000 --- a/commons/all-jakarta/src/main/java/org/infinispan/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Commons using the Jakarta EE APIs. - */ -package org.infinispan; diff --git a/commons/all/src/main/java/org/infinispan/commons/api/TransactionalCache.java b/commons/all/src/main/java/org/infinispan/commons/api/TransactionalCache.java index dc155b77a83..fa15518453d 100644 --- a/commons/all/src/main/java/org/infinispan/commons/api/TransactionalCache.java +++ b/commons/all/src/main/java/org/infinispan/commons/api/TransactionalCache.java @@ -1,6 +1,6 @@ package org.infinispan.commons.api; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * This interface is implemented by caches that support (i.e. can interact with) transactions. diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/AsyncSynchronization.java b/commons/all/src/main/java/org/infinispan/commons/tx/AsyncSynchronization.java index ee2a532ae47..0d3d6e3a820 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/AsyncSynchronization.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/AsyncSynchronization.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * Non-blocking {@link javax.transaction.Synchronization}. diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/DefaultResourceConverter.java b/commons/all/src/main/java/org/infinispan/commons/tx/DefaultResourceConverter.java index a07ee721d7a..55f34c27a4a 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/DefaultResourceConverter.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/DefaultResourceConverter.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import javax.transaction.xa.XAResource; /** diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/TransactionImpl.java b/commons/all/src/main/java/org/infinispan/commons/tx/TransactionImpl.java index e7f64699dbb..30e2242df30 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/TransactionImpl.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/TransactionImpl.java @@ -22,13 +22,13 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/TransactionManagerImpl.java b/commons/all/src/main/java/org/infinispan/commons/tx/TransactionManagerImpl.java index 33499d6ef59..4a416ef8f87 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/TransactionManagerImpl.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/TransactionManagerImpl.java @@ -3,15 +3,15 @@ import java.util.UUID; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.logging.Log; import org.infinispan.commons.logging.LogFactory; diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/TransactionResourceConverter.java b/commons/all/src/main/java/org/infinispan/commons/tx/TransactionResourceConverter.java index 8e567abd80c..411cb1131a2 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/TransactionResourceConverter.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/TransactionResourceConverter.java @@ -1,6 +1,6 @@ package org.infinispan.commons.tx; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import javax.transaction.xa.XAResource; /** diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/Util.java b/commons/all/src/main/java/org/infinispan/commons/tx/Util.java index b1a7ccebd79..27002e83b1b 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/Util.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/Util.java @@ -1,6 +1,6 @@ package org.infinispan.commons.tx; -import javax.transaction.Status; +import jakarta.transaction.Status; /** * Transaction related util class. diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/lookup/LookupNames.java b/commons/all/src/main/java/org/infinispan/commons/tx/lookup/LookupNames.java index ec0d918a0d0..b7397e3da94 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/lookup/LookupNames.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/lookup/LookupNames.java @@ -3,7 +3,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.util.Util; diff --git a/commons/all/src/main/java/org/infinispan/commons/tx/lookup/TransactionManagerLookup.java b/commons/all/src/main/java/org/infinispan/commons/tx/lookup/TransactionManagerLookup.java index e32180ae09c..9bf99f40483 100644 --- a/commons/all/src/main/java/org/infinispan/commons/tx/lookup/TransactionManagerLookup.java +++ b/commons/all/src/main/java/org/infinispan/commons/tx/lookup/TransactionManagerLookup.java @@ -1,6 +1,6 @@ package org.infinispan.commons.tx.lookup; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * Factory interface, allows Cache or RemoteCache to use different transactional systems. diff --git a/commons/pom.xml b/commons/pom.xml index 6514bb097d4..9a5c9dfa4f1 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -17,7 +17,6 @@ spi all - all-jakarta diff --git a/core-jakarta/jakarta.txt b/core-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/core-jakarta/pom.xml b/core-jakarta/pom.xml deleted file mode 100644 index a57b123eee4..00000000000 --- a/core-jakarta/pom.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - 4.0.0 - - - org.infinispan - infinispan-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-core-jakarta - Infinispan Core Jakarta EE - Infinispan core module for Jakarta EE - - - true - true - false - false - - - - - org.infinispan - infinispan-commons-jakarta - ${project.version} - - - - org.infinispan - infinispan-component-processor - - - - org.infinispan.protostream - protostream - - - - org.infinispan.protostream - protostream-types - - - - org.infinispan.protostream - protostream-processor - - - - org.infinispan - infinispan-logging-processor - - - - io.micrometer - micrometer-core - true - - - - io.micrometer - micrometer-registry-prometheus - true - - - - org.jgroups - jgroups - - - - org.jgroups - jgroups-raft - true - - - - com.github.ben-manes.caffeine - caffeine - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - - org.jboss.logging - jboss-logging - - - - org.jboss.threads - jboss-threads - - - - io.projectreactor.tools - blockhound - true - - - - io.mashona - mashona-logwriting - true - - - - org.kohsuke.metainf-services - metainf-services - - - - org.jboss - jdk-misc - 3.Final - provided - - - diff --git a/core-jakarta/src/main/java/org/infinispan/package-info.java b/core-jakarta/src/main/java/org/infinispan/package-info.java deleted file mode 100644 index 8659864fee4..00000000000 --- a/core-jakarta/src/main/java/org/infinispan/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Core using the Jakarta EE APIs. - */ -package org.infinispan; diff --git a/core/src/main/java/org/infinispan/batch/BatchContainer.java b/core/src/main/java/org/infinispan/batch/BatchContainer.java index db1a84f997c..cc552ca7ab0 100644 --- a/core/src/main/java/org/infinispan/batch/BatchContainer.java +++ b/core/src/main/java/org/infinispan/batch/BatchContainer.java @@ -1,7 +1,7 @@ package org.infinispan.batch; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.CacheException; import org.infinispan.factories.annotations.Inject; diff --git a/core/src/main/java/org/infinispan/cache/impl/AbstractDelegatingAdvancedCache.java b/core/src/main/java/org/infinispan/cache/impl/AbstractDelegatingAdvancedCache.java index 60622c35578..2fe926a88b3 100644 --- a/core/src/main/java/org/infinispan/cache/impl/AbstractDelegatingAdvancedCache.java +++ b/core/src/main/java/org/infinispan/cache/impl/AbstractDelegatingAdvancedCache.java @@ -10,7 +10,7 @@ import java.util.function.Function; import javax.security.auth.Subject; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.AdvancedCache; diff --git a/core/src/main/java/org/infinispan/cache/impl/CacheImpl.java b/core/src/main/java/org/infinispan/cache/impl/CacheImpl.java index 400c6ae85bf..3e458dd699f 100644 --- a/core/src/main/java/org/infinispan/cache/impl/CacheImpl.java +++ b/core/src/main/java/org/infinispan/cache/impl/CacheImpl.java @@ -25,9 +25,9 @@ import java.util.function.Function; import javax.security.auth.Subject; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.AdvancedCache; diff --git a/core/src/main/java/org/infinispan/cache/impl/InvocationHelper.java b/core/src/main/java/org/infinispan/cache/impl/InvocationHelper.java index 04e33ecc448..b68c7df5aba 100644 --- a/core/src/main/java/org/infinispan/cache/impl/InvocationHelper.java +++ b/core/src/main/java/org/infinispan/cache/impl/InvocationHelper.java @@ -4,11 +4,11 @@ import java.util.concurrent.CompletionStage; import java.util.function.Function; -import javax.transaction.InvalidTransactionException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/core/src/main/java/org/infinispan/cache/impl/SimpleCacheImpl.java b/core/src/main/java/org/infinispan/cache/impl/SimpleCacheImpl.java index 1c96f77c0cb..560b672b162 100644 --- a/core/src/main/java/org/infinispan/cache/impl/SimpleCacheImpl.java +++ b/core/src/main/java/org/infinispan/cache/impl/SimpleCacheImpl.java @@ -28,7 +28,7 @@ import java.util.stream.StreamSupport; import javax.security.auth.Subject; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.AdvancedCache; diff --git a/core/src/main/java/org/infinispan/configuration/cache/CustomFailurePolicy.java b/core/src/main/java/org/infinispan/configuration/cache/CustomFailurePolicy.java index f9c50cdc526..9227c07b81e 100644 --- a/core/src/main/java/org/infinispan/configuration/cache/CustomFailurePolicy.java +++ b/core/src/main/java/org/infinispan/configuration/cache/CustomFailurePolicy.java @@ -5,7 +5,7 @@ import java.util.function.BiFunction; import java.util.function.Function; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.xsite.AbstractCustomFailurePolicy; diff --git a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java index 628719ac145..613a2b99bc7 100644 --- a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java +++ b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java @@ -15,8 +15,8 @@ import java.util.concurrent.TimeUnit; -import javax.transaction.Synchronization; -import javax.transaction.TransactionManager; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.commons.configuration.Builder; diff --git a/core/src/main/java/org/infinispan/conflict/impl/DefaultConflictManager.java b/core/src/main/java/org/infinispan/conflict/impl/DefaultConflictManager.java index 2670bae0043..78731103f84 100644 --- a/core/src/main/java/org/infinispan/conflict/impl/DefaultConflictManager.java +++ b/core/src/main/java/org/infinispan/conflict/impl/DefaultConflictManager.java @@ -27,7 +27,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.cache.impl.InvocationHelper; import org.infinispan.commands.CommandsFactory; diff --git a/core/src/main/java/org/infinispan/context/InvocationContextFactory.java b/core/src/main/java/org/infinispan/context/InvocationContextFactory.java index 421ed0ad63c..59b3bd60789 100644 --- a/core/src/main/java/org/infinispan/context/InvocationContextFactory.java +++ b/core/src/main/java/org/infinispan/context/InvocationContextFactory.java @@ -1,6 +1,6 @@ package org.infinispan.context; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.VisitableCommand; import org.infinispan.context.impl.ClearInvocationContext; diff --git a/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java index 471082e4f42..0d56905773a 100644 --- a/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java @@ -3,9 +3,9 @@ import java.util.Collection; import java.util.concurrent.CompletionStage; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import org.infinispan.metadata.impl.IracMetadata; import org.infinispan.remoting.transport.Address; diff --git a/core/src/main/java/org/infinispan/context/impl/NonTransactionalInvocationContextFactory.java b/core/src/main/java/org/infinispan/context/impl/NonTransactionalInvocationContextFactory.java index 07aa0f4e24f..61dc8db57e7 100644 --- a/core/src/main/java/org/infinispan/context/impl/NonTransactionalInvocationContextFactory.java +++ b/core/src/main/java/org/infinispan/context/impl/NonTransactionalInvocationContextFactory.java @@ -1,6 +1,6 @@ package org.infinispan.context.impl; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.context.InvocationContext; import org.infinispan.factories.annotations.SurvivesRestarts; diff --git a/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java index e5f48e18740..e0382189dbf 100644 --- a/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java @@ -1,6 +1,6 @@ package org.infinispan.context.impl; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.transaction.impl.RemoteTransaction; diff --git a/core/src/main/java/org/infinispan/context/impl/TransactionalInvocationContextFactory.java b/core/src/main/java/org/infinispan/context/impl/TransactionalInvocationContextFactory.java index 2b4f90744e4..3ac01f89b81 100644 --- a/core/src/main/java/org/infinispan/context/impl/TransactionalInvocationContextFactory.java +++ b/core/src/main/java/org/infinispan/context/impl/TransactionalInvocationContextFactory.java @@ -1,8 +1,8 @@ package org.infinispan.context.impl; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.batch.BatchContainer; import org.infinispan.commons.CacheException; diff --git a/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java index b8dd24baad3..4d33c844c44 100644 --- a/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.write.WriteCommand; import org.infinispan.context.InvocationContext; diff --git a/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java b/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java index 91a954eb8be..40ecb27c001 100644 --- a/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java +++ b/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java @@ -1,6 +1,6 @@ package org.infinispan.factories; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.CacheException; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; diff --git a/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java b/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java index 8ae1c22d153..87c88ff3696 100644 --- a/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java +++ b/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java @@ -1,6 +1,6 @@ package org.infinispan.factories; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.infinispan.commons.CacheConfigurationException; import org.infinispan.factories.annotations.DefaultFactoryFor; diff --git a/core/src/main/java/org/infinispan/functional/impl/AbstractFunctionalMap.java b/core/src/main/java/org/infinispan/functional/impl/AbstractFunctionalMap.java index 8698f9943df..f776934fba3 100644 --- a/core/src/main/java/org/infinispan/functional/impl/AbstractFunctionalMap.java +++ b/core/src/main/java/org/infinispan/functional/impl/AbstractFunctionalMap.java @@ -6,9 +6,9 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.batch.BatchContainer; diff --git a/core/src/main/java/org/infinispan/interceptors/impl/BatchingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/impl/BatchingInterceptor.java index de6569f1c6e..d3e667d9ff1 100644 --- a/core/src/main/java/org/infinispan/interceptors/impl/BatchingInterceptor.java +++ b/core/src/main/java/org/infinispan/interceptors/impl/BatchingInterceptor.java @@ -1,8 +1,8 @@ package org.infinispan.interceptors.impl; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.batch.BatchContainer; import org.infinispan.commands.VisitableCommand; diff --git a/core/src/main/java/org/infinispan/interceptors/impl/CacheWriterInterceptor.java b/core/src/main/java/org/infinispan/interceptors/impl/CacheWriterInterceptor.java index 3b3f8a68204..083a01f6249 100644 --- a/core/src/main/java/org/infinispan/interceptors/impl/CacheWriterInterceptor.java +++ b/core/src/main/java/org/infinispan/interceptors/impl/CacheWriterInterceptor.java @@ -7,10 +7,10 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicLong; -import javax.transaction.InvalidTransactionException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commands.FlagAffectedCommand; import org.infinispan.commands.SegmentSpecificCommand; diff --git a/core/src/main/java/org/infinispan/interceptors/impl/InvocationContextInterceptor.java b/core/src/main/java/org/infinispan/interceptors/impl/InvocationContextInterceptor.java index e939d085a0d..2c6e2e02363 100644 --- a/core/src/main/java/org/infinispan/interceptors/impl/InvocationContextInterceptor.java +++ b/core/src/main/java/org/infinispan/interceptors/impl/InvocationContextInterceptor.java @@ -6,9 +6,9 @@ import java.util.Collection; import java.util.Collections; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import org.infinispan.InvalidCacheUsageException; import org.infinispan.commands.FlagAffectedCommand; diff --git a/core/src/main/java/org/infinispan/interceptors/impl/TxInterceptor.java b/core/src/main/java/org/infinispan/interceptors/impl/TxInterceptor.java index d1d70b64234..0e769968775 100644 --- a/core/src/main/java/org/infinispan/interceptors/impl/TxInterceptor.java +++ b/core/src/main/java/org/infinispan/interceptors/impl/TxInterceptor.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicLong; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.commands.CommandsFactory; diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java b/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java index 3543d6970d7..4cc59f33cbc 100644 --- a/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java +++ b/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java @@ -34,9 +34,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Function; -import javax.transaction.Status; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.cache.impl.EncoderEntryMapper; diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java index d473e823cf3..da909bd54bd 100644 --- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java +++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java @@ -7,7 +7,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.factories.annotations.Inject; import org.infinispan.factories.annotations.SurvivesRestarts; diff --git a/core/src/main/java/org/infinispan/notifications/impl/AbstractListenerImpl.java b/core/src/main/java/org/infinispan/notifications/impl/AbstractListenerImpl.java index f3b7871b71c..25988fa8e36 100644 --- a/core/src/main/java/org/infinispan/notifications/impl/AbstractListenerImpl.java +++ b/core/src/main/java/org/infinispan/notifications/impl/AbstractListenerImpl.java @@ -16,7 +16,7 @@ import java.util.function.Supplier; import javax.security.auth.Subject; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.CacheException; import org.infinispan.commons.util.ReflectionUtil; diff --git a/core/src/main/java/org/infinispan/persistence/manager/PreloadManager.java b/core/src/main/java/org/infinispan/persistence/manager/PreloadManager.java index 6e9fb9f026b..bd3b8806bb0 100644 --- a/core/src/main/java/org/infinispan/persistence/manager/PreloadManager.java +++ b/core/src/main/java/org/infinispan/persistence/manager/PreloadManager.java @@ -5,8 +5,8 @@ import java.lang.invoke.MethodHandles; import java.util.concurrent.CompletionStage; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.cache.impl.InvocationHelper; diff --git a/core/src/main/java/org/infinispan/persistence/spi/NonBlockingStore.java b/core/src/main/java/org/infinispan/persistence/spi/NonBlockingStore.java index a8617916f00..0e6bbca9abc 100644 --- a/core/src/main/java/org/infinispan/persistence/spi/NonBlockingStore.java +++ b/core/src/main/java/org/infinispan/persistence/spi/NonBlockingStore.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.commons.util.Experimental; diff --git a/core/src/main/java/org/infinispan/persistence/spi/TransactionalCacheWriter.java b/core/src/main/java/org/infinispan/persistence/spi/TransactionalCacheWriter.java index 2ee8457a52c..bbf5901a69c 100644 --- a/core/src/main/java/org/infinispan/persistence/spi/TransactionalCacheWriter.java +++ b/core/src/main/java/org/infinispan/persistence/spi/TransactionalCacheWriter.java @@ -1,6 +1,6 @@ package org.infinispan.persistence.spi; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.persistence.support.BatchModification; diff --git a/core/src/main/java/org/infinispan/persistence/support/DelegatingNonBlockingStore.java b/core/src/main/java/org/infinispan/persistence/support/DelegatingNonBlockingStore.java index 3047b69c7a7..21f29403b32 100644 --- a/core/src/main/java/org/infinispan/persistence/support/DelegatingNonBlockingStore.java +++ b/core/src/main/java/org/infinispan/persistence/support/DelegatingNonBlockingStore.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.Predicate; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.util.IntSet; import org.infinispan.persistence.spi.InitializationContext; diff --git a/core/src/main/java/org/infinispan/persistence/support/NonBlockingStoreAdapter.java b/core/src/main/java/org/infinispan/persistence/support/NonBlockingStoreAdapter.java index 250a6fe8550..5bd596351e8 100644 --- a/core/src/main/java/org/infinispan/persistence/support/NonBlockingStoreAdapter.java +++ b/core/src/main/java/org/infinispan/persistence/support/NonBlockingStoreAdapter.java @@ -10,7 +10,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.api.Lifecycle; import org.infinispan.commons.persistence.Store; diff --git a/core/src/main/java/org/infinispan/security/impl/SecureCacheImpl.java b/core/src/main/java/org/infinispan/security/impl/SecureCacheImpl.java index d32df201340..cca33870ee5 100644 --- a/core/src/main/java/org/infinispan/security/impl/SecureCacheImpl.java +++ b/core/src/main/java/org/infinispan/security/impl/SecureCacheImpl.java @@ -11,7 +11,7 @@ import java.util.function.Function; import javax.security.auth.Subject; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.AdvancedCache; diff --git a/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java b/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java index 57f9e94d8ba..f0005ca0ddb 100644 --- a/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java +++ b/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java @@ -35,8 +35,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Predicate; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.CommandsFactory; diff --git a/core/src/main/java/org/infinispan/stream/impl/TxLockedStreamImpl.java b/core/src/main/java/org/infinispan/stream/impl/TxLockedStreamImpl.java index 72ea45ddb22..4d4f070a004 100644 --- a/core/src/main/java/org/infinispan/stream/impl/TxLockedStreamImpl.java +++ b/core/src/main/java/org/infinispan/stream/impl/TxLockedStreamImpl.java @@ -7,9 +7,9 @@ import java.util.function.BiFunction; import java.util.function.Predicate; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.CacheStream; diff --git a/core/src/main/java/org/infinispan/transaction/TransactionTable.java b/core/src/main/java/org/infinispan/transaction/TransactionTable.java index ec6b7ba8a7a..f7789abba33 100644 --- a/core/src/main/java/org/infinispan/transaction/TransactionTable.java +++ b/core/src/main/java/org/infinispan/transaction/TransactionTable.java @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.transaction.xa.GlobalTransaction; diff --git a/core/src/main/java/org/infinispan/transaction/impl/LocalTransaction.java b/core/src/main/java/org/infinispan/transaction/impl/LocalTransaction.java index b166ccd4cdf..76a6b2f6342 100644 --- a/core/src/main/java/org/infinispan/transaction/impl/LocalTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/impl/LocalTransaction.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.concurrent.CompletionStage; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.write.WriteCommand; import org.infinispan.container.entries.CacheEntry; diff --git a/core/src/main/java/org/infinispan/transaction/impl/TransactionCoordinator.java b/core/src/main/java/org/infinispan/transaction/impl/TransactionCoordinator.java index 2f73eb421a3..9896ee2919b 100644 --- a/core/src/main/java/org/infinispan/transaction/impl/TransactionCoordinator.java +++ b/core/src/main/java/org/infinispan/transaction/impl/TransactionCoordinator.java @@ -9,7 +9,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.Function; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import org.infinispan.commands.CommandsFactory; diff --git a/core/src/main/java/org/infinispan/transaction/impl/TransactionTable.java b/core/src/main/java/org/infinispan/transaction/impl/TransactionTable.java index 4d96e9d777e..52357599664 100644 --- a/core/src/main/java/org/infinispan/transaction/impl/TransactionTable.java +++ b/core/src/main/java/org/infinispan/transaction/impl/TransactionTable.java @@ -26,10 +26,10 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.transaction.Status; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.infinispan.commands.CommandsFactory; import org.infinispan.commands.remote.CheckTransactionRpcCommand; diff --git a/core/src/main/java/org/infinispan/transaction/lookup/EmbeddedTransactionManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/EmbeddedTransactionManagerLookup.java index d995f70ea6a..bc77ea4edcc 100644 --- a/core/src/main/java/org/infinispan/transaction/lookup/EmbeddedTransactionManagerLookup.java +++ b/core/src/main/java/org/infinispan/transaction/lookup/EmbeddedTransactionManagerLookup.java @@ -1,8 +1,8 @@ package org.infinispan.transaction.lookup; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; import org.infinispan.transaction.tm.EmbeddedTransactionManager; diff --git a/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java index 38bff394ea2..43a4eb9c8fa 100644 --- a/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java +++ b/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java @@ -4,7 +4,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.tx.lookup.LookupNames; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; diff --git a/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java index 25985654fef..ad6af4af682 100644 --- a/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java +++ b/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; import org.infinispan.commons.util.Util; diff --git a/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java index aac102bde74..c6a3a48cc90 100644 --- a/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java +++ b/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java @@ -1,6 +1,6 @@ package org.infinispan.transaction.lookup; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.TransactionSynchronizationRegistry; /** * @author Stuart Douglas diff --git a/core/src/main/java/org/infinispan/transaction/lookup/WildflyTransactionManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/WildflyTransactionManagerLookup.java index 73d90bc8363..0fd5fae4117 100644 --- a/core/src/main/java/org/infinispan/transaction/lookup/WildflyTransactionManagerLookup.java +++ b/core/src/main/java/org/infinispan/transaction/lookup/WildflyTransactionManagerLookup.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; import org.infinispan.commons.util.Util; diff --git a/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java b/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java index aae16204417..43ccc580ebc 100644 --- a/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java @@ -1,6 +1,6 @@ package org.infinispan.transaction.synchronization; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.transaction.impl.LocalTransaction; import org.infinispan.transaction.xa.GlobalTransaction; diff --git a/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java b/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java index 2fbc3ca71f9..e7110c60bed 100644 --- a/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java +++ b/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java @@ -3,7 +3,7 @@ import java.util.Objects; import java.util.concurrent.CompletionStage; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.infinispan.commons.tx.AsyncSynchronization; import org.infinispan.transaction.impl.AbstractEnlistmentAdapter; diff --git a/core/src/main/java/org/infinispan/transaction/tm/EmbeddedBaseTransactionManager.java b/core/src/main/java/org/infinispan/transaction/tm/EmbeddedBaseTransactionManager.java index 06050b5bef0..6a05c3656f0 100644 --- a/core/src/main/java/org/infinispan/transaction/tm/EmbeddedBaseTransactionManager.java +++ b/core/src/main/java/org/infinispan/transaction/tm/EmbeddedBaseTransactionManager.java @@ -3,8 +3,8 @@ import java.util.UUID; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.tx.TransactionManagerImpl; diff --git a/core/src/main/java/org/infinispan/transaction/tm/EmbeddedTransaction.java b/core/src/main/java/org/infinispan/transaction/tm/EmbeddedTransaction.java index 1461a7d27e1..302ac0af54f 100644 --- a/core/src/main/java/org/infinispan/transaction/tm/EmbeddedTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/tm/EmbeddedTransaction.java @@ -6,7 +6,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAResource; import org.infinispan.commons.tx.TransactionImpl; diff --git a/core/src/main/java/org/infinispan/transaction/tm/EmbeddedUserTransaction.java b/core/src/main/java/org/infinispan/transaction/tm/EmbeddedUserTransaction.java index 1bc0a195721..ccc8f5f15a0 100644 --- a/core/src/main/java/org/infinispan/transaction/tm/EmbeddedUserTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/tm/EmbeddedUserTransaction.java @@ -1,12 +1,12 @@ package org.infinispan.transaction.tm; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; /** * A {@link UserTransaction} implementation that uses {@link EmbeddedTransactionManager}. diff --git a/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java index b71511c6a2f..fb933dad4ac 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java @@ -1,6 +1,6 @@ package org.infinispan.transaction.xa; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.tx.XidImpl; import org.infinispan.transaction.impl.LocalTransaction; diff --git a/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java b/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java index 23c901be629..79a5236b8b5 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java +++ b/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.write.WriteCommand; import org.infinispan.commons.time.TimeService; diff --git a/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java b/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java index 07b2fe79a41..dbfa3034e3c 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java +++ b/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java @@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import org.infinispan.commons.CacheException; diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfo.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfo.java index b532fa668fc..e09b6771a71 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfo.java +++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfo.java @@ -57,7 +57,7 @@ public long getInternalId() { /** * The value represent transaction's state as described by the {@code status} field. * - * @return The {@link javax.transaction.Status} or -1 if not set. + * @return The {@link jakarta.transaction.Status} or -1 if not set. */ public int getStatus() { return status; diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java index 4e4be6052cf..32f0bd385e0 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java @@ -1,6 +1,6 @@ package org.infinispan.transaction.xa.recovery; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.transaction.xa.GlobalTransaction; import org.infinispan.transaction.xa.LocalXaTransaction; diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java index 5c53737bf3c..b662ca5a2e2 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java +++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.infinispan.commands.write.WriteCommand; import org.infinispan.remoting.transport.Address; diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java index 526a22ca947..c5d3548bc45 100644 --- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java +++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.CacheException; import org.infinispan.commons.tx.XidImpl; diff --git a/core/src/main/java/org/infinispan/util/logging/Log.java b/core/src/main/java/org/infinispan/util/logging/Log.java index ee9a14a4767..a2217147e12 100644 --- a/core/src/main/java/org/infinispan/util/logging/Log.java +++ b/core/src/main/java/org/infinispan/util/logging/Log.java @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.transaction.Synchronization; -import javax.transaction.TransactionManager; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.commands.ReplicableCommand; diff --git a/core/src/main/java/org/infinispan/util/logging/events/impl/EventLoggerNotifierImpl.java b/core/src/main/java/org/infinispan/util/logging/events/impl/EventLoggerNotifierImpl.java index 9a0074cae93..eb94e529810 100644 --- a/core/src/main/java/org/infinispan/util/logging/events/impl/EventLoggerNotifierImpl.java +++ b/core/src/main/java/org/infinispan/util/logging/events/impl/EventLoggerNotifierImpl.java @@ -7,7 +7,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.util.concurrent.CompletableFutures; import org.infinispan.factories.scopes.Scope; diff --git a/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java b/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java index 79f9ed0d90e..cef103d3208 100644 --- a/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java +++ b/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CustomFailurePolicy; diff --git a/core/src/main/java/org/infinispan/xsite/BackupSender.java b/core/src/main/java/org/infinispan/xsite/BackupSender.java index 37511de894b..b653b359626 100644 --- a/core/src/main/java/org/infinispan/xsite/BackupSender.java +++ b/core/src/main/java/org/infinispan/xsite/BackupSender.java @@ -1,6 +1,6 @@ package org.infinispan.xsite; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.tx.CommitCommand; import org.infinispan.commands.tx.PrepareCommand; diff --git a/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java b/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java index 2e71fc0bd01..0613518c2fe 100644 --- a/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java +++ b/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java @@ -14,7 +14,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.commands.AbstractVisitor; diff --git a/core/src/main/java/org/infinispan/xsite/ClusteredCacheBackupReceiver.java b/core/src/main/java/org/infinispan/xsite/ClusteredCacheBackupReceiver.java index c0d15f0c1f7..d6b886a4b2c 100644 --- a/core/src/main/java/org/infinispan/xsite/ClusteredCacheBackupReceiver.java +++ b/core/src/main/java/org/infinispan/xsite/ClusteredCacheBackupReceiver.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/main/java/org/infinispan/xsite/NoOpBackupSender.java b/core/src/main/java/org/infinispan/xsite/NoOpBackupSender.java index c616d80beee..41b756bb75a 100644 --- a/core/src/main/java/org/infinispan/xsite/NoOpBackupSender.java +++ b/core/src/main/java/org/infinispan/xsite/NoOpBackupSender.java @@ -1,6 +1,6 @@ package org.infinispan.xsite; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.tx.CommitCommand; import org.infinispan.commands.tx.PrepareCommand; diff --git a/core/src/test/java/org/infinispan/api/AbstractRepeatableReadIsolationTest.java b/core/src/test/java/org/infinispan/api/AbstractRepeatableReadIsolationTest.java index f2819013cba..79764c3b31b 100644 --- a/core/src/test/java/org/infinispan/api/AbstractRepeatableReadIsolationTest.java +++ b/core/src/test/java/org/infinispan/api/AbstractRepeatableReadIsolationTest.java @@ -3,9 +3,9 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.fail; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java b/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java index 0a63af2d31c..55085a4599f 100644 --- a/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java +++ b/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/BaseCacheAPIPessimisticTest.java b/core/src/test/java/org/infinispan/api/BaseCacheAPIPessimisticTest.java index 419eb0fa18a..200097612db 100644 --- a/core/src/test/java/org/infinispan/api/BaseCacheAPIPessimisticTest.java +++ b/core/src/test/java/org/infinispan/api/BaseCacheAPIPessimisticTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.LockedStream; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/CacheAPITest.java b/core/src/test/java/org/infinispan/api/CacheAPITest.java index a646e7af9d5..69911f4516a 100644 --- a/core/src/test/java/org/infinispan/api/CacheAPITest.java +++ b/core/src/test/java/org/infinispan/api/CacheAPITest.java @@ -17,7 +17,7 @@ import java.util.Map.Entry; import java.util.Set; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.util.CloseableIterator; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java b/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java index f6599bb1026..5e4e71b70cf 100644 --- a/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java +++ b/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java @@ -2,7 +2,7 @@ import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/RepeatableReadRemoteGetCountTest.java b/core/src/test/java/org/infinispan/api/RepeatableReadRemoteGetCountTest.java index 8b8999d5440..f28696fc848 100644 --- a/core/src/test/java/org/infinispan/api/RepeatableReadRemoteGetCountTest.java +++ b/core/src/test/java/org/infinispan/api/RepeatableReadRemoteGetCountTest.java @@ -1,6 +1,6 @@ package org.infinispan.api; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java b/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java index abebecda6d8..90a6c29fd4d 100644 --- a/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java +++ b/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java @@ -4,7 +4,7 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/SizeOptimizationTests.java b/core/src/test/java/org/infinispan/api/SizeOptimizationTests.java index 0c097d719df..301fcc5ba2f 100644 --- a/core/src/test/java/org/infinispan/api/SizeOptimizationTests.java +++ b/core/src/test/java/org/infinispan/api/SizeOptimizationTests.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.util.IntSet; diff --git a/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java b/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java index 7d631e5d18f..959021c422a 100644 --- a/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java +++ b/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java @@ -6,8 +6,8 @@ import java.lang.reflect.Method; import java.util.concurrent.Future; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java b/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java index cfe35c925ac..9f7f696f2b4 100644 --- a/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java +++ b/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java b/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java index 5215f06dbd2..f91fce54f01 100644 --- a/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java +++ b/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java @@ -8,7 +8,7 @@ import java.lang.reflect.Method; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java b/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java index 678a8e31453..c60971bc1f3 100644 --- a/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java +++ b/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java @@ -6,8 +6,8 @@ import java.util.Collections; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java index bf498bf67d2..43c69c5bf19 100644 --- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java +++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java @@ -13,9 +13,9 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; -import javax.transaction.Status; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.VisitableCommand; diff --git a/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java b/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java index 4f6ce9b5a7c..7a40f352b3e 100644 --- a/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java +++ b/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java @@ -2,7 +2,7 @@ import static org.testng.AssertJUnit.assertEquals; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.api.mvcc.LockTestBase; diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java index 3a344e04e66..cd61d17cf46 100644 --- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java +++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java @@ -4,9 +4,9 @@ import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNull; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.api.mvcc.LockTestBase; diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java index 3551c691c5f..d03e33d581a 100644 --- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java +++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java @@ -13,13 +13,13 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.Future; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.api.mvcc.LockAssert; diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewWithPersistenceTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewWithPersistenceTest.java index 2224d2c371c..3e231442767 100644 --- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewWithPersistenceTest.java +++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewWithPersistenceTest.java @@ -2,10 +2,10 @@ import java.util.stream.StreamSupport; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.container.DataContainer; diff --git a/core/src/test/java/org/infinispan/configuration/TxManagerLookupConfigTest.java b/core/src/test/java/org/infinispan/configuration/TxManagerLookupConfigTest.java index 1530d1f0bea..629d62a30da 100644 --- a/core/src/test/java/org/infinispan/configuration/TxManagerLookupConfigTest.java +++ b/core/src/test/java/org/infinispan/configuration/TxManagerLookupConfigTest.java @@ -4,7 +4,7 @@ import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; import org.infinispan.configuration.cache.Configuration; diff --git a/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java index 055abbb8d17..2ea47b30ac0 100644 --- a/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java @@ -5,10 +5,10 @@ import static org.testng.AssertJUnit.assertTrue; import static org.testng.AssertJUnit.fail; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java index 6f7aa4cb60d..b3dab7c98b9 100644 --- a/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java @@ -4,8 +4,8 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.fail; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java index db357bda2bd..30b83d5ce7d 100644 --- a/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java @@ -2,8 +2,8 @@ import static org.testng.AssertJUnit.assertEquals; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java index cdc928700e7..34d0b61bfe1 100644 --- a/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java @@ -1,8 +1,8 @@ package org.infinispan.container.versioning; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java index 21087c13d1a..10a23d62d78 100644 --- a/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java @@ -6,8 +6,8 @@ import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.Future; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java b/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java index 31c5d0a4a8d..a71dde15b37 100644 --- a/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java @@ -5,8 +5,8 @@ import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.fail; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java b/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java index 062d76927f8..e3f3dc31dbf 100644 --- a/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java +++ b/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java @@ -4,8 +4,8 @@ import static org.infinispan.test.TestingUtil.waitForNoRebalance; import static org.testng.AssertJUnit.assertEquals; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/context/InvocationContextTest.java b/core/src/test/java/org/infinispan/context/InvocationContextTest.java index a4e6a4e64f4..3d235378483 100644 --- a/core/src/test/java/org/infinispan/context/InvocationContextTest.java +++ b/core/src/test/java/org/infinispan/context/InvocationContextTest.java @@ -10,10 +10,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.CacheException; diff --git a/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java b/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java index fc619b95819..b3bcbd77284 100644 --- a/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java +++ b/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java @@ -3,7 +3,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.VisitableCommand; diff --git a/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java b/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java index 38458dc1c26..ddd0b053510 100644 --- a/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java +++ b/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.VisitableCommand; diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncL1PessimisticFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncL1PessimisticFuncTest.java index 4f3984a22f0..a2d28a51187 100644 --- a/core/src/test/java/org/infinispan/distribution/DistSyncL1PessimisticFuncTest.java +++ b/core/src/test/java/org/infinispan/distribution/DistSyncL1PessimisticFuncTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.context.Flag; diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java index 46309719c4f..17a48870b99 100644 --- a/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java +++ b/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java index 2c6690af72e..5573be62929 100644 --- a/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java +++ b/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java @@ -6,7 +6,7 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.functional.ReadWriteKeyCommand; diff --git a/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java b/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java index a53a291a3f2..fd8a71d7168 100644 --- a/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java +++ b/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java @@ -1,6 +1,6 @@ package org.infinispan.distribution; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java b/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java index 43b3b1ed711..986a62202ec 100644 --- a/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java +++ b/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java @@ -15,8 +15,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.context.Flag; diff --git a/core/src/test/java/org/infinispan/distribution/groups/TransactionalGetGroupKeysTest.java b/core/src/test/java/org/infinispan/distribution/groups/TransactionalGetGroupKeysTest.java index 4aa6cea3590..0a0436b8f15 100644 --- a/core/src/test/java/org/infinispan/distribution/groups/TransactionalGetGroupKeysTest.java +++ b/core/src/test/java/org/infinispan/distribution/groups/TransactionalGetGroupKeysTest.java @@ -4,13 +4,13 @@ import java.util.Map; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.util.concurrent.IsolationLevel; diff --git a/core/src/test/java/org/infinispan/distribution/groups/WriteSkewGetGroupKeysTest.java b/core/src/test/java/org/infinispan/distribution/groups/WriteSkewGetGroupKeysTest.java index 22e79a9c47a..d245d6730f5 100644 --- a/core/src/test/java/org/infinispan/distribution/groups/WriteSkewGetGroupKeysTest.java +++ b/core/src/test/java/org/infinispan/distribution/groups/WriteSkewGetGroupKeysTest.java @@ -5,12 +5,12 @@ import java.util.Map; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.transaction.WriteSkewException; import org.infinispan.util.concurrent.IsolationLevel; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/BaseTxStateTransferOverwriteTest.java b/core/src/test/java/org/infinispan/distribution/rehash/BaseTxStateTransferOverwriteTest.java index 33407d75a9e..6e3fb6652e3 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/BaseTxStateTransferOverwriteTest.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/BaseTxStateTransferOverwriteTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java index c395fa5fec5..0a948016e01 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java @@ -14,12 +14,12 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java b/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java index 56948c68154..f1973b7674b 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java @@ -14,7 +14,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.commands.remote.CacheRpcCommand; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/OptimisticPrimaryOwnerCrashDuringPrepareTest.java b/core/src/test/java/org/infinispan/distribution/rehash/OptimisticPrimaryOwnerCrashDuringPrepareTest.java index 9ec7f3272fc..357274b348c 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/OptimisticPrimaryOwnerCrashDuringPrepareTest.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/OptimisticPrimaryOwnerCrashDuringPrepareTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.Future; -import javax.transaction.RollbackException; -import javax.transaction.Status; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; import javax.transaction.xa.XAException; import org.infinispan.commands.tx.VersionedPrepareCommand; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java index 165aed93b42..6df66e600ef 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java @@ -11,8 +11,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.CacheException; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java index 2402ee49a8e..a04ff783e0a 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java @@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/core/src/test/java/org/infinispan/distribution/rehash/StateTransferOverwriteTest.java b/core/src/test/java/org/infinispan/distribution/rehash/StateTransferOverwriteTest.java index c6ceb98169a..a55c5b89d80 100644 --- a/core/src/test/java/org/infinispan/distribution/rehash/StateTransferOverwriteTest.java +++ b/core/src/test/java/org/infinispan/distribution/rehash/StateTransferOverwriteTest.java @@ -2,7 +2,7 @@ import java.util.concurrent.Callable; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commands.VisitableCommand; import org.infinispan.test.op.TestWriteOperation; diff --git a/core/src/test/java/org/infinispan/eviction/impl/ExceptionEvictionTest.java b/core/src/test/java/org/infinispan/eviction/impl/ExceptionEvictionTest.java index 75375f8a110..fe5f06c5c47 100644 --- a/core/src/test/java/org/infinispan/eviction/impl/ExceptionEvictionTest.java +++ b/core/src/test/java/org/infinispan/eviction/impl/ExceptionEvictionTest.java @@ -7,13 +7,13 @@ import java.util.Iterator; import java.util.concurrent.TimeUnit; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.test.Exceptions; diff --git a/core/src/test/java/org/infinispan/expiry/AutoCommitExpiryTest.java b/core/src/test/java/org/infinispan/expiry/AutoCommitExpiryTest.java index c22dbbb1b25..a0abf60b4ef 100644 --- a/core/src/test/java/org/infinispan/expiry/AutoCommitExpiryTest.java +++ b/core/src/test/java/org/infinispan/expiry/AutoCommitExpiryTest.java @@ -5,12 +5,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/functional/FunctionalEncodingTypeTest.java b/core/src/test/java/org/infinispan/functional/FunctionalEncodingTypeTest.java index d3706006098..c739f064333 100644 --- a/core/src/test/java/org/infinispan/functional/FunctionalEncodingTypeTest.java +++ b/core/src/test/java/org/infinispan/functional/FunctionalEncodingTypeTest.java @@ -3,8 +3,8 @@ //import static org.testng.AssertJUnit.assertEquals; //import static org.testng.AssertJUnit.assertFalse; // -//import javax.transaction.Status; -//import javax.transaction.TransactionManager; +//import jakarta.transaction.Status; +//import jakarta.transaction.TransactionManager; // //import org.infinispan.AdvancedCache; //import org.infinispan.commons.dataconversion.Encoder; diff --git a/core/src/test/java/org/infinispan/functional/FunctionalInMemoryTest.java b/core/src/test/java/org/infinispan/functional/FunctionalInMemoryTest.java index ef7aed44f59..27d82927942 100644 --- a/core/src/test/java/org/infinispan/functional/FunctionalInMemoryTest.java +++ b/core/src/test/java/org/infinispan/functional/FunctionalInMemoryTest.java @@ -10,7 +10,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.CompletionException; -import javax.transaction.RollbackException; +import jakarta.transaction.RollbackException; import javax.transaction.xa.XAException; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/functional/FunctionalTxInMemoryTest.java b/core/src/test/java/org/infinispan/functional/FunctionalTxInMemoryTest.java index 509c75a45fd..c37e4422a99 100644 --- a/core/src/test/java/org/infinispan/functional/FunctionalTxInMemoryTest.java +++ b/core/src/test/java/org/infinispan/functional/FunctionalTxInMemoryTest.java @@ -11,8 +11,8 @@ import java.util.concurrent.CompletionException; import java.util.stream.IntStream; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.CacheException; import org.infinispan.marshall.core.MarshallableFunctions; diff --git a/core/src/test/java/org/infinispan/functional/FunctionalWriteSkewInMemoryTest.java b/core/src/test/java/org/infinispan/functional/FunctionalWriteSkewInMemoryTest.java index 5b1ea068b12..236048595e6 100644 --- a/core/src/test/java/org/infinispan/functional/FunctionalWriteSkewInMemoryTest.java +++ b/core/src/test/java/org/infinispan/functional/FunctionalWriteSkewInMemoryTest.java @@ -9,9 +9,9 @@ import java.util.concurrent.CompletionException; import java.util.stream.Stream; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/functional/decorators/FunctionalAdvancedCache.java b/core/src/test/java/org/infinispan/functional/decorators/FunctionalAdvancedCache.java index 4ed8d84968e..80072567b0c 100644 --- a/core/src/test/java/org/infinispan/functional/decorators/FunctionalAdvancedCache.java +++ b/core/src/test/java/org/infinispan/functional/decorators/FunctionalAdvancedCache.java @@ -20,7 +20,7 @@ import java.util.function.Function; import javax.security.auth.Subject; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.infinispan.AdvancedCache; diff --git a/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalTxTest.java b/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalTxTest.java index 6f6b0c8a635..adcfc16cebf 100644 --- a/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalTxTest.java +++ b/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalTxTest.java @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/functional/persistence/FunctionalPersistenceTest.java b/core/src/test/java/org/infinispan/functional/persistence/FunctionalPersistenceTest.java index 60a65e0decb..34801665967 100644 --- a/core/src/test/java/org/infinispan/functional/persistence/FunctionalPersistenceTest.java +++ b/core/src/test/java/org/infinispan/functional/persistence/FunctionalPersistenceTest.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java b/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java index b407dba0d6d..0fb48713b8f 100644 --- a/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java +++ b/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java @@ -16,8 +16,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.RollbackException; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java b/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java index 415f1546d14..7e0d24b8cee 100644 --- a/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java +++ b/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java @@ -6,7 +6,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.jmx.MBeanServerLookup; diff --git a/core/src/test/java/org/infinispan/lock/APIDistTest.java b/core/src/test/java/org/infinispan/lock/APIDistTest.java index 20089f622f4..70ca9ca6221 100644 --- a/core/src/test/java/org/infinispan/lock/APIDistTest.java +++ b/core/src/test/java/org/infinispan/lock/APIDistTest.java @@ -3,11 +3,11 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/lock/APITest.java b/core/src/test/java/org/infinispan/lock/APITest.java index abf4e3de11b..0e7495d5d9c 100644 --- a/core/src/test/java/org/infinispan/lock/APITest.java +++ b/core/src/test/java/org/infinispan/lock/APITest.java @@ -11,8 +11,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/lock/ExplicitUnlockTest.java b/core/src/test/java/org/infinispan/lock/ExplicitUnlockTest.java index 26fdc1ef12a..07e8c4565c1 100644 --- a/core/src/test/java/org/infinispan/lock/ExplicitUnlockTest.java +++ b/core/src/test/java/org/infinispan/lock/ExplicitUnlockTest.java @@ -10,7 +10,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/lock/OptimisticTxFailureAfterLockingTest.java b/core/src/test/java/org/infinispan/lock/OptimisticTxFailureAfterLockingTest.java index 8065583493d..82d9a69f46e 100644 --- a/core/src/test/java/org/infinispan/lock/OptimisticTxFailureAfterLockingTest.java +++ b/core/src/test/java/org/infinispan/lock/OptimisticTxFailureAfterLockingTest.java @@ -1,7 +1,7 @@ package org.infinispan.lock; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java b/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java index 0c61fe4e5da..2c65b5013b5 100644 --- a/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java +++ b/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java @@ -1,6 +1,6 @@ package org.infinispan.lock.singlelock; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.transaction.LockingMode; diff --git a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java index ddaedda90c3..fe4ad83c06a 100644 --- a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java +++ b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java index cd0ac2c36fe..e75ff2f3d90 100644 --- a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java +++ b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java b/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java index 078997c8664..3f22a88c574 100644 --- a/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java +++ b/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java @@ -2,11 +2,11 @@ import static org.testng.Assert.assertEquals; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.commands.tx.CommitCommand; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java b/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java index 61ae763cb3b..fee911156e4 100644 --- a/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java +++ b/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java @@ -7,11 +7,11 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.Cache; import org.infinispan.commands.remote.ClusteredGetCommand; diff --git a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java index 4d97deb97cd..1a89f71a029 100644 --- a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java +++ b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java @@ -3,12 +3,12 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.fail; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.lock.singlelock.AbstractLockOwnerCrashTest; diff --git a/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java b/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java index 387799f9786..9770459207a 100644 --- a/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java +++ b/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java @@ -1,6 +1,6 @@ package org.infinispan.manager; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java index bf78e134b27..ee6163108bf 100644 --- a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java +++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.write.PutKeyValueCommand; diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java index 386cca51755..18631aa377b 100644 --- a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java +++ b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java @@ -7,8 +7,8 @@ import java.lang.reflect.Method; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.Cache; import org.infinispan.commons.CacheException; diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java index 8129b330d1a..4de30ebc3ac 100644 --- a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java +++ b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; -import javax.transaction.RollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.Cache; import org.infinispan.commons.CacheException; diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/AbstractClusterListenerTxTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/AbstractClusterListenerTxTest.java index 029d65dc4cb..2fec9ded4fd 100644 --- a/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/AbstractClusterListenerTxTest.java +++ b/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/AbstractClusterListenerTxTest.java @@ -5,12 +5,12 @@ import java.util.Collection; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/partitionhandling/BaseOptimisticTxPartitionAndMergeTest.java b/core/src/test/java/org/infinispan/partitionhandling/BaseOptimisticTxPartitionAndMergeTest.java index aa10517c7ae..7b764461125 100644 --- a/core/src/test/java/org/infinispan/partitionhandling/BaseOptimisticTxPartitionAndMergeTest.java +++ b/core/src/test/java/org/infinispan/partitionhandling/BaseOptimisticTxPartitionAndMergeTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.RollbackException; -import javax.transaction.Status; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; import javax.transaction.xa.XAException; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/partitionhandling/BasePessimisticTxPartitionAndMergeTest.java b/core/src/test/java/org/infinispan/partitionhandling/BasePessimisticTxPartitionAndMergeTest.java index b57e95e6dc3..8057c06cd2b 100644 --- a/core/src/test/java/org/infinispan/partitionhandling/BasePessimisticTxPartitionAndMergeTest.java +++ b/core/src/test/java/org/infinispan/partitionhandling/BasePessimisticTxPartitionAndMergeTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.tx.TransactionBoundaryCommand; diff --git a/core/src/test/java/org/infinispan/partitionhandling/LockPartitionHandlingTest.java b/core/src/test/java/org/infinispan/partitionhandling/LockPartitionHandlingTest.java index fb27fe038dc..6177354b4f3 100644 --- a/core/src/test/java/org/infinispan/partitionhandling/LockPartitionHandlingTest.java +++ b/core/src/test/java/org/infinispan/partitionhandling/LockPartitionHandlingTest.java @@ -5,7 +5,7 @@ import java.util.stream.Stream; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.test.Exceptions; diff --git a/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringPrepareTest.java b/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringPrepareTest.java index 002d5c6adb3..a775e64fd9c 100644 --- a/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringPrepareTest.java +++ b/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringPrepareTest.java @@ -1,7 +1,7 @@ package org.infinispan.partitionhandling; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.tx.PrepareCommand; diff --git a/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringRollbackTest.java b/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringRollbackTest.java index 8560ec94e4f..76bf9dac213 100644 --- a/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringRollbackTest.java +++ b/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionAndMergeDuringRollbackTest.java @@ -1,7 +1,7 @@ package org.infinispan.partitionhandling; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.tx.RollbackCommand; diff --git a/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionHandlingReleaseLockTest.java b/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionHandlingReleaseLockTest.java index 5a4f7667f08..084faed6603 100644 --- a/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionHandlingReleaseLockTest.java +++ b/core/src/test/java/org/infinispan/partitionhandling/PessimisticTxPartitionHandlingReleaseLockTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.commands.remote.CacheRpcCommand; diff --git a/core/src/test/java/org/infinispan/persistence/CacheLoaderFunctionalTest.java b/core/src/test/java/org/infinispan/persistence/CacheLoaderFunctionalTest.java index 4e901bddd8a..14c8c43f917 100644 --- a/core/src/test/java/org/infinispan/persistence/CacheLoaderFunctionalTest.java +++ b/core/src/test/java/org/infinispan/persistence/CacheLoaderFunctionalTest.java @@ -15,10 +15,10 @@ import java.util.HashSet; import java.util.Set; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/persistence/ConcurrentLoadAndEvictTxTest.java b/core/src/test/java/org/infinispan/persistence/ConcurrentLoadAndEvictTxTest.java index 14eb51183c0..38f7c116e01 100644 --- a/core/src/test/java/org/infinispan/persistence/ConcurrentLoadAndEvictTxTest.java +++ b/core/src/test/java/org/infinispan/persistence/ConcurrentLoadAndEvictTxTest.java @@ -2,12 +2,12 @@ import static org.infinispan.test.TestingUtil.getTransactionManager; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/core/src/test/java/org/infinispan/persistence/PassivatePersistentTest.java b/core/src/test/java/org/infinispan/persistence/PassivatePersistentTest.java index 3e07c54fbf1..f10b5d1ee6e 100644 --- a/core/src/test/java/org/infinispan/persistence/PassivatePersistentTest.java +++ b/core/src/test/java/org/infinispan/persistence/PassivatePersistentTest.java @@ -1,6 +1,6 @@ package org.infinispan.persistence; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/persistence/PassivationFunctionalTest.java b/core/src/test/java/org/infinispan/persistence/PassivationFunctionalTest.java index 114349f59b5..b48709c76fd 100644 --- a/core/src/test/java/org/infinispan/persistence/PassivationFunctionalTest.java +++ b/core/src/test/java/org/infinispan/persistence/PassivationFunctionalTest.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/persistence/support/EnsureNonBlockingStore.java b/core/src/test/java/org/infinispan/persistence/support/EnsureNonBlockingStore.java index 211df078fc4..73f717ffc96 100644 --- a/core/src/test/java/org/infinispan/persistence/support/EnsureNonBlockingStore.java +++ b/core/src/test/java/org/infinispan/persistence/support/EnsureNonBlockingStore.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.Predicate; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.test.BlockHoundHelper; import org.infinispan.commons.util.IntSet; diff --git a/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java b/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java index d2e6a598a9c..ac75e7480d3 100644 --- a/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java +++ b/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java @@ -5,8 +5,8 @@ import java.util.Collections; import java.util.concurrent.Future; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java b/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java index 4f432edda5d..b5a539e7f20 100644 --- a/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java +++ b/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java @@ -12,7 +12,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; /** * Verifies the Flags affect both local and remote nodes. diff --git a/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java b/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java index 839a0ba69bb..33f0c3f5c2d 100644 --- a/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java +++ b/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java @@ -7,10 +7,10 @@ import java.io.Serializable; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.commands.VisitableCommand; diff --git a/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java b/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java index e0b4f46b951..47a51a287a0 100644 --- a/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java +++ b/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java @@ -8,8 +8,8 @@ import java.util.Map; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.CacheException; diff --git a/core/src/test/java/org/infinispan/replication/SyncLockingTest.java b/core/src/test/java/org/infinispan/replication/SyncLockingTest.java index 7fa597882e3..079bc36101e 100644 --- a/core/src/test/java/org/infinispan/replication/SyncLockingTest.java +++ b/core/src/test/java/org/infinispan/replication/SyncLockingTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/replication/SyncPessimisticLockingTest.java b/core/src/test/java/org/infinispan/replication/SyncPessimisticLockingTest.java index 70f49993fad..8c30a3f36e5 100644 --- a/core/src/test/java/org/infinispan/replication/SyncPessimisticLockingTest.java +++ b/core/src/test/java/org/infinispan/replication/SyncPessimisticLockingTest.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/security/SecureCacheTestDriver.java b/core/src/test/java/org/infinispan/security/SecureCacheTestDriver.java index 56a51ce6d44..4e682420a64 100644 --- a/core/src/test/java/org/infinispan/security/SecureCacheTestDriver.java +++ b/core/src/test/java/org/infinispan/security/SecureCacheTestDriver.java @@ -8,8 +8,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; import org.infinispan.commons.dataconversion.ByteArrayWrapper; import org.infinispan.commons.dataconversion.IdentityEncoder; diff --git a/core/src/test/java/org/infinispan/statetransfer/CommitTimeoutTest.java b/core/src/test/java/org/infinispan/statetransfer/CommitTimeoutTest.java index 9b4d2cf477b..51311f63b3c 100644 --- a/core/src/test/java/org/infinispan/statetransfer/CommitTimeoutTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/CommitTimeoutTest.java @@ -10,7 +10,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.RollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.Cache; import org.infinispan.commands.tx.CommitCommand; diff --git a/core/src/test/java/org/infinispan/statetransfer/GetWithForceWriteLockRetryTest.java b/core/src/test/java/org/infinispan/statetransfer/GetWithForceWriteLockRetryTest.java index 7765a3d2468..e9fa9d9ae51 100644 --- a/core/src/test/java/org/infinispan/statetransfer/GetWithForceWriteLockRetryTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/GetWithForceWriteLockRetryTest.java @@ -10,7 +10,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.ReplicableCommand; diff --git a/core/src/test/java/org/infinispan/statetransfer/ManyTxsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/ManyTxsDuringStateTransferTest.java index 590605116d3..7f0f2c9e6c8 100644 --- a/core/src/test/java/org/infinispan/statetransfer/ManyTxsDuringStateTransferTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/ManyTxsDuringStateTransferTest.java @@ -13,7 +13,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.commons.executors.BlockingThreadPoolExecutorFactory; diff --git a/core/src/test/java/org/infinispan/statetransfer/OrphanTransactionsCleanupTest.java b/core/src/test/java/org/infinispan/statetransfer/OrphanTransactionsCleanupTest.java index f2495c1f668..bfc0fb8540e 100644 --- a/core/src/test/java/org/infinispan/statetransfer/OrphanTransactionsCleanupTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/OrphanTransactionsCleanupTest.java @@ -4,7 +4,7 @@ import java.util.Arrays; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithLockOnlyTxDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithLockOnlyTxDuringStateTransferTest.java index 7518c822d75..9b41445811f 100644 --- a/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithLockOnlyTxDuringStateTransferTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithLockOnlyTxDuringStateTransferTest.java @@ -7,7 +7,7 @@ import static org.infinispan.test.concurrent.StateSequencerUtil.matchMethodCall; import static org.testng.AssertJUnit.assertEquals; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.hamcrest.BaseMatcher; import org.hamcrest.CoreMatchers; diff --git a/core/src/test/java/org/infinispan/statetransfer/StaleTxWithCommitDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/StaleTxWithCommitDuringStateTransferTest.java index d02dfa8d4a4..257f3038818 100644 --- a/core/src/test/java/org/infinispan/statetransfer/StaleTxWithCommitDuringStateTransferTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/StaleTxWithCommitDuringStateTransferTest.java @@ -13,8 +13,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java index c39d9019c88..63293ed5591 100644 --- a/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java @@ -8,8 +8,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.test.Exceptions; diff --git a/core/src/test/java/org/infinispan/statetransfer/TxDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/TxDuringStateTransferTest.java index 3d40c993808..2b7e771a711 100644 --- a/core/src/test/java/org/infinispan/statetransfer/TxDuringStateTransferTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/TxDuringStateTransferTest.java @@ -5,7 +5,7 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertNotNull; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/statetransfer/TxReplay2Test.java b/core/src/test/java/org/infinispan/statetransfer/TxReplay2Test.java index 64b889ba862..b84d29dd896 100644 --- a/core/src/test/java/org/infinispan/statetransfer/TxReplay2Test.java +++ b/core/src/test/java/org/infinispan/statetransfer/TxReplay2Test.java @@ -12,7 +12,7 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.infinispan.Cache; import org.infinispan.commands.remote.recovery.TxCompletionNotificationCommand; diff --git a/core/src/test/java/org/infinispan/statetransfer/TxReplayTest.java b/core/src/test/java/org/infinispan/statetransfer/TxReplayTest.java index b2a3fdb3909..6e45d64472a 100644 --- a/core/src/test/java/org/infinispan/statetransfer/TxReplayTest.java +++ b/core/src/test/java/org/infinispan/statetransfer/TxReplayTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.infinispan.Cache; import org.infinispan.commands.tx.CommitCommand; diff --git a/core/src/test/java/org/infinispan/stream/DistributedStreamIteratorRepeatableReadTxTest.java b/core/src/test/java/org/infinispan/stream/DistributedStreamIteratorRepeatableReadTxTest.java index 8789a7416c8..3d686f5066a 100644 --- a/core/src/test/java/org/infinispan/stream/DistributedStreamIteratorRepeatableReadTxTest.java +++ b/core/src/test/java/org/infinispan/stream/DistributedStreamIteratorRepeatableReadTxTest.java @@ -14,9 +14,9 @@ import java.util.Objects; import java.util.Set; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/stress/AbstractWriteSkewStressTest.java b/core/src/test/java/org/infinispan/stress/AbstractWriteSkewStressTest.java index a1922c8fa6f..cafd5728eeb 100644 --- a/core/src/test/java/org/infinispan/stress/AbstractWriteSkewStressTest.java +++ b/core/src/test/java/org/infinispan/stress/AbstractWriteSkewStressTest.java @@ -12,8 +12,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java b/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java index 4bd84b2ecee..5d806248cc2 100644 --- a/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java +++ b/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java @@ -34,7 +34,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.api.BasicCache; import org.infinispan.commons.api.BasicCacheContainer; diff --git a/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java b/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java index 466aa63b8b6..bd8efc79efd 100644 --- a/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java +++ b/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java @@ -23,10 +23,10 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java b/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java index d00a65b9b4c..3f8e869f563 100644 --- a/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java +++ b/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java @@ -4,8 +4,8 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.distribution.rehash.XAResourceAdapter; diff --git a/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java b/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java index bd26b101965..f6a965f75ca 100644 --- a/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java +++ b/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java @@ -1,8 +1,8 @@ package org.infinispan.test; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/test/TestingUtil.java b/core/src/test/java/org/infinispan/test/TestingUtil.java index 65e4e90a86c..e9264a7a3ee 100644 --- a/core/src/test/java/org/infinispan/test/TestingUtil.java +++ b/core/src/test/java/org/infinispan/test/TestingUtil.java @@ -57,8 +57,8 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.security.auth.Subject; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java b/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java index 1c9fd72e108..03e75364b24 100644 --- a/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java +++ b/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java @@ -3,10 +3,10 @@ import java.util.List; import java.util.concurrent.Future; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java b/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java index 092ca64007a..c90b57e12e6 100644 --- a/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java +++ b/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java @@ -1,7 +1,7 @@ package org.infinispan.test.fwk; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.infinispan.commons.util.LegacyKeySupportSystemProperties; import org.infinispan.transaction.lookup.EmbeddedTransactionManagerLookup; diff --git a/core/src/test/java/org/infinispan/test/tx/TestLookup.java b/core/src/test/java/org/infinispan/test/tx/TestLookup.java index e813985bf38..32b6177ec76 100644 --- a/core/src/test/java/org/infinispan/test/tx/TestLookup.java +++ b/core/src/test/java/org/infinispan/test/tx/TestLookup.java @@ -1,6 +1,6 @@ package org.infinispan.test.tx; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.tx.lookup.TransactionManagerLookup; diff --git a/core/src/test/java/org/infinispan/tx/BatchingAndEnlistmentTest.java b/core/src/test/java/org/infinispan/tx/BatchingAndEnlistmentTest.java index ea764580c3d..a5c57589175 100644 --- a/core/src/test/java/org/infinispan/tx/BatchingAndEnlistmentTest.java +++ b/core/src/test/java/org/infinispan/tx/BatchingAndEnlistmentTest.java @@ -2,7 +2,7 @@ import static org.testng.Assert.assertEquals; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.batch.BatchContainer; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionReadCommittedTest.java b/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionReadCommittedTest.java index d208e8fe86b..d6b4c8e7e29 100644 --- a/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionReadCommittedTest.java +++ b/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionReadCommittedTest.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Set; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.configuration.cache.StorageType; diff --git a/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionRepeatableReadTest.java b/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionRepeatableReadTest.java index 8d5a73b037f..45ba13dd0a8 100644 --- a/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionRepeatableReadTest.java +++ b/core/src/test/java/org/infinispan/tx/ContextAffectsTransactionRepeatableReadTest.java @@ -1,6 +1,6 @@ package org.infinispan.tx; -import javax.transaction.RollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.commons.test.Exceptions; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/DummyTxTest.java b/core/src/test/java/org/infinispan/tx/DummyTxTest.java index 39c0053691a..3ae9bb9cda7 100644 --- a/core/src/test/java/org/infinispan/tx/DummyTxTest.java +++ b/core/src/test/java/org/infinispan/tx/DummyTxTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/core/src/test/java/org/infinispan/tx/EmbeddedTransactionTest.java b/core/src/test/java/org/infinispan/tx/EmbeddedTransactionTest.java index f551919f7b4..fbcc2dd4e3e 100644 --- a/core/src/test/java/org/infinispan/tx/EmbeddedTransactionTest.java +++ b/core/src/test/java/org/infinispan/tx/EmbeddedTransactionTest.java @@ -10,13 +10,13 @@ import java.util.Collection; import java.util.Collections; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/core/src/test/java/org/infinispan/tx/EntryWrappingInterceptorDoesNotBlockTest.java b/core/src/test/java/org/infinispan/tx/EntryWrappingInterceptorDoesNotBlockTest.java index 765554ddea0..0e938eba33c 100644 --- a/core/src/test/java/org/infinispan/tx/EntryWrappingInterceptorDoesNotBlockTest.java +++ b/core/src/test/java/org/infinispan/tx/EntryWrappingInterceptorDoesNotBlockTest.java @@ -16,7 +16,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.commands.remote.BaseClusteredReadCommand; diff --git a/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java b/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java index 77c2707d6dd..f80a0f8942a 100644 --- a/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java +++ b/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java @@ -3,9 +3,9 @@ import static org.infinispan.test.TestingUtil.extractInterceptorChain; import static org.testng.Assert.assertEquals; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.commands.tx.PrepareCommand; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java b/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java index d499011c3a7..b3ef4ac6b2d 100644 --- a/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java +++ b/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java @@ -1,6 +1,6 @@ package org.infinispan.tx; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java b/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java index 71f053fa6dd..545c3dedfd2 100644 --- a/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java +++ b/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java @@ -5,8 +5,8 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.configuration.cache.StorageType; diff --git a/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java b/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java index 75a3f2131dd..601d00aeedb 100644 --- a/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java +++ b/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java @@ -6,8 +6,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java b/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java index d2f8a1f555c..fb2ffbba45e 100644 --- a/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java +++ b/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java @@ -1,10 +1,10 @@ package org.infinispan.tx; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java b/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java index 9d17262fb09..ea9856c2da3 100644 --- a/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java +++ b/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java @@ -2,8 +2,8 @@ import static org.infinispan.commons.test.Exceptions.expectException; -import javax.transaction.RollbackException; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.CacheException; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/core/src/test/java/org/infinispan/tx/NoLockLostOnLongTxTest.java b/core/src/test/java/org/infinispan/tx/NoLockLostOnLongTxTest.java index 463cbb0580e..844d8bf1fe0 100644 --- a/core/src/test/java/org/infinispan/tx/NoLockLostOnLongTxTest.java +++ b/core/src/test/java/org/infinispan/tx/NoLockLostOnLongTxTest.java @@ -10,7 +10,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java b/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java index 87898d6183e..f732b8e91a2 100644 --- a/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java +++ b/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/PessimisticDeadlockTest.java b/core/src/test/java/org/infinispan/tx/PessimisticDeadlockTest.java index afb29cb10cf..fe97f838ac6 100644 --- a/core/src/test/java/org/infinispan/tx/PessimisticDeadlockTest.java +++ b/core/src/test/java/org/infinispan/tx/PessimisticDeadlockTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.RollbackException; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java b/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java index 59a46336635..d947ad53fb3 100644 --- a/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java +++ b/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java @@ -1,11 +1,11 @@ package org.infinispan.tx; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java b/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java index 96b6565c7f3..27345196ae2 100644 --- a/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java +++ b/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java @@ -3,7 +3,7 @@ import static org.infinispan.test.TestingUtil.extractInterceptorChain; import java.util.concurrent.atomic.AtomicInteger; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commands.tx.CommitCommand; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java b/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java index b0e9e31859f..4b3c49e3673 100644 --- a/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java +++ b/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java @@ -2,8 +2,8 @@ import static org.infinispan.test.TestingUtil.sleepThread; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java b/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java index 7cd62b8944e..2fa0b915487 100644 --- a/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java +++ b/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java @@ -2,8 +2,8 @@ import java.util.concurrent.CountDownLatch; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java b/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java index 8c8f7781546..77a40b49c21 100644 --- a/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java +++ b/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java @@ -1,8 +1,8 @@ package org.infinispan.tx; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/StateTransferTransactionTest.java b/core/src/test/java/org/infinispan/tx/StateTransferTransactionTest.java index 32d9ba6d999..92dd24c61a0 100644 --- a/core/src/test/java/org/infinispan/tx/StateTransferTransactionTest.java +++ b/core/src/test/java/org/infinispan/tx/StateTransferTransactionTest.java @@ -7,13 +7,13 @@ import java.util.HashSet; import java.util.Set; -import javax.transaction.InvalidTransactionException; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.infinispan.Cache; import org.infinispan.commands.VisitableCommand; diff --git a/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java b/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java index cd0cfb28a70..e7e1cec7de1 100644 --- a/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java +++ b/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java @@ -13,7 +13,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.IllegalLifecycleStateException; diff --git a/core/src/test/java/org/infinispan/tx/TransactionCleanupWithRecoveryTest.java b/core/src/test/java/org/infinispan/tx/TransactionCleanupWithRecoveryTest.java index 78bc8b84e3e..b1aec2207dd 100644 --- a/core/src/test/java/org/infinispan/tx/TransactionCleanupWithRecoveryTest.java +++ b/core/src/test/java/org/infinispan/tx/TransactionCleanupWithRecoveryTest.java @@ -1,6 +1,6 @@ package org.infinispan.tx; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java b/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java index 763bf6e9894..2c3f0f0d494 100644 --- a/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java +++ b/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java @@ -1,6 +1,6 @@ package org.infinispan.tx; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.global.GlobalConfiguration; import org.infinispan.configuration.global.GlobalConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/TransactionsSpanningCachesTest.java b/core/src/test/java/org/infinispan/tx/TransactionsSpanningCachesTest.java index 3f20a1d5e9b..2cc79afa92e 100644 --- a/core/src/test/java/org/infinispan/tx/TransactionsSpanningCachesTest.java +++ b/core/src/test/java/org/infinispan/tx/TransactionsSpanningCachesTest.java @@ -1,7 +1,7 @@ package org.infinispan.tx; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java b/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java index ea0f9f518c5..32553e80a35 100644 --- a/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java +++ b/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java @@ -6,8 +6,8 @@ import java.util.Arrays; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorExceptionTest.java index b8899ec52b8..c3b42d06e96 100644 --- a/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorExceptionTest.java +++ b/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorExceptionTest.java @@ -3,8 +3,8 @@ import static org.infinispan.test.TestingUtil.extractInterceptorChain; import static org.testng.Assert.assertEquals; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.commands.write.PutKeyValueCommand; import org.infinispan.configuration.CustomInterceptorConfigTest; diff --git a/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java b/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java index 7e791fa33bc..4c298d086bb 100644 --- a/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java +++ b/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java @@ -1,6 +1,6 @@ package org.infinispan.tx.exception; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.test.MultipleCacheManagersTest; diff --git a/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java index 1a15a24e503..3aea51c52af 100644 --- a/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java +++ b/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java @@ -2,8 +2,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.RollbackException; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.tx.RollbackCommand; diff --git a/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java index 7db88e3ced6..e7d2ffada54 100644 --- a/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java +++ b/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java @@ -6,14 +6,14 @@ import java.util.Collections; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java index 8207e8409d5..83d8a968055 100644 --- a/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java +++ b/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java @@ -8,9 +8,9 @@ import java.util.Collections; -import javax.transaction.Status; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.CacheException; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java b/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java index d56e92fbbc9..4c3e713d63b 100644 --- a/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java @@ -5,10 +5,10 @@ import java.util.Collections; import java.util.Map; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import org.infinispan.test.MultipleCacheManagersTest; import org.infinispan.transaction.tm.EmbeddedTransactionManager; diff --git a/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java b/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java index add0782dcdf..a951dfc65cd 100644 --- a/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.Map; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.infinispan.commons.tx.XidImpl; import org.infinispan.context.Flag; diff --git a/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java b/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java index d2121b583d9..ace6c5f1fbe 100644 --- a/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java @@ -3,7 +3,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java b/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java index 184884874c9..f5d615cdd46 100644 --- a/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java @@ -5,7 +5,7 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/locking/PrimaryOwnerChangePessimistTxTest.java b/core/src/test/java/org/infinispan/tx/locking/PrimaryOwnerChangePessimistTxTest.java index 287d493dd67..bb9f9fa05ea 100644 --- a/core/src/test/java/org/infinispan/tx/locking/PrimaryOwnerChangePessimistTxTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/PrimaryOwnerChangePessimistTxTest.java @@ -5,9 +5,9 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import org.infinispan.AdvancedCache; import org.infinispan.commons.test.ExceptionRunnable; diff --git a/core/src/test/java/org/infinispan/tx/locking/RollbackDuringLockAcquisitionTest.java b/core/src/test/java/org/infinispan/tx/locking/RollbackDuringLockAcquisitionTest.java index 23cd7588c0c..5c40a4914fc 100644 --- a/core/src/test/java/org/infinispan/tx/locking/RollbackDuringLockAcquisitionTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/RollbackDuringLockAcquisitionTest.java @@ -12,8 +12,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commands.tx.RollbackCommand; diff --git a/core/src/test/java/org/infinispan/tx/locking/SizeDistTxReadCommittedTest.java b/core/src/test/java/org/infinispan/tx/locking/SizeDistTxReadCommittedTest.java index 2188d59b991..37456d28ffb 100644 --- a/core/src/test/java/org/infinispan/tx/locking/SizeDistTxReadCommittedTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/SizeDistTxReadCommittedTest.java @@ -3,7 +3,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.util.concurrent.IsolationLevel; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/infinispan/tx/locking/SizeDistTxRepeatableReadTest.java b/core/src/test/java/org/infinispan/tx/locking/SizeDistTxRepeatableReadTest.java index 470758b57a4..ed04a1f85ff 100644 --- a/core/src/test/java/org/infinispan/tx/locking/SizeDistTxRepeatableReadTest.java +++ b/core/src/test/java/org/infinispan/tx/locking/SizeDistTxRepeatableReadTest.java @@ -3,7 +3,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java index bcf0e2718a8..2a822944be5 100644 --- a/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java +++ b/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java @@ -2,8 +2,8 @@ import static org.testng.Assert.assertEquals; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.configuration.cache.StorageType; diff --git a/cdi/common-jakarta/jakarta.txt b/core/src/test/java/org/infinispan/util/tx/lookup/GeronimoTransactionManagerLookup.java similarity index 100% rename from cdi/common-jakarta/jakarta.txt rename to core/src/test/java/org/infinispan/util/tx/lookup/GeronimoTransactionManagerLookup.java diff --git a/core/src/test/java/org/infinispan/xsite/CacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/CacheOperationsTest.java index 9008f14b054..8de522f0712 100644 --- a/core/src/test/java/org/infinispan/xsite/CacheOperationsTest.java +++ b/core/src/test/java/org/infinispan/xsite/CacheOperationsTest.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.util.Util; diff --git a/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java b/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java index 5cefa4a37bd..41b8ed95739 100644 --- a/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java +++ b/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java @@ -4,7 +4,7 @@ import java.util.function.BiFunction; import java.util.function.Function; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; /** * @author Mircea Markus diff --git a/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java b/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java index bbdfa7bfc48..fda93ca9b1b 100644 --- a/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java +++ b/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CompletionStage; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commands.VisitableCommand; import org.infinispan.configuration.cache.CacheMode; diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java index f80a3d9df65..36b9c30bf6b 100644 --- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java +++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java @@ -3,7 +3,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.transaction.RollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.commons.CacheException; import org.infinispan.configuration.cache.BackupFailurePolicy; diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java index 9bb833e9d51..ed1dce9b29c 100644 --- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java +++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java @@ -2,7 +2,7 @@ import static org.testng.AssertJUnit.assertNull; -import javax.transaction.RollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.commons.CacheException; import org.infinispan.commons.test.Exceptions; diff --git a/core/src/test/java/org/infinispan/xsite/irac/IracWriteSkewTest.java b/core/src/test/java/org/infinispan/xsite/irac/IracWriteSkewTest.java index 81003d89da8..3f896d22d5e 100644 --- a/core/src/test/java/org/infinispan/xsite/irac/IracWriteSkewTest.java +++ b/core/src/test/java/org/infinispan/xsite/irac/IracWriteSkewTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.Objects; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.test.Exceptions; diff --git a/documentation/src/main/asciidoc/cheat-sheets/cache-configuration.asciidoc b/documentation/src/main/asciidoc/cheat-sheets/cache-configuration.asciidoc index 1b2104cf315..ecdcb9c841a 100644 --- a/documentation/src/main/asciidoc/cheat-sheets/cache-configuration.asciidoc +++ b/documentation/src/main/asciidoc/cheat-sheets/cache-configuration.asciidoc @@ -259,7 +259,7 @@ Configure the mode that {brandname} uses when carrying out transactions to ensur NOTE: Enable transaction mode for the cache to ensure consistency for conditional operations, such as `putIfAbsent` or `remove`, that require consistent cache data across the cluster. -NON_XA:: Cache will enlist within transactions as a `javax.transaction.Synchronization`. +NON_XA:: Cache will enlist within transactions as a `jakarta.transaction.Synchronization`. NON_DURABLE_XA:: Cache will enlist within transactions as a `javax.transaction.xa.XAResource`, without recovery. FULL_XA:: Cache will enlist within transactions as a `javax.transaction.xa.XAResource`, with recovery. diff --git a/documentation/src/main/asciidoc/topics/code_examples/CdiEventListeners.java b/documentation/src/main/asciidoc/topics/code_examples/CdiEventListeners.java index 7e6a8a3a0f0..16544087b50 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/CdiEventListeners.java +++ b/documentation/src/main/asciidoc/topics/code_examples/CdiEventListeners.java @@ -1,4 +1,4 @@ -import javax.enterprise.event.Observes; +import jakarta.transaction.event.Observes; import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent; import org.infinispan.notifications.cachelistener.event.*; diff --git a/documentation/src/main/asciidoc/topics/code_examples/InjectCacheQualifier.java b/documentation/src/main/asciidoc/topics/code_examples/InjectCacheQualifier.java index 7be88606079..2f6b9e3244b 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/InjectCacheQualifier.java +++ b/documentation/src/main/asciidoc/topics/code_examples/InjectCacheQualifier.java @@ -2,7 +2,7 @@ import org.infinispan.configuration.cache.Configuration; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.cdi.ConfigureCache; -import javax.enterprise.inject.Produces; +import jakarta.transaction.inject.Produces; public class Config { diff --git a/documentation/src/main/asciidoc/topics/code_examples/InjectDefaultCache.java b/documentation/src/main/asciidoc/topics/code_examples/InjectDefaultCache.java index a29e4686486..65004b76c49 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/InjectDefaultCache.java +++ b/documentation/src/main/asciidoc/topics/code_examples/InjectDefaultCache.java @@ -1,5 +1,5 @@ ... -import javax.inject.Inject; +import jakarta.inject.Inject; public class GreetingService { diff --git a/documentation/src/main/asciidoc/topics/code_examples/InjectQualifier.java b/documentation/src/main/asciidoc/topics/code_examples/InjectQualifier.java index fb4a4ee18a5..f7f165666c2 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/InjectQualifier.java +++ b/documentation/src/main/asciidoc/topics/code_examples/InjectQualifier.java @@ -1,5 +1,5 @@ ... -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) diff --git a/documentation/src/main/asciidoc/topics/code_examples/OverrideEmbeddedCacheManager.java b/documentation/src/main/asciidoc/topics/code_examples/OverrideEmbeddedCacheManager.java index b06be512161..c9a73ad7087 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/OverrideEmbeddedCacheManager.java +++ b/documentation/src/main/asciidoc/topics/code_examples/OverrideEmbeddedCacheManager.java @@ -1,5 +1,5 @@ ... -import javax.enterprise.context.ApplicationScoped; +import jakarta.transaction.context.ApplicationScoped; public class Config { diff --git a/documentation/src/main/asciidoc/topics/proc_cdi_cache_events.adoc b/documentation/src/main/asciidoc/topics/proc_cdi_cache_events.adoc index 966aade9762..a4fcedfad77 100644 --- a/documentation/src/main/asciidoc/topics/proc_cdi_cache_events.adoc +++ b/documentation/src/main/asciidoc/topics/proc_cdi_cache_events.adoc @@ -6,7 +6,7 @@ You can use CDI Events to receive Cache and Cache Manager level events. [source,java] ---- -import javax.enterprise.event.Observes; +import jakarta.transaction.event.Observes; import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent; import org.infinispan.notifications.cachelistener.event.*; diff --git a/documentation/src/main/asciidoc/topics/proc_cdi_injecting_embedded.adoc b/documentation/src/main/asciidoc/topics/proc_cdi_injecting_embedded.adoc index 338c15357e5..de602838a23 100644 --- a/documentation/src/main/asciidoc/topics/proc_cdi_injecting_embedded.adoc +++ b/documentation/src/main/asciidoc/topics/proc_cdi_injecting_embedded.adoc @@ -9,7 +9,7 @@ Set up CDI beans to inject embedded caches. [source,java] ---- ... -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) @@ -29,7 +29,7 @@ public @interface GreetingCache { <1> import org.infinispan.configuration.cache.Configuration; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.cdi.ConfigureCache; -import javax.enterprise.inject.Produces; +import jakarta.transaction.inject.Produces; public class Config { @@ -82,7 +82,7 @@ method or do not add any qualifier. + ---- ... -import javax.inject.Inject; +import jakarta.inject.Inject; public class GreetingService { diff --git a/documentation/src/main/asciidoc/topics/proc_cdi_injecting_remote.adoc b/documentation/src/main/asciidoc/topics/proc_cdi_injecting_remote.adoc index 2cb9a8e60a1..41b0ae719e7 100644 --- a/documentation/src/main/asciidoc/topics/proc_cdi_injecting_remote.adoc +++ b/documentation/src/main/asciidoc/topics/proc_cdi_injecting_remote.adoc @@ -58,7 +58,7 @@ public class GreetingService { [source,java] ---- ... -import javax.enterprise.context.ApplicationScoped; +import jakarta.transaction.context.ApplicationScoped; public class Config { diff --git a/documentation/src/main/asciidoc/topics/ref_hibernate_second_level_cache.adoc b/documentation/src/main/asciidoc/topics/ref_hibernate_second_level_cache.adoc index 61523b256c8..dc095759124 100644 --- a/documentation/src/main/asciidoc/topics/ref_hibernate_second_level_cache.adoc +++ b/documentation/src/main/asciidoc/topics/ref_hibernate_second_level_cache.adoc @@ -60,14 +60,14 @@ To use second level cache, you first need to enable the second level cache so th | Spring | `spring.jpa.properties.hibernate.cache.use_second_level_cache=true` |=== -To select which entities/collections to cache, first annotate them with `javax.persistence.Cacheable`. +To select which entities/collections to cache, first annotate them with `jakarta.persistence.Cacheable`. Then make sure shared cache mode is set to `ENABLE_SELECTIVE`: .Enable selective shared cached mode [cols="1,10"] |=== | JPA | `ENABLE_SELECTIVE` -| Spring | `spring.jpa.properties.javax.persistence.sharedCache.mode=ENABLE_SELECTIVE` +| Spring | `spring.jpa.properties.jakarta.persistence.sharedCache.mode=ENABLE_SELECTIVE` |=== NOTE: This is the most common way of selecting which entities/collections to cache. diff --git a/documentation/src/main/asciidoc/topics/transactions.adoc b/documentation/src/main/asciidoc/topics/transactions.adoc index 04809f7923c..70c6b60458b 100644 --- a/documentation/src/main/asciidoc/topics/transactions.adoc +++ b/documentation/src/main/asciidoc/topics/transactions.adoc @@ -98,7 +98,7 @@ Defaults is `30000`. * `recovery-cache` - configures the cache name to store the recovery information. Check section link:#tx_recovery[Transaction recovery] for more details about recovery. Default is `__recoveryInfoCacheName__`. * `stop-timeout` - the time in millisecond to wait for ongoing transaction when the cache is stopping. Default is `30000`. -* `transaction-manager-lookup` - configures the fully qualified class name of a class that looks up a reference to a `javax.transaction.TransactionManager`. +* `transaction-manager-lookup` - configures the fully qualified class name of a class that looks up a reference to a `jakarta.transaction.TransactionManager`. Default is `org.infinispan.transaction.lookup.GenericTransactionManagerLookup`. diff --git a/documentation/src/main/asciidoc/topics/upgrading.adoc b/documentation/src/main/asciidoc/topics/upgrading.adoc index 4e6aaeb27b0..a3b8b3700a9 100644 --- a/documentation/src/main/asciidoc/topics/upgrading.adoc +++ b/documentation/src/main/asciidoc/topics/upgrading.adoc @@ -5,6 +5,12 @@ Aligning with the deprecation for removal of the SecurityManager since JDK 17, we no longer support integration with a SecurityManager. +== Jakarta and Java EE + +* Infinispan has been updated to use `jakarta.*` packages. +* If you require the legacy `javax.*` packages, you should utilise Infinispan 14.0.x. +* The old `*-jakarta` jars have been removed. + == Removals * The Kryo and Protostuff marshallers have been removed. diff --git a/hibernate/cache-commons/pom.xml b/hibernate/cache-commons/pom.xml index 357b0568fe2..8d3237b9b01 100644 --- a/hibernate/cache-commons/pom.xml +++ b/hibernate/cache-commons/pom.xml @@ -44,8 +44,8 @@ org.jboss.narayana.jta - narayana-jta-jakarta - 5.11.2.Final + narayana-jta + test org.hibernate diff --git a/hibernate/cache-v62/pom.xml b/hibernate/cache-v62/pom.xml index 2617693b73e..6176303424a 100644 --- a/hibernate/cache-v62/pom.xml +++ b/hibernate/cache-v62/pom.xml @@ -33,8 +33,7 @@ org.jboss.narayana.jta - narayana-jta-jakarta - 5.13.1.Final + narayana-jta test @@ -53,13 +52,6 @@ activation test - - - org.jboss.narayana.jta - narayana-jta - 6.0.0.CR1 - test - diff --git a/hibernate/pom.xml b/hibernate/pom.xml index c2ad49029af..96565e17ccc 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -30,11 +30,11 @@ org.infinispan - infinispan-commons-jakarta + infinispan-commons org.infinispan - infinispan-core-jakarta + infinispan-core org.infinispan diff --git a/integrationtests/cdi-weld-se-it/pom.xml b/integrationtests/cdi-weld-se-it/pom.xml index 103b43709df..e5814675b8f 100644 --- a/integrationtests/cdi-weld-se-it/pom.xml +++ b/integrationtests/cdi-weld-se-it/pom.xml @@ -35,6 +35,11 @@ test-jar test + + jakarta.enterprise + jakarta.enterprise.cdi-api + test + org.jboss.spec jboss-jakartaee-8.0 diff --git a/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/CDITestingBean.java b/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/CDITestingBean.java index 802c0c1b338..63238a09cab 100644 --- a/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/CDITestingBean.java +++ b/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/CDITestingBean.java @@ -1,7 +1,7 @@ package org.infinispan.integrationtests.cdi.weld; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.infinispan.Cache; diff --git a/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/Config.java b/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/Config.java index a8327ea69c4..7229dfb1689 100644 --- a/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/Config.java +++ b/integrationtests/cdi-weld-se-it/src/test/java/org/infinispan/integrationtests/cdi/weld/Config.java @@ -1,8 +1,8 @@ package org.infinispan.integrationtests.cdi.weld; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; diff --git a/multimap/src/main/java/org/infinispan/multimap/impl/EmbeddedMultimapCache.java b/multimap/src/main/java/org/infinispan/multimap/impl/EmbeddedMultimapCache.java index c19765cc829..b30be530ab4 100644 --- a/multimap/src/main/java/org/infinispan/multimap/impl/EmbeddedMultimapCache.java +++ b/multimap/src/main/java/org/infinispan/multimap/impl/EmbeddedMultimapCache.java @@ -10,8 +10,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.Cache; diff --git a/multimap/src/test/java/org/infinispan/multimap/impl/MultimapTestUtils.java b/multimap/src/test/java/org/infinispan/multimap/impl/MultimapTestUtils.java index 0a0edbbb72c..2caa05ae917 100644 --- a/multimap/src/test/java/org/infinispan/multimap/impl/MultimapTestUtils.java +++ b/multimap/src/test/java/org/infinispan/multimap/impl/MultimapTestUtils.java @@ -6,7 +6,7 @@ import static org.testng.AssertJUnit.assertTrue; import java.util.Map; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.multimap.api.embedded.MultimapCache; import org.infinispan.remoting.transport.Address; diff --git a/multimap/src/test/java/org/infinispan/multimap/impl/TxDistributedMultimapCacheTest.java b/multimap/src/test/java/org/infinispan/multimap/impl/TxDistributedMultimapCacheTest.java index 5fed0b9a767..9959b75e333 100644 --- a/multimap/src/test/java/org/infinispan/multimap/impl/TxDistributedMultimapCacheTest.java +++ b/multimap/src/test/java/org/infinispan/multimap/impl/TxDistributedMultimapCacheTest.java @@ -13,9 +13,9 @@ import java.util.ArrayList; import java.util.List; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.multimap.api.embedded.MultimapCache; diff --git a/multimap/src/test/java/org/infinispan/multimap/impl/TxEmbeddedMultimapCacheTest.java b/multimap/src/test/java/org/infinispan/multimap/impl/TxEmbeddedMultimapCacheTest.java index 96c2414eb77..7d7dae5c0ca 100644 --- a/multimap/src/test/java/org/infinispan/multimap/impl/TxEmbeddedMultimapCacheTest.java +++ b/multimap/src/test/java/org/infinispan/multimap/impl/TxEmbeddedMultimapCacheTest.java @@ -12,9 +12,9 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/persistence/jdbc-common-jakarta/jakarta.txt b/persistence/jdbc-common-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/persistence/jdbc-common-jakarta/pom.xml b/persistence/jdbc-common-jakarta/pom.xml deleted file mode 100644 index 392faa6cf7b..00000000000 --- a/persistence/jdbc-common-jakarta/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - 4.0.0 - - org.infinispan - infinispan-persistence-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-cachestore-jdbc-common-jakarta - Infinispan JDBC CacheStore Jakarta EE Common - Infinispan JDBC CacheStore Jakarta EE Common module - - - true - true - false - - - - - org.infinispan - infinispan-core-jakarta - ${project.version} - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - - org.infinispan.protostream - protostream-processor - - - - io.agroal - agroal-api - - - - io.agroal - agroal-pool - runtime - - - - org.kohsuke.metainf-services - metainf-services - - - - org.infinispan - infinispan-core - test-jar - test - - - org.infinispan - infinispan-commons - - - - - diff --git a/persistence/jdbc-common-jakarta/src/main/java/org/infinispan/persistence/jdbc/common/package-info.java b/persistence/jdbc-common-jakarta/src/main/java/org/infinispan/persistence/jdbc/common/package-info.java deleted file mode 100644 index a0060cb7329..00000000000 --- a/persistence/jdbc-common-jakarta/src/main/java/org/infinispan/persistence/jdbc/common/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan JDBC Commons using the Jakarta EE APIs. - */ -package org.infinispan.persistence.jdbc.common; diff --git a/persistence/jdbc-common/src/main/java/org/infinispan/persistence/jdbc/common/impl/BaseJdbcStore.java b/persistence/jdbc-common/src/main/java/org/infinispan/persistence/jdbc/common/impl/BaseJdbcStore.java index 84a86d2a3d2..e7f347c425b 100644 --- a/persistence/jdbc-common/src/main/java/org/infinispan/persistence/jdbc/common/impl/BaseJdbcStore.java +++ b/persistence/jdbc-common/src/main/java/org/infinispan/persistence/jdbc/common/impl/BaseJdbcStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.util.IntSet; import org.infinispan.commons.util.concurrent.CompletableFutures; diff --git a/persistence/jdbc-jakarta/jakarta.txt b/persistence/jdbc-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/persistence/jdbc-jakarta/pom.xml b/persistence/jdbc-jakarta/pom.xml deleted file mode 100644 index 32021e081e9..00000000000 --- a/persistence/jdbc-jakarta/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - org.infinispan - infinispan-persistence-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-cachestore-jdbc-jakarta - Infinispan JDBC CacheStore Jakarta EE - Infinispan JDBC CacheStore Jakarta EE module - - - true - true - false - - - - - org.infinispan - infinispan-core-jakarta - ${project.version} - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - - org.infinispan.protostream - protostream-processor - - - - org.infinispan - infinispan-cachestore-jdbc-common-jakarta - ${project.version} - - - - org.kohsuke.metainf-services - metainf-services - - - - org.infinispan - infinispan-core - test-jar - test - - - org.infinispan - infinispan-commons - - - - - diff --git a/persistence/jdbc-jakarta/src/main/java/org/infinispan/persistence/jdbc/package-info.java b/persistence/jdbc-jakarta/src/main/java/org/infinispan/persistence/jdbc/package-info.java deleted file mode 100644 index a3ef24e713f..00000000000 --- a/persistence/jdbc-jakarta/src/main/java/org/infinispan/persistence/jdbc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan JDBC using the Jakarta EE APIs. - */ -package org.infinispan.persistence.jdbc; diff --git a/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stores/TxStoreTest.java b/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stores/TxStoreTest.java index c8110b532dd..65b6cff78d4 100644 --- a/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stores/TxStoreTest.java +++ b/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stores/TxStoreTest.java @@ -1,6 +1,6 @@ package org.infinispan.persistence.jdbc.stores; -import static javax.transaction.Status.STATUS_ROLLEDBACK; +import static jakarta.transaction.Status.STATUS_ROLLEDBACK; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -9,9 +9,9 @@ import static org.mockito.Mockito.when; import static org.testng.AssertJUnit.assertEquals; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAException; import org.infinispan.Cache; diff --git a/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stringbased/JdbcStringBasedStoreTxFunctionalTest.java b/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stringbased/JdbcStringBasedStoreTxFunctionalTest.java index e3908580af1..399b5e1aa6c 100644 --- a/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stringbased/JdbcStringBasedStoreTxFunctionalTest.java +++ b/persistence/jdbc/src/test/java/org/infinispan/persistence/jdbc/stringbased/JdbcStringBasedStoreTxFunctionalTest.java @@ -5,9 +5,9 @@ import java.lang.reflect.Method; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.CacheConfigurationException; diff --git a/persistence/sql/src/test/java/org/infinispan/persistence/sql/AbstractSQLStoreFunctionalTest.java b/persistence/sql/src/test/java/org/infinispan/persistence/sql/AbstractSQLStoreFunctionalTest.java index f430b9cfe16..cb16a337bcd 100644 --- a/persistence/sql/src/test/java/org/infinispan/persistence/sql/AbstractSQLStoreFunctionalTest.java +++ b/persistence/sql/src/test/java/org/infinispan/persistence/sql/AbstractSQLStoreFunctionalTest.java @@ -22,9 +22,9 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.CacheConfigurationException; diff --git a/pom.xml b/pom.xml index 21c5f0dfc7e..d289025a362 100644 --- a/pom.xml +++ b/pom.xml @@ -80,24 +80,19 @@ commons-test build/infinispan-defaults-maven-plugin core - core-jakarta jboss-marshalling counter multimap tools - tools-jakarta query-dsl query-core query - query-jakarta object-filter remote-query/remote-query-client remote-query/remote-query-server persistence persistence/jdbc - persistence/jdbc-jakarta persistence/jdbc-common - persistence/jdbc-common-jakarta persistence/remote persistence/rocksdb persistence/sql @@ -105,7 +100,6 @@ server/core server/memcached server/hotrod - server/hotrod-jakarta server/resp server/rest server/router @@ -114,9 +108,7 @@ server/tests client/rest-client client/hotrod-client - client/hotrod-client-jakarta client/hotrod - client/hotrod-jakarta client/infinispan-key-value-store-hotrod archetypes all @@ -129,11 +121,8 @@ tasks/scripting cdi cdi/common - cdi/common-jakarta cdi/embedded - cdi/embedded-jakarta cdi/remote - cdi/remote-jakarta lock quarkus integrationtests @@ -305,7 +294,7 @@ 3.6.4 1.8.1 3.24.1 - 3.1.0 + 3.5.1 2.7 1.0.2 2.1.3 @@ -318,15 +307,17 @@ ${version.hibernate.core} ${version.jacoco} 3.29.1-GA - 2.0.1.Final + 3.0.2.Final ${version.arquillian} ${version.arquillian} + ${version.arquillian} + ${version.arquillian} ${version.byteman} ${version.byteman} ${version.byteman} ${version.byteman} 2.2.16.GA - 7.6.1.Final + 8.0.0.Final ${version.jboss.logging} 2.2.1.Final ${version.jboss.marshalling} @@ -336,7 +327,6 @@ ${version.jboss.naming} ${version.jboss.security} ${version.jboss.shrinkwrap} - ${version.jboss.shrinkwrap.descriptors} ${version.jboss.shrinkwrap.resolver} ${version.jboss.shrinkwrap.resolver} ${version.jboss.shrinkwrap.resolver} @@ -345,10 +335,10 @@ 2.0.0.Final 2.0.0.Final 1.0.1.Final - 2.3.3.Final - 3.1.2.Final - 3.1.2.Final - 3.1.SP1 + 3.5.0.Final + 5.1.0.Final + ${versionx.org.jboss.weld.se.weld-se-core} + 5.0.SP3 2.0.1.Final 2.0.2.Final ${version.jgroups} @@ -759,7 +749,7 @@ jakarta.transaction jakarta.transaction-api - ${version.jakarta.transaction.legacy} + ${version.jakarta.transaction} javax.activation @@ -1311,8 +1301,8 @@ org.jboss - jboss-transaction-spi-jakarta - ${versionx.org.jboss.jboss-transaction-spi-jakarta} + jboss-transaction-spi + ${versionx.org.jboss.jboss-transaction-spi} org.jboss.arquillian.container @@ -1331,6 +1321,18 @@ ${versionx.org.jboss.arquillian.testng.arquillian-testng-container} test + + org.jboss.arquillian.testenricher + arquillian-testenricher-cdi-jakarta + ${versionx.org.jboss.arquillian.testenricher.arquillian-testenricher-cdi} + test + + + org.jboss.arquillian.container + arquillian-container-spi + ${versionx.org.jboss.arquillian.container.arquillian-container-spi} + test + org.jboss.byteman byteman @@ -1401,12 +1403,6 @@ ${version.jboss.narayana} test - - org.jboss.narayana.jta - narayana-jta-jakarta - ${version.jboss.narayana} - test - org.jboss.security jboss-negotiation-extras @@ -1419,11 +1415,6 @@ pom test - - org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl-javaee - ${versionx.org.jboss.shrinkwrap.descriptors.shrinkwrap-descriptors-impl-javaee} - org.jboss.shrinkwrap.resolver shrinkwrap-resolver-api @@ -1942,7 +1933,7 @@ org.jboss - jboss-transaction-spi-jakarta + jboss-transaction-spi test diff --git a/quarkus/cli/pom.xml b/quarkus/cli/pom.xml index 09b8c0e00da..797454cd71a 100644 --- a/quarkus/cli/pom.xml +++ b/quarkus/cli/pom.xml @@ -89,7 +89,7 @@ io.quarkus quarkus-maven-plugin - ${quarkus.version} + ${version.quarkus} @@ -177,7 +177,7 @@ io.quarkus quarkus-maven-plugin - ${quarkus.version} + ${version.quarkus} org.codehaus.mojo diff --git a/quarkus/embedded/deployment/pom.xml b/quarkus/embedded/deployment/pom.xml index 55e77923647..ee0c7693074 100644 --- a/quarkus/embedded/deployment/pom.xml +++ b/quarkus/embedded/deployment/pom.xml @@ -55,7 +55,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + ${version.quarkus} diff --git a/quarkus/embedded/runtime/pom.xml b/quarkus/embedded/runtime/pom.xml index eff3e61af27..e4697b7d4a1 100644 --- a/quarkus/embedded/runtime/pom.xml +++ b/quarkus/embedded/runtime/pom.xml @@ -57,12 +57,6 @@ org.infinispan infinispan-core - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - org.jgroups @@ -82,8 +76,12 @@ jakarta.transaction-api - org.graalvm.nativeimage - svm + jakarta.enterprise + jakarta.enterprise.cdi-api + + + org.graalvm.sdk + graal-sdk @@ -91,8 +89,8 @@ io.quarkus - quarkus-bootstrap-maven-plugin - ${quarkus.version} + quarkus-extension-maven-plugin + ${version.quarkus} @@ -114,7 +112,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + ${version.quarkus} diff --git a/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanEmbeddedProducer.java b/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanEmbeddedProducer.java index 6ed8c7ef729..89e6b6cc2aa 100644 --- a/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanEmbeddedProducer.java +++ b/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanEmbeddedProducer.java @@ -4,10 +4,10 @@ import java.io.InputStream; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.infinispan.commons.CacheConfigurationException; import org.infinispan.commons.configuration.attributes.Attribute; import org.infinispan.commons.configuration.attributes.AttributeSet; diff --git a/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteCallerId.java b/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteCallerId.java index d7cfa7d7cd0..f6471ad5186 100644 --- a/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteCallerId.java +++ b/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteCallerId.java @@ -1,10 +1,10 @@ package org.infinispan.quarkus.embedded.runtime.graal; -import org.infinispan.Version; import org.infinispan.commons.jdkspecific.CallerId; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; +import org.infinispan.commons.util.Version; /** * Both variations using a security manager or using Reflection class require loading up JNI diff --git a/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteTransactionClasses.java b/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteTransactionClasses.java index ebdbbbf23d7..f489c78a609 100644 --- a/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteTransactionClasses.java +++ b/quarkus/embedded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteTransactionClasses.java @@ -1,8 +1,5 @@ package org.infinispan.quarkus.embedded.runtime.graal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; - import org.infinispan.commons.tx.lookup.TransactionManagerLookup; import org.infinispan.configuration.global.GlobalConfiguration; import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup; @@ -12,6 +9,9 @@ import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; + public class SubstituteTransactionClasses { } diff --git a/quarkus/integration-tests/embedded/pom.xml b/quarkus/integration-tests/embedded/pom.xml index 9195ff8ad7a..825c41d27f5 100644 --- a/quarkus/integration-tests/embedded/pom.xml +++ b/quarkus/integration-tests/embedded/pom.xml @@ -48,6 +48,15 @@ quarkus-narayana-jta + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + + jakarta.transaction + jakarta.transaction-api + diff --git a/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/EventListener.java b/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/EventListener.java index 51e920bc76d..50bac9c71a9 100644 --- a/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/EventListener.java +++ b/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/EventListener.java @@ -1,8 +1,8 @@ package org.infinispan.quarkus.embedded; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.infinispan.manager.EmbeddedCacheManager; diff --git a/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/TestServlet.java b/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/TestServlet.java index d8f1dd47e15..6a0ea743b5e 100644 --- a/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/TestServlet.java +++ b/quarkus/integration-tests/embedded/src/main/java/org/infinispan/quarkus/embedded/TestServlet.java @@ -7,15 +7,15 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; diff --git a/quarkus/integration-tests/embedded/src/test/java/org/infinispan/quarkus/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java b/quarkus/integration-tests/embedded/src/test/java/org/infinispan/quarkus/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java index 92179116002..db85cc840a7 100644 --- a/quarkus/integration-tests/embedded/src/test/java/org/infinispan/quarkus/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java +++ b/quarkus/integration-tests/embedded/src/test/java/org/infinispan/quarkus/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java @@ -1,13 +1,13 @@ package org.infinispan.quarkus.embedded; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; /** * @author William Burns */ @QuarkusTestResource(InfinispanEmbeddedTestResource.class) -@NativeImageTest +@QuarkusIntegrationTest public class InfinispanEmbeddedFunctionalityInGraalITCase extends InfinispanEmbeddedFunctionalityTest { } diff --git a/quarkus/integration-tests/pom.xml b/quarkus/integration-tests/pom.xml index 8344b423a7f..1f9ac5432ff 100644 --- a/quarkus/integration-tests/pom.xml +++ b/quarkus/integration-tests/pom.xml @@ -30,7 +30,7 @@ io.quarkus quarkus-maven-plugin - ${quarkus.version} + ${version.quarkus} true ${quarkus.build.skip} @@ -46,17 +46,17 @@ io.quarkus quarkus-integration-test-class-transformer-deployment - ${quarkus.version} + ${version.quarkus} io.quarkus quarkus-integration-test-class-transformer - ${quarkus.version} + ${version.quarkus} io.quarkus quarkus-platform-descriptor-json - ${quarkus.version} + ${version.quarkus} io.quarkus diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 555ae84d2a5..de63c20e344 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -18,15 +18,10 @@ 17 17 17 - 2.13.7.Final -Ob, ${native-build-args} - 2.9.3 - 1.20.1.Final - 1.7.0 - 3.4.3.Final diff --git a/quarkus/poms/bom-deployment/pom.xml b/quarkus/poms/bom-deployment/pom.xml index 809b01e523c..1febaaa88d8 100644 --- a/quarkus/poms/bom-deployment/pom.xml +++ b/quarkus/poms/bom-deployment/pom.xml @@ -31,7 +31,7 @@ io.quarkus quarkus-bom - ${quarkus.version} + ${version.quarkus} pom import diff --git a/quarkus/poms/bom/pom.xml b/quarkus/poms/bom/pom.xml index e708b761462..626d6764de9 100644 --- a/quarkus/poms/bom/pom.xml +++ b/quarkus/poms/bom/pom.xml @@ -30,7 +30,7 @@ io.quarkus quarkus-bom - ${quarkus.version} + ${version.quarkus} pom import diff --git a/quarkus/server-runner/pom.xml b/quarkus/server-runner/pom.xml index 24f273ee970..f0049d823a7 100644 --- a/quarkus/server-runner/pom.xml +++ b/quarkus/server-runner/pom.xml @@ -66,7 +66,7 @@ io.quarkus quarkus-maven-plugin - ${quarkus.version} + ${version.quarkus} diff --git a/quarkus/server/deployment/pom.xml b/quarkus/server/deployment/pom.xml index be1b99e2ad0..057e4880826 100644 --- a/quarkus/server/deployment/pom.xml +++ b/quarkus/server/deployment/pom.xml @@ -59,7 +59,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + ${version.quarkus} diff --git a/quarkus/server/runtime/pom.xml b/quarkus/server/runtime/pom.xml index 83f2b969132..035c41da8e3 100644 --- a/quarkus/server/runtime/pom.xml +++ b/quarkus/server/runtime/pom.xml @@ -196,8 +196,8 @@ - org.graalvm.nativeimage - svm + org.graalvm.sdk + graal-sdk @@ -216,8 +216,8 @@ io.quarkus - quarkus-bootstrap-maven-plugin - ${quarkus.version} + quarkus-extension-maven-plugin + ${version.quarkus} @@ -239,7 +239,7 @@ io.quarkus quarkus-extension-processor - ${quarkus.version} + ${version.quarkus} diff --git a/query-jakarta/jakarta.txt b/query-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/query-jakarta/pom.xml b/query-jakarta/pom.xml deleted file mode 100644 index 58e658ba164..00000000000 --- a/query-jakarta/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - - org.infinispan - infinispan-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-query-jakarta - Infinispan Query Jakarta EE - Infinispan Query Jakarta EE module - - - true - true - false - - - - - org.infinispan - infinispan-api - true - - - - org.infinispan - infinispan-core-jakarta - ${project.version} - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - - org.infinispan - infinispan-query-dsl - - - org.infinispan - infinispan-commons - - - - - - org.infinispan - infinispan-query-core - - - org.infinispan - infinispan-core - - - - - - org.infinispan - infinispan-objectfilter - - - - org.infinispan.protostream - protostream-processor - - - - org.infinispan - infinispan-clustered-lock - - - org.infinispan - infinispan-core - - - - - - org.hibernate.search - hibernate-search-v5migrationhelper-engine - - - - org.hibernate.search - hibernate-search-mapper-pojo-base - - - - org.hibernate.search - hibernate-search-backend-lucene - - - - org.kohsuke.metainf-services - metainf-services - - - - io.projectreactor.tools - blockhound - true - - - diff --git a/query-jakarta/src/main/java/org/infinispan/package-info.java b/query-jakarta/src/main/java/org/infinispan/package-info.java deleted file mode 100644 index a37647ff400..00000000000 --- a/query-jakarta/src/main/java/org/infinispan/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Query using the Jakarta EE APIs. - */ -package org.infinispan; diff --git a/query/src/main/java/org/infinispan/query/backend/TransactionHelper.java b/query/src/main/java/org/infinispan/query/backend/TransactionHelper.java index 03cdab518a7..27ac453fbc7 100644 --- a/query/src/main/java/org/infinispan/query/backend/TransactionHelper.java +++ b/query/src/main/java/org/infinispan/query/backend/TransactionHelper.java @@ -2,8 +2,8 @@ import static org.infinispan.query.logging.Log.CONTAINER; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; /** * Transaction related helper. Wraps a (possibly {@code null}) {@link TransactionManager} and performs transaction diff --git a/query/src/main/java/org/infinispan/query/logging/Log.java b/query/src/main/java/org/infinispan/query/logging/Log.java index 3aae1133fe8..3fa71f98814 100644 --- a/query/src/main/java/org/infinispan/query/logging/Log.java +++ b/query/src/main/java/org/infinispan/query/logging/Log.java @@ -5,7 +5,7 @@ import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.hibernate.search.util.common.SearchException; diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java index d4f8e21ea4c..bd8b6f86c65 100644 --- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java +++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java @@ -18,7 +18,7 @@ import java.util.function.Function; import java.util.function.Predicate; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.commons.util.CloseableIterator; diff --git a/query/src/test/java/org/infinispan/query/distributed/IndexManagerLocalTest.java b/query/src/test/java/org/infinispan/query/distributed/IndexManagerLocalTest.java index 1a29e9b6d15..6fad8a75109 100644 --- a/query/src/test/java/org/infinispan/query/distributed/IndexManagerLocalTest.java +++ b/query/src/test/java/org/infinispan/query/distributed/IndexManagerLocalTest.java @@ -3,7 +3,7 @@ import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP; import static org.testng.AssertJUnit.assertEquals; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ConfigurationBuilder; diff --git a/query/src/test/java/org/infinispan/query/tx/TransactionIsolationTest.java b/query/src/test/java/org/infinispan/query/tx/TransactionIsolationTest.java index 5486c47197f..3f2938773aa 100644 --- a/query/src/test/java/org/infinispan/query/tx/TransactionIsolationTest.java +++ b/query/src/test/java/org/infinispan/query/tx/TransactionIsolationTest.java @@ -10,8 +10,8 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.stream.IntStream; -import javax.transaction.RollbackException; -import javax.transaction.Transaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Transaction; import org.infinispan.Cache; import org.infinispan.commands.tx.PrepareCommand; diff --git a/server/hotrod-jakarta/jakarta.txt b/server/hotrod-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/server/hotrod-jakarta/pom.xml b/server/hotrod-jakarta/pom.xml deleted file mode 100644 index dd4bebdc11d..00000000000 --- a/server/hotrod-jakarta/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - 4.0.0 - - org.infinispan - infinispan-server-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-server-hotrod-jakarta - Infinispan Hot Rod Server Jakarta EE - Infinispan Hot Rod Server Jakarta EE - - - true - true - false - - - - - org.infinispan - infinispan-component-processor - - - org.infinispan - infinispan-server-core - - - org.infinispan.protostream - protostream - - - org.infinispan.protostream - protostream-types - - - io.projectreactor.tools - blockhound - true - - - org.kohsuke.metainf-services - metainf-services - - - - org.infinispan - infinispan-core-jakarta - ${project.version} - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - - org.infinispan - infinispan-tasks - - - org.infinispan - infinispan-core - - - - - - org.infinispan - infinispan-core - test-jar - test - - - org.infinispan - infinispan-commons - - - - - - org.infinispan - infinispan-remote-query-server - true - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - - - org.infinispan - infinispan-clustered-counter - - - org.infinispan - infinispan-core - - - - - org.infinispan - infinispan-multimap - - - org.infinispan - infinispan-core - - - - - diff --git a/server/hotrod-jakarta/src/main/java/org/infinispan/server/hotrod/package-info.java b/server/hotrod-jakarta/src/main/java/org/infinispan/server/hotrod/package-info.java deleted file mode 100644 index 0b09653a716..00000000000 --- a/server/hotrod-jakarta/src/main/java/org/infinispan/server/hotrod/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Hot Rod Server using the Jakarta EE APIs. - */ -package org.infinispan.server.hotrod; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/PrepareCoordinator.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/PrepareCoordinator.java index 9a3de98d38d..86fb287461d 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/PrepareCoordinator.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/PrepareCoordinator.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/CommitTransactionOperation.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/CommitTransactionOperation.java index 9b979531e0e..751bcb9081e 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/CommitTransactionOperation.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/CommitTransactionOperation.java @@ -7,10 +7,10 @@ import java.util.function.BiFunction; import javax.security.auth.Subject; -import javax.transaction.HeuristicCommitException; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; +import jakarta.transaction.HeuristicCommitException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/RollbackTransactionOperation.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/RollbackTransactionOperation.java index ae2e952949e..f7222c3a40b 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/RollbackTransactionOperation.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/RollbackTransactionOperation.java @@ -7,10 +7,10 @@ import java.util.function.BiFunction; import javax.security.auth.Subject; -import javax.transaction.HeuristicCommitException; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; +import jakarta.transaction.HeuristicCommitException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/Util.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/Util.java index 2002d578f2f..1e4c6911245 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/Util.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/operation/Util.java @@ -1,8 +1,8 @@ package org.infinispan.server.hotrod.tx.operation; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.AdvancedCache; import org.infinispan.commons.tx.XidImpl; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/GlobalTxTable.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/GlobalTxTable.java index 0cd53b9964b..afedd83f7f0 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/GlobalTxTable.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/GlobalTxTable.java @@ -12,9 +12,9 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; import org.infinispan.Cache; import org.infinispan.commands.tx.RollbackCommand; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/PerCacheTxTable.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/PerCacheTxTable.java index 7d3caf5b172..c6da390182e 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/PerCacheTxTable.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/PerCacheTxTable.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.infinispan.commons.logging.LogFactory; import org.infinispan.commons.tx.XidImpl; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/Status.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/Status.java index a218c85f435..f36298db2f8 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/Status.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/Status.java @@ -4,7 +4,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.server.hotrod.tx.table.functions.TxFunction; diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/functions/SetPreparedFunction.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/functions/SetPreparedFunction.java index 28200622a2e..1243b54f58f 100644 --- a/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/functions/SetPreparedFunction.java +++ b/server/hotrod/src/main/java/org/infinispan/server/hotrod/tx/table/functions/SetPreparedFunction.java @@ -10,7 +10,7 @@ import java.util.Collections; import java.util.Set; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.commons.marshall.AdvancedExternalizer; import org.infinispan.functional.EntryView; diff --git a/server/hotrod/src/test/java/org/infinispan/server/hotrod/tx/TxReaperAndRecoveryTest.java b/server/hotrod/src/test/java/org/infinispan/server/hotrod/tx/TxReaperAndRecoveryTest.java index bfc3e4757ca..27d80f402f9 100644 --- a/server/hotrod/src/test/java/org/infinispan/server/hotrod/tx/TxReaperAndRecoveryTest.java +++ b/server/hotrod/src/test/java/org/infinispan/server/hotrod/tx/TxReaperAndRecoveryTest.java @@ -21,8 +21,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; import org.infinispan.commands.ReplicableCommand; import org.infinispan.commands.tx.PrepareCommand; @@ -454,7 +454,7 @@ public void beforeCompletion() { @Override public void afterCompletion(int status) { - if (status == javax.transaction.Status.STATUS_COMMITTED) { + if (status == jakarta.transaction.Status.STATUS_COMMITTED) { queue.add("committed"); } else { queue.add("rolled_back"); diff --git a/server/tests/src/test/java/org/infinispan/server/functional/HotRodCompCacheOperationsIT.java b/server/tests/src/test/java/org/infinispan/server/functional/HotRodCompCacheOperationsIT.java index 2ff99ebd40e..60f2df1186d 100644 --- a/server/tests/src/test/java/org/infinispan/server/functional/HotRodCompCacheOperationsIT.java +++ b/server/tests/src/test/java/org/infinispan/server/functional/HotRodCompCacheOperationsIT.java @@ -6,7 +6,7 @@ import java.util.Collection; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/server/tests/src/test/java/org/infinispan/server/functional/HotRodTransactionalCacheOperations.java b/server/tests/src/test/java/org/infinispan/server/functional/HotRodTransactionalCacheOperations.java index c537e8c62c3..549af1e173a 100644 --- a/server/tests/src/test/java/org/infinispan/server/functional/HotRodTransactionalCacheOperations.java +++ b/server/tests/src/test/java/org/infinispan/server/functional/HotRodTransactionalCacheOperations.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; diff --git a/spring/spring-boot-3/embedded/pom.xml b/spring/spring-boot-3/embedded/pom.xml index e5770e5e357..5c708829a69 100644 --- a/spring/spring-boot-3/embedded/pom.xml +++ b/spring/spring-boot-3/embedded/pom.xml @@ -27,7 +27,7 @@ org.jboss.narayana.jta - narayana-jta-jakarta + narayana-jta jakarta.transaction @@ -41,7 +41,7 @@ org.infinispan - infinispan-core-jakarta + infinispan-core diff --git a/spring/spring-boot-3/tests/pom.xml b/spring/spring-boot-3/tests/pom.xml index 14c9fbcb0da..b9d98d35c93 100644 --- a/spring/spring-boot-3/tests/pom.xml +++ b/spring/spring-boot-3/tests/pom.xml @@ -52,7 +52,7 @@ org.infinispan - infinispan-server-hotrod-jakarta + infinispan-server-hotrod test diff --git a/spring/spring6/spring6-common/pom.xml b/spring/spring6/spring6-common/pom.xml index 2d056dbb5e6..9b3d706b753 100644 --- a/spring/spring6/spring6-common/pom.xml +++ b/spring/spring6/spring6-common/pom.xml @@ -34,7 +34,7 @@ org.infinispan - infinispan-commons-jakarta + infinispan-commons org.infinispan.protostream @@ -49,7 +49,7 @@ org.infinispan - infinispan-core-jakarta + infinispan-core test-jar test ${project.version} diff --git a/spring/spring6/spring6-embedded/pom.xml b/spring/spring6/spring6-embedded/pom.xml index c1aea9d35fd..c9b91aabdf5 100644 --- a/spring/spring6/spring6-embedded/pom.xml +++ b/spring/spring6/spring6-embedded/pom.xml @@ -41,7 +41,7 @@ org.infinispan - infinispan-core-jakarta + infinispan-core org.infinispan @@ -62,7 +62,7 @@ org.jboss.narayana.jta - narayana-jta-jakarta + narayana-jta @@ -91,7 +91,7 @@ org.infinispan - infinispan-core-jakarta + infinispan-core test-jar test ${project.version} @@ -110,7 +110,7 @@ org.infinispan - infinispan-server-hotrod-jakarta + infinispan-server-hotrod test diff --git a/spring/spring6/spring6-remote/pom.xml b/spring/spring6/spring6-remote/pom.xml index 597835e6b6b..7fd42bf1853 100644 --- a/spring/spring6/spring6-remote/pom.xml +++ b/spring/spring6/spring6-remote/pom.xml @@ -32,11 +32,11 @@ org.infinispan - infinispan-core-jakarta + infinispan-core org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod org.infinispan @@ -57,7 +57,7 @@ org.jboss.narayana.jta - narayana-jta-jakarta + narayana-jta @@ -84,7 +84,7 @@ org.infinispan - infinispan-core-jakarta + infinispan-core test-jar test ${project.version} @@ -97,7 +97,7 @@ org.infinispan - infinispan-server-hotrod-jakarta + infinispan-server-hotrod test diff --git a/tools-jakarta/jakarta.txt b/tools-jakarta/jakarta.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools-jakarta/pom.xml b/tools-jakarta/pom.xml deleted file mode 100644 index 340392c4c04..00000000000 --- a/tools-jakarta/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - - org.infinispan - infinispan-parent - 15.0.0-SNAPSHOT - ../pom.xml - - - infinispan-tools-jakarta - Infinispan Tools Jakarta EE - Infinispan - Jakarta EE Tools for project - - - true - true - false - - - - - org.infinispan.protostream - protostream-processor - - - - org.infinispan - infinispan-client-hotrod-jakarta - - - - org.infinispan - infinispan-cachestore-remote - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - org.infinispan - infinispan-client-hotrod - - - - - - org.infinispan - infinispan-cachestore-rocksdb - - - org.infinispan - infinispan-core - - - - - - org.infinispan - infinispan-core-jakarta - ${project.version} - - - - org.infinispan - infinispan-cachestore-jdbc-jakarta - ${project.version} - - - - org.infinispan - infinispan-query-jakarta - ${project.version} - provided - - - - org.infinispan - infinispan-jboss-marshalling - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - - - - jakarta.transaction - jakarta.transaction-api - ${version.jakarta.transaction} - - - diff --git a/tools-jakarta/src/main/java/org/infinispan/tools/package-info.java b/tools-jakarta/src/main/java/org/infinispan/tools/package-info.java deleted file mode 100644 index 45b3ee0b581..00000000000 --- a/tools-jakarta/src/main/java/org/infinispan/tools/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Version of Infinispan Tools using the Jakarta EE APIs. - */ -package org.infinispan.tools; diff --git a/tools/src/main/java/org/infinispan/tools/store/migrator/StoreMigrator.java b/tools/src/main/java/org/infinispan/tools/store/migrator/StoreMigrator.java index 4575e8a972e..6a9b33ff723 100644 --- a/tools/src/main/java/org/infinispan/tools/store/migrator/StoreMigrator.java +++ b/tools/src/main/java/org/infinispan/tools/store/migrator/StoreMigrator.java @@ -13,8 +13,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.infinispan.AdvancedCache; import org.infinispan.commons.io.ByteBufferImpl;