diff --git a/modules/spring-cache-ext/pom.xml b/modules/spring-cache-ext/pom.xml
index 47091fc41..c9f8ad6c9 100644
--- a/modules/spring-cache-ext/pom.xml
+++ b/modules/spring-cache-ext/pom.xml
@@ -33,7 +33,7 @@
ignite-spring-cache-ext
- 1.1.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
https://ignite.apache.org
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 71e9de7c9..a471f661f 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 2872fbc56..eed5db7cf 100644
--- a/modules/spring-data-ext/examples/pom.xml
+++ b/modules/spring-data-ext/examples/pom.xml
@@ -28,12 +28,12 @@
org.apache.ignite
ignite-spring-data-parent-ext
- 2.1.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
ignite-spring-data-ext-examples
- 2.1.0-SNAPSHOT
+ ${project.parent.version}
https://ignite.apache.org
@@ -59,19 +59,19 @@
org.springframework.data
spring-data-commons
- ${spring.data.version}
+ ${spring.data32.version}
org.springframework
spring-tx
- ${spring.version}
+ ${spring61.version}
org.springframework
spring-context
- ${spring.version}
+ ${spring61.version}
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 86613d1cf..2c6a73129 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 @@ private static void doSpringDataExample(Class> springAppCfg) {
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 750222e81..45f67e2a4 100644
--- a/modules/spring-data-ext/pom.xml
+++ b/modules/spring-data-ext/pom.xml
@@ -31,7 +31,7 @@
ignite-spring-data-parent-ext
pom
- 2.1.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
https://ignite.apache.org
diff --git a/modules/spring-data-ext/spring-data/pom.xml b/modules/spring-data-ext/spring-data/pom.xml
index c98ebfa8a..98aa9dbfa 100644
--- a/modules/spring-data-ext/spring-data/pom.xml
+++ b/modules/spring-data-ext/spring-data/pom.xml
@@ -28,12 +28,12 @@
org.apache.ignite
ignite-spring-data-parent-ext
- 2.1.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
ignite-spring-data-ext
- 2.1.0-SNAPSHOT
+ ${project.parent.version}
https://ignite.apache.org
@@ -59,21 +59,21 @@
org.springframework
spring-context
- ${spring.version}
+ ${spring61.version}
provided
org.springframework
spring-tx
- ${spring.version}
+ ${spring61.version}
provided
org.springframework.data
spring-data-commons
- ${spring.data.version}
+ ${spring.data32.version}
provided
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 f6f1c3fd1..bb2948490 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 @@ private void fillInRepository() {
/** {@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 19a9f63b5..8d4202a31 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 5549208b2..b79e4d9b7 100644
--- a/modules/spring-tx-ext/examples/pom.xml
+++ b/modules/spring-tx-ext/examples/pom.xml
@@ -28,7 +28,7 @@
org.apache.ignite
ignite-spring-tx-parent-ext
- 1.1.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../pom.xml
@@ -69,19 +69,19 @@
org.springframework
spring-context
- ${spring.version}
+ ${spring61.version}
org.springframework
spring-jdbc
- ${spring.version}
+ ${spring61.version}
org.springframework
spring-tx
- ${spring.version}
+ ${spring61.version}
diff --git a/modules/spring-tx-ext/pom.xml b/modules/spring-tx-ext/pom.xml
index 557edc737..a44dd7c02 100644
--- a/modules/spring-tx-ext/pom.xml
+++ b/modules/spring-tx-ext/pom.xml
@@ -31,11 +31,12 @@
ignite-spring-tx-parent-ext
pom
- 1.1.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
https://ignite.apache.org
+ 17
1.4.8
diff --git a/modules/spring-tx-ext/spring-tx/pom.xml b/modules/spring-tx-ext/spring-tx/pom.xml
index 4adf4e3c8..70d1781b2 100644
--- a/modules/spring-tx-ext/spring-tx/pom.xml
+++ b/modules/spring-tx-ext/spring-tx/pom.xml
@@ -28,7 +28,7 @@
org.apache.ignite
ignite-spring-tx-parent-ext
- 1.1.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../pom.xml
@@ -57,21 +57,21 @@
org.springframework
spring-context
- ${spring.version}
+ ${spring61.version}
provided
org.springframework
spring-tx
- ${spring.version}
+ ${spring61.version}
provided
org.springframework
spring-jdbc
- ${spring.version}
+ ${spring61.version}
true
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 82e0e16fe..54d4e9dd8 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 bd2d1e17f..05a3714db 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -37,6 +37,7 @@
2.2.13.RELEASE
2.2.13.RELEASE
+ 3.2.5
5.3.19
6.1.6
diff --git a/pom.xml b/pom.xml
index 33710bdbe..4be968828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,11 +42,8 @@
modules/camel-ext
modules/jms11-ext
modules/kafka-ext
- modules/spring-data-ext
modules/spring-data-commons
modules/performance-statistics-ext
- modules/spring-tx-ext
- modules/spring-cache-ext
modules/cdc-ext
modules/aws-ext
modules/azure-ext
@@ -80,6 +77,9 @@
modules/spring-session-ext
+ modules/spring-cache-ext
+ modules/spring-data-ext
+ modules/spring-tx-ext