IGNITE-22317 Update version of the released ignite-spring-data, ignit…

…e-spring-session, ignite-spring-cache and ignite-spring-tx extensions.
apache · Jul 1, 2024 · 49cec55 · 49cec55
1 parent 1aa52cf
commit 49cec55
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 4 deletions.
diff --git a/.github/workflows/prepare-rc.yml b/.github/workflows/prepare-rc.yml
@@ -39,7 +39,7 @@ jobs:
     steps:
       - name: Validate Extension Release Branch
         id: check
-        run: | 
+        run: |
           prefix='false'
           [[ ${{ github.ref_name }} =~ ^release/ ]] && prefix='true'
           echo "::set-output name=isReleaseBranch::${prefix}"
@@ -82,7 +82,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'adopt'
 
       - name: Extract POM Version and Compare With Branch Version
@@ -136,7 +136,7 @@ jobs:
       - name: Build Java and Prepare Packages
         run: |
           cd ${{ env.GIT_HOME }}/${{ env.EXTENSION_DIR }}
-          mvn deploy -am -DskipTests -Pextension-release -DuniqueVersion=false ${toLocalRepo} 
+          mvn deploy -am -DskipTests -Pextension-release -DuniqueVersion=false ${toLocalRepo}
           cd -
         env:
           toLocalRepo: '-D altDeploymentRepository=local::default::file:${{ env.EXTENSION_DIST }}/maven'

diff --git a/.github/workflows/release-checker.yml b/.github/workflows/release-checker.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'adopt'
 
       - name: Extract Branch POM Version and Compare

diff --git a/modules/spring-cache-ext/RELEASE_NOTES.txt b/modules/spring-cache-ext/RELEASE_NOTES.txt
@@ -1,6 +1,11 @@
 Apache Ignite Extensions Release Notes
 ===========================
 
+Apache Ignite Spring Cache Module 2.0.0
+--------------------------------------
+
+* Add Spring 6 support.
+
 Apache Ignite Spring Cache Module 1.0.0
 ---------------------------------------
 

diff --git a/modules/spring-cache-ext/pom.xml b/modules/spring-cache-ext/pom.xml
@@ -131,6 +131,13 @@
                     <forkCount>1</forkCount>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
 
         <testResources>

diff --git a/modules/spring-data-ext/spring-data/RELEASE_NOTES.txt b/modules/spring-data-ext/spring-data/RELEASE_NOTES.txt
@@ -1,6 +1,11 @@
 Apache Ignite Extensions Release Notes
 ======================================
 
+Apache Ignite Spring Data Module 3.0.0
+--------------------------------------
+
+* Add Spring 6 support.
+
 Apache Ignite Spring Data Module 2.0.0
 --------------------------------------
 

diff --git a/modules/spring-session-ext/RELEASE_NOTES.txt b/modules/spring-session-ext/RELEASE_NOTES.txt
@@ -1,6 +1,12 @@
 Apache Ignite Extensions Release Notes
 ======================================
 
+Apache Ignite Spring Session Module 2.0.0
+--------------------------------------
+
+* Add Spring 6 support.
+* Fixed StackOverflow error during IgniteSession serialization.
+
 Apache Ignite Spring Session Module 1.0.0
 -----------------------------------------
 

diff --git a/modules/spring-tx-ext/spring-tx/RELEASE_NOTES.txt b/modules/spring-tx-ext/spring-tx/RELEASE_NOTES.txt
@@ -1,6 +1,11 @@
 Apache Ignite Extensions Release Notes
 ======================================
 
+Apache Ignite Spring Transactions Module 2.0.0
+--------------------------------------
+
+* Add Spring 6 support.
+
 Apache Ignite Spring Transactions Module 1.0.0
 ----------------------------------------------
 

diff --git a/modules/spring-tx-ext/spring-tx/pom.xml b/modules/spring-tx-ext/spring-tx/pom.xml
@@ -144,6 +144,13 @@
                     <forkCount>1</forkCount>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
 
         <testResources>

diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
@@ -99,6 +99,27 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <doclet>capital.scalable.restdocs.jsondoclet.ExtractDocumentationAsJsonDoclet</doclet>
+                        <docletArtifact>
+                            <groupId>capital.scalable</groupId>
+                            <artifactId>spring-auto-restdocs-json-doclet-jdk9</artifactId>
+                            <version>2.0.11</version>
+                        </docletArtifact>
+                        <destDir>generated-javadoc-json</destDir>
+                        <reportOutputDirectory>${basedir}${docDirectory}/report</reportOutputDirectory>
+                        <useStandardDocletOptions>false</useStandardDocletOptions>
+                        <show>package</show>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -286,5 +307,56 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>tools.jar-default</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                    <scope>system</scope>
+                    <version>${java.version}</version>
+                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>tools.jar-mac</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/../Classes/classes.jar</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                    <scope>system</scope>
+                    <version>${java.version}</version>
+                    <systemPath>${java.home}/../Classes/classes.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>tools.jar-j9</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/lib/tools.jar</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                    <scope>system</scope>
+                    <version>${java.version}</version>
+                    <systemPath>${java.home}/lib/tools.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>