From 72941de98a4af415b510d380bf765f999d2463e5 Mon Sep 17 00:00:00 2001 From: Aleksandr Nikolaev <> Date: Mon, 22 Jun 2026 18:33:56 +0300 Subject: [PATCH] IGNITE-28588 update Spring --- checkstyle/checkstyle.xml | 2 +- .../misc/springbean/SpringBeanExample.java | 2 +- modules/calcite/pom.xml | 6 ++++++ .../ignite/internal/IgniteComponentType.java | 4 ++-- .../uri/tasks/GarHelloWorldTask.java | 7 ++++--- .../uri/tasks/GridUriDeploymentTestTask1.java | 7 +++++-- .../uri/tasks/GridUriDeploymentTestTask2.java | 6 ++++-- .../uri/tasks/GridUriDeploymentTestTask9.java | 6 ++++-- modules/jta/pom.xml | 12 +++++++++--- .../apache/ignite/cache/jta/CacheTmLookup.java | 2 +- .../cache/jta/jndi/CacheJndiTmFactory.java | 2 +- .../cache/jta/jndi/CacheJndiTmLookup.java | 2 +- .../jta/reflect/CacheReflectionTmLookup.java | 2 +- .../websphere/WebSphereLibertyTmFactory.java | 2 +- .../jta/websphere/WebSphereTmFactory.java | 18 +++++++++--------- .../processors/cache/jta/CacheJtaManager.java | 8 ++++---- .../processors/cache/jta/CacheJtaResource.java | 4 ++-- .../cache/CacheJndiTmFactorySelfTest.java | 16 ++++++++-------- ...acheJtaConfigurationValidationSelfTest.java | 2 +- ...acheJtaFactoryConfigValidationSelfTest.java | 2 +- .../cache/GridJtaLifecycleAwareSelfTest.java | 2 +- .../GridJtaTransactionManagerSelfTest.java | 4 ++-- .../cache/jta/AbstractCacheJtaSelfTest.java | 4 ++-- ...GridPartitionedCacheJtaFactorySelfTest.java | 2 +- ...itionedCacheJtaLookupClassNameSelfTest.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 6 +++--- .../GridResourceSpringBeanInjector.java | 6 +++--- .../GridResourceProcessorSelfTest.java | 2 +- .../uri/GridUriDeploymentSpringDocument.java | 6 +++--- .../uri/GridUriDeploymentSpringParser.java | 10 ++++++---- modules/web/ignite-websphere-test/pom.xml | 12 ++++++++++++ .../ignite/webtest/TestJtaTxServlet.java | 6 +++--- .../cache/websession/WebSessionFilter.java | 8 ++++---- parent/pom.xml | 14 +++++++++++++- 34 files changed, 121 insertions(+), 75 deletions(-) diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index d1423237dadf6..7bb56603bc603 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -64,7 +64,7 @@ - + diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java index 66b22fa8681a9..53f6a6999e4dd 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java @@ -83,7 +83,7 @@ public static void main(String[] args) throws Exception { } finally { // Stop local cluster node. - ctx.destroy(); + ctx.close(); } } } diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml index 945451239f846..e038a07db73e5 100644 --- a/modules/calcite/pom.xml +++ b/modules/calcite/pom.xml @@ -69,6 +69,12 @@ org.apache.calcite calcite-core ${calcite.version} + + + jakarta.transaction + jakarta.transaction-api + + diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java index 8e9e483af45ef..6a895088bf711 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java @@ -208,7 +208,7 @@ public T createIfInClassPath(GridKernalContext ctx, boolean mandatory) try { Class.forName(cls); } - catch (ClassNotFoundException e) { + catch (ClassNotFoundException | LinkageError e) { if (mandatory) throw componentException(e); @@ -263,7 +263,7 @@ private T createOptional0(@Nullable GridKernalContext ctx) throws IgniteChec try { cls = Class.forName(clsName); } - catch (ClassNotFoundException ignored) { + catch (ClassNotFoundException | LinkageError ignored) { try { cls = Class.forName(noOpClsName); } diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java index df71641a54255..1bcb94160f011 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java @@ -29,8 +29,8 @@ import org.apache.ignite.compute.ComputeTaskName; import org.apache.ignite.compute.ComputeTaskSplitAdapter; import org.jetbrains.annotations.Nullable; -import org.springframework.beans.factory.support.AbstractBeanFactory; -import org.springframework.beans.factory.xml.XmlBeanFactory; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ClassPathResource; /** @@ -43,7 +43,8 @@ public class GarHelloWorldTask extends ComputeTaskSplitAdapter { /** {@inheritDoc} */ @Override public Collection split(int gridSize, String arg) throws IgniteException { // Create Spring context. - AbstractBeanFactory fac = new XmlBeanFactory( + DefaultListableBeanFactory fac = new DefaultListableBeanFactory(); + new XmlBeanDefinitionReader(fac).loadBeanDefinitions( new ClassPathResource("org/apache/ignite/spi/deployment/uri/tasks/gar-spring-bean.xml", getClass().getClassLoader())); fac.setBeanClassLoader(getClass().getClassLoader()); diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java index d95c411e74c23..1348d7f8066ba 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java @@ -23,7 +23,8 @@ import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeTaskSplitAdapter; -import org.springframework.beans.factory.xml.XmlBeanFactory; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ClassPathResource; /** @@ -32,7 +33,9 @@ public class GridUriDeploymentTestTask1 extends ComputeTaskSplitAdapter { /** */ public GridUriDeploymentTestTask1() { - XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("spring1.xml", getClass().getClassLoader())); + DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); + new XmlBeanDefinitionReader(factory).loadBeanDefinitions( + new ClassPathResource("spring1.xml", getClass().getClassLoader())); factory.setBeanClassLoader(getClass().getClassLoader()); diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java index 1325efd17aa6e..cf661982b4a0e 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java @@ -23,7 +23,8 @@ import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeTaskSplitAdapter; -import org.springframework.beans.factory.xml.XmlBeanFactory; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ClassPathResource; /** @@ -35,7 +36,8 @@ public class GridUriDeploymentTestTask2 extends ComputeTaskSplitAdapterhttp://ignite.apache.org + + + + true + + ${project.groupId} @@ -41,9 +47,9 @@ - javax.transaction - jta - 1.1 + jakarta.transaction + jakarta.transaction-api + 2.0.1 diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java index 7f973848a8417..8a0659e2a9cf0 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java @@ -17,7 +17,7 @@ package org.apache.ignite.cache.jta; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.ignite.IgniteException; import org.apache.ignite.configuration.TransactionConfiguration; import org.jetbrains.annotations.Nullable; diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmFactory.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmFactory.java index 10f3f86c77960..b6c778c7ba641 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmFactory.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmFactory.java @@ -20,10 +20,10 @@ import java.util.Arrays; import java.util.Hashtable; import java.util.Map; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.util.typedef.internal.U; diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java index dfd8b5e3cca65..db01b36d48440 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java @@ -18,9 +18,9 @@ package org.apache.ignite.cache.jta.jndi; import java.util.List; +import jakarta.transaction.TransactionManager; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.jta.CacheTmLookup; import org.jetbrains.annotations.Nullable; diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java index 25b06de220152..96cf03de0d61a 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.jta.reflect; import java.lang.reflect.InvocationTargetException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.jta.CacheTmLookup; import org.apache.ignite.internal.util.typedef.internal.A; diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereLibertyTmFactory.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereLibertyTmFactory.java index aa579ade02f99..581078a97e2a5 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereLibertyTmFactory.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereLibertyTmFactory.java @@ -18,8 +18,8 @@ package org.apache.ignite.cache.jta.websphere; import java.lang.reflect.InvocationTargetException; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.TransactionManager; import org.apache.ignite.IgniteException; /** diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereTmFactory.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereTmFactory.java index 85886df7eed0c..7276e12932fc6 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereTmFactory.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/websphere/WebSphereTmFactory.java @@ -21,16 +21,16 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.apache.ignite.IgniteException; diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index b98a7f8b006b4..854773ad259cf 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -18,11 +18,11 @@ package org.apache.ignite.internal.processors.cache.jta; import java.util.concurrent.atomic.AtomicReference; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.jta.CacheTmLookup; import org.apache.ignite.configuration.CacheConfiguration; diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaResource.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaResource.java index 5b1b37a15db5f..81edfc40833d4 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaResource.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaResource.java @@ -18,9 +18,9 @@ package org.apache.ignite.internal.processors.cache.jta; import java.util.concurrent.atomic.AtomicReference; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; import javax.cache.CacheException; -import javax.transaction.Status; -import javax.transaction.Synchronization; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java index f3781d4af58e3..8f3ba7014403e 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java @@ -18,16 +18,16 @@ package org.apache.ignite.internal.processors.cache; import java.util.concurrent.Callable; +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 javax.naming.Context; import javax.naming.InitialContext; -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 org.apache.ignite.IgniteException; import org.apache.ignite.cache.jta.jndi.CacheJndiTmFactory; import org.apache.ignite.testframework.GridTestUtils; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java index db41a0cd4e7e8..c79578918361c 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.concurrent.Callable; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.jta.CacheTmLookup; import org.apache.ignite.configuration.CacheConfiguration; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java index ffb08e7da9145..e7617f531bc0c 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.processors.cache; import java.util.concurrent.Callable; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.TransactionManager; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java index 695e9953298d6..c655cfaebe2c7 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.cache; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.TransactionManager; import org.apache.ignite.Ignite; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.jta.CacheTmLookup; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java index e85d196880f75..ecace1bbd0d8b 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java @@ -19,9 +19,9 @@ import java.util.Arrays; import java.util.Collection; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java index 8fb9f1e7b6c62..d6e3971dca60a 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java @@ -19,8 +19,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java index ec9f8e8761def..0324e9bb74236 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.cache.jta; +import jakarta.transaction.TransactionManager; import javax.cache.configuration.Factory; -import javax.transaction.TransactionManager; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaLookupClassNameSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaLookupClassNameSelfTest.java index 573a543318988..979f42c82ff75 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaLookupClassNameSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaLookupClassNameSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.jta; import java.util.concurrent.Callable; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.jta.CacheTmLookup; diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index dcb5d1d6e4bf5..6e1948bcf9500 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@ -31,13 +31,13 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.InjectableValues; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.InjectableValues; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java index 876e79fc09313..9013730063643 100644 --- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java +++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.context.ApplicationContext; -import org.springframework.util.StringUtils; +import org.springframework.util.ObjectUtils; /** * Spring bean injector implementation works with resources provided @@ -111,7 +111,7 @@ private Object getBeanByResourceAnnotation(SpringResource annotation) throws Ign String beanName = annotation.resourceName(); Class beanCls = annotation.resourceClass(); - boolean oneParamSet = !StringUtils.isEmpty(beanName) ^ beanCls != SpringResource.DEFAULT.class; + boolean oneParamSet = !ObjectUtils.isEmpty(beanName) ^ beanCls != SpringResource.DEFAULT.class; if (!oneParamSet) { throw new IgniteCheckedException("Either bean name or its class must be specified in @SpringResource, " + @@ -119,7 +119,7 @@ private Object getBeanByResourceAnnotation(SpringResource annotation) throws Ign } try { - return !StringUtils.isEmpty(beanName) ? springCtx.getBean(beanName) : springCtx.getBean(beanCls); + return !ObjectUtils.isEmpty(beanName) ? springCtx.getBean(beanName) : springCtx.getBean(beanCls); } catch (NoUniqueBeanDefinitionException e) { throw e; diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java index e6739b07d9eec..753c693ea87e0 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java @@ -403,7 +403,7 @@ public void testInjectResourceGridTaskAndJob() throws Exception { try { // Should not be null if task has been completed successfully (meaning all resources have been injected). - Assert.notNull(g.compute().execute(TestTask.class, null)); + Assert.notNull(g.compute().execute(TestTask.class, null), "must not be null"); } finally { stopGrid(); diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringDocument.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringDocument.java index 0143537c52258..0a3159013515a 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringDocument.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringDocument.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.IgniteSpiException; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.xml.XmlBeanFactory; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; /** * Helper class which helps to read deployer and tasks information from @@ -32,7 +32,7 @@ */ class GridUriDeploymentSpringDocument { /** Initialized springs beans factory. */ - private final XmlBeanFactory factory; + private final DefaultListableBeanFactory factory; /** List of tasks from package description. */ private List>> tasks; @@ -42,7 +42,7 @@ class GridUriDeploymentSpringDocument { * * @param factory Configuration factory. */ - GridUriDeploymentSpringDocument(XmlBeanFactory factory) { + GridUriDeploymentSpringDocument(DefaultListableBeanFactory factory) { assert factory != null; this.factory = factory; diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringParser.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringParser.java index 842a8cf9be07c..f62ce2a146a33 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringParser.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpringParser.java @@ -24,7 +24,8 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.IgniteSpiException; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.xml.XmlBeanFactory; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; @@ -52,8 +53,8 @@ private GridUriDeploymentSpringParser() { * @param log Logger * @return Grid wrapper for the input stream. * @throws org.apache.ignite.spi.IgniteSpiException Thrown if incoming input stream could not be - * read or parsed by {@code Spring} {@link XmlBeanFactory}. - * @see XmlBeanFactory + * read or parsed by {@code Spring} {@link DefaultListableBeanFactory}. + * @see DefaultListableBeanFactory */ static GridUriDeploymentSpringDocument parseTasksDocument(InputStream in, IgniteLogger log) throws IgniteSpiException { @@ -65,7 +66,8 @@ static GridUriDeploymentSpringDocument parseTasksDocument(InputStream in, Ignite try { U.copy(in, out); - XmlBeanFactory factory = new XmlBeanFactory(new ByteArrayResource(out.toByteArray())); + DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); + new XmlBeanDefinitionReader(factory).loadBeanDefinitions(new ByteArrayResource(out.toByteArray())); return new GridUriDeploymentSpringDocument(factory); } diff --git a/modules/web/ignite-websphere-test/pom.xml b/modules/web/ignite-websphere-test/pom.xml index 84dad0d4b6cff..859531decb414 100644 --- a/modules/web/ignite-websphere-test/pom.xml +++ b/modules/web/ignite-websphere-test/pom.xml @@ -33,6 +33,12 @@ http://ignite.apache.org + + + true + true + + ${project.groupId} @@ -50,6 +56,12 @@ com.ibm.websphere.appserver.api.transaction 1.1.113 + + + jakarta.transaction + jakarta.transaction-api + 2.0.1 + diff --git a/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java b/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java index e7f33aa3fc31e..c0559a2da0946 100644 --- a/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java +++ b/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.transaction.RollbackException; -import javax.transaction.TransactionManager; -import com.ibm.tx.jta.TransactionManagerFactory; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import jakarta.transaction.RollbackException; +import jakarta.transaction.TransactionManager; +import com.ibm.tx.jta.TransactionManagerFactory; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.Ignition; diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java index adbbc18690e54..cc24077eb07e5 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java @@ -21,10 +21,6 @@ import java.util.Collection; import java.util.Map; import java.util.Objects; -import javax.cache.CacheException; -import javax.cache.expiry.Duration; -import javax.cache.expiry.ExpiryPolicy; -import javax.cache.expiry.ModifiedExpiryPolicy; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; import jakarta.servlet.FilterConfig; @@ -35,6 +31,10 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; import jakarta.servlet.http.HttpSession; +import javax.cache.CacheException; +import javax.cache.expiry.Duration; +import javax.cache.expiry.ExpiryPolicy; +import javax.cache.expiry.ModifiedExpiryPolicy; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteClientDisconnectedException; diff --git a/parent/pom.xml b/parent/pom.xml index 5249ea65a3f0f..9939cf352861f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -107,7 +107,7 @@ 42.7.3 2.0.17 1.1.10.7 - 5.3.39 + 6.2.19 3.5.6 10.0.27 0.8.3 @@ -683,6 +683,18 @@ [3.9.6,) + + + javax.transaction:jta + javax.transaction:javax.transaction-api + jakarta.transaction:jakarta.transaction-api:(,2.0.0) + + + Use jakarta.transaction:jakarta.transaction-api:2.0.1+ only. + Add <exclusions> to the transitive source if this fails. + + +