IGNITE-22102 Upgrade spring extensions to Spring 6 (#269)

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>

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"
     );
 
     /** */

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>

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();
     }
 
     /**

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>
 

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>

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();
     }
 
     /** */

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();
     }
 
     /** */

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>

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>
 

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>
 

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"
     );
 
     /** */

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>
 

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>