This is an automated email from the ASF dual-hosted git repository.
anovikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 51403ae5 IGNITE-22102 Upgrade spring extensions to Spring 6 (#269)
51403ae5 is described below
commit 51403ae5236ed9a5e6b521d26a9b34588c20dd91
Author: Nusrat Shakarov <[email protected]>
AuthorDate: Tue May 28 05:43:38 2024 +0200
IGNITE-22102 Upgrade spring extensions to Spring 6 (#269)
---
modules/spring-cache-ext/pom.xml | 2 +-
.../cache/spring/IgniteSpringCacheCompatibilityTest.java | 4 +++-
modules/spring-data-ext/examples/pom.xml | 10 +++++-----
.../apache/ignite/springdata/examples/SpringDataExample.java | 2 +-
modules/spring-data-ext/pom.xml | 2 +-
modules/spring-data-ext/spring-data/pom.xml | 10 +++++-----
.../apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java | 2 +-
.../ignite/springdata/IgniteSpringDataQueriesSelfTest.java | 2 +-
modules/spring-tx-ext/examples/pom.xml | 8 ++++----
modules/spring-tx-ext/pom.xml | 3 ++-
modules/spring-tx-ext/spring-tx/pom.xml | 8 ++++----
.../spring/IgniteSpringTransactionsCompatibilityTest.java | 4 +++-
parent-internal/pom.xml | 1 +
pom.xml | 6 +++---
14 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/modules/spring-cache-ext/pom.xml b/modules/spring-cache-ext/pom.xml
index 47091fc4..c9f8ad6c 100644
--- a/modules/spring-cache-ext/pom.xml
+++ b/modules/spring-cache-ext/pom.xml
@@ -33,7 +33,7 @@
</parent>
<artifactId>ignite-spring-cache-ext</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>https://ignite.apache.org</url>
<properties>
diff --git
a/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/IgniteSpringCacheCompatibilityTest.java
b/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/IgniteSpringCacheCompatibilityTest.java
index 71e9de7c..a471f661 100644
---
a/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/IgniteSpringCacheCompatibilityTest.java
+++
b/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/IgniteSpringCacheCompatibilityTest.java
@@ -61,7 +61,9 @@ public class IgniteSpringCacheCompatibilityTest extends
IgniteCompatibilityAbstr
"5.0.0.RELEASE",
"5.1.0.RELEASE",
"5.2.0.RELEASE",
- "5.3.0"
+ "5.3.0",
+ "6.0.0",
+ "6.1.0"
);
/** */
diff --git a/modules/spring-data-ext/examples/pom.xml
b/modules/spring-data-ext/examples/pom.xml
index 2872fbc5..eed5db7c 100644
--- a/modules/spring-data-ext/examples/pom.xml
+++ b/modules/spring-data-ext/examples/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring-data-parent-ext</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>ignite-spring-data-ext-examples</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.parent.version}</version>
<url>https://ignite.apache.org</url>
@@ -59,19 +59,19 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
- <version>${spring.data.version}</version>
+ <version>${spring.data32.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
</dependency>
<dependency>
diff --git
a/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringDataExample.java
b/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringDataExample.java
index 86613d1c..2c6a7312 100644
---
a/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringDataExample.java
+++
b/modules/spring-data-ext/examples/src/main/java/org/apache/ignite/springdata/examples/SpringDataExample.java
@@ -86,7 +86,7 @@ public class SpringDataExample {
System.out.println("\n>>> Repository size: " + repo.count());
// Destroying the context.
- ctx.destroy();
+ ctx.close();
}
/**
diff --git a/modules/spring-data-ext/pom.xml b/modules/spring-data-ext/pom.xml
index 750222e8..45f67e2a 100644
--- a/modules/spring-data-ext/pom.xml
+++ b/modules/spring-data-ext/pom.xml
@@ -31,7 +31,7 @@
<artifactId>ignite-spring-data-parent-ext</artifactId>
<packaging>pom</packaging>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<url>https://ignite.apache.org</url>
diff --git a/modules/spring-data-ext/spring-data/pom.xml
b/modules/spring-data-ext/spring-data/pom.xml
index c98ebfa8..98aa9dbf 100644
--- a/modules/spring-data-ext/spring-data/pom.xml
+++ b/modules/spring-data-ext/spring-data/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring-data-parent-ext</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>ignite-spring-data-ext</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.parent.version}</version>
<url>https://ignite.apache.org</url>
@@ -59,21 +59,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
- <version>${spring.data.version}</version>
+ <version>${spring.data32.version}</version>
<scope>provided</scope>
<!-- Exclude slf4j logging in favor of log4j -->
<exclusions>
diff --git
a/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
b/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
index f6f1c3fd..bb294849 100644
---
a/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
+++
b/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
@@ -95,7 +95,7 @@ public class IgniteSpringDataCrudSelfTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- ctx.destroy();
+ ctx.close();
}
/** */
diff --git
a/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
b/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
index 19a9f63b..8d4202a3 100644
---
a/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
+++
b/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
@@ -87,7 +87,7 @@ public class IgniteSpringDataQueriesSelfTest extends
GridCommonAbstractTest {
* Performs context destroy after tests.
*/
@Override protected void afterTestsStopped() throws Exception {
- ctx.destroy();
+ ctx.close();
}
/** */
diff --git a/modules/spring-tx-ext/examples/pom.xml
b/modules/spring-tx-ext/examples/pom.xml
index 5549208b..b79e4d9b 100644
--- a/modules/spring-tx-ext/examples/pom.xml
+++ b/modules/spring-tx-ext/examples/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring-tx-parent-ext</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -69,19 +69,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
</dependency>
<dependency>
diff --git a/modules/spring-tx-ext/pom.xml b/modules/spring-tx-ext/pom.xml
index 557edc73..a44dd7c0 100644
--- a/modules/spring-tx-ext/pom.xml
+++ b/modules/spring-tx-ext/pom.xml
@@ -31,11 +31,12 @@
<artifactId>ignite-spring-tx-parent-ext</artifactId>
<packaging>pom</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>https://ignite.apache.org</url>
<properties>
+ <maven.compiler.release>17</maven.compiler.release>
<xstream.version>1.4.8</xstream.version>
</properties>
diff --git a/modules/spring-tx-ext/spring-tx/pom.xml
b/modules/spring-tx-ext/spring-tx/pom.xml
index 4adf4e3c..70d1781b 100644
--- a/modules/spring-tx-ext/spring-tx/pom.xml
+++ b/modules/spring-tx-ext/spring-tx/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring-tx-parent-ext</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -57,21 +57,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <version>${spring61.version}</version>
<optional>true</optional>
</dependency>
diff --git
a/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/transactions/spring/IgniteSpringTransactionsCompatibilityTest.java
b/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/transactions/spring/IgniteSpringTransactionsCompatibilityTest.java
index 82e0e16f..54d4e9dd 100644
---
a/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/transactions/spring/IgniteSpringTransactionsCompatibilityTest.java
+++
b/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/transactions/spring/IgniteSpringTransactionsCompatibilityTest.java
@@ -64,7 +64,9 @@ public class IgniteSpringTransactionsCompatibilityTest
extends IgniteCompatibili
"5.0.0.RELEASE",
"5.1.0.RELEASE",
"5.2.0.RELEASE",
- "5.3.0"
+ "5.3.0",
+ "6.0.0",
+ "6.1.0"
);
/** */
diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
index bd2d1e17..05a3714d 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -37,6 +37,7 @@
<properties>
<spring-boot.version>2.2.13.RELEASE</spring-boot.version>
<spring.data.version>2.2.13.RELEASE</spring.data.version>
+ <spring.data32.version>3.2.5</spring.data32.version>
<spring53.version>5.3.19</spring53.version>
<spring61.version>6.1.6</spring61.version>
diff --git a/pom.xml b/pom.xml
index 33710bdb..4be96882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,11 +42,8 @@
<module>modules/camel-ext</module>
<module>modules/jms11-ext</module>
<module>modules/kafka-ext</module>
- <module>modules/spring-data-ext</module>
<module>modules/spring-data-commons</module>
<module>modules/performance-statistics-ext</module>
- <module>modules/spring-tx-ext</module>
- <module>modules/spring-cache-ext</module>
<module>modules/cdc-ext</module>
<module>modules/aws-ext</module>
<module>modules/azure-ext</module>
@@ -80,6 +77,9 @@
</activation>
<modules>
<module>modules/spring-session-ext</module>
+ <module>modules/spring-cache-ext</module>
+ <module>modules/spring-data-ext</module>
+ <module>modules/spring-tx-ext</module>
</modules>
</profile>
</profiles>
