This is an automated email from the ASF dual-hosted git repository. anovikov pushed a commit to branch release/ignite-spring-tx-ext-2.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
commit 3fef2583ecd76a0712e21250b65d2fefac8c18cb Author: Andrey Novikov <[email protected]> AuthorDate: Mon Jun 17 13:08:07 2024 +0700 IGNITE-22317 Set the Ignite Spring Transaction Extension 2.0.0 release version with 2.16.0 Apache Ignite --- .github/workflows/prepare-rc.yml | 6 +- .github/workflows/release-checker.yml | 2 +- modules/spring-tx-ext/examples/pom.xml | 4 +- modules/spring-tx-ext/pom.xml | 2 +- modules/spring-tx-ext/spring-tx/RELEASE_NOTES.txt | 5 ++ modules/spring-tx-ext/spring-tx/pom.xml | 4 +- parent-internal/pom.xml | 74 ++++++++++++++++++++++- 7 files changed, 87 insertions(+), 10 deletions(-) diff --git a/.github/workflows/prepare-rc.yml b/.github/workflows/prepare-rc.yml index a11eecec..873836a6 100644 --- 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 index 202109c9..1cfc1383 100644 --- 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-tx-ext/examples/pom.xml b/modules/spring-tx-ext/examples/pom.xml index b79e4d9b..46ce5f26 100644 --- a/modules/spring-tx-ext/examples/pom.xml +++ b/modules/spring-tx-ext/examples/pom.xml @@ -28,12 +28,12 @@ <parent> <groupId>org.apache.ignite</groupId> <artifactId>ignite-spring-tx-parent-ext</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>ignite-spring-tx-ext-examples</artifactId> - <version>${project.parent.version}</version> + <version>2.0.0</version> <dependencies> <dependency> diff --git a/modules/spring-tx-ext/pom.xml b/modules/spring-tx-ext/pom.xml index a44dd7c0..51250116 100644 --- a/modules/spring-tx-ext/pom.xml +++ b/modules/spring-tx-ext/pom.xml @@ -31,7 +31,7 @@ <artifactId>ignite-spring-tx-parent-ext</artifactId> <packaging>pom</packaging> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0</version> <url>https://ignite.apache.org</url> diff --git a/modules/spring-tx-ext/spring-tx/RELEASE_NOTES.txt b/modules/spring-tx-ext/spring-tx/RELEASE_NOTES.txt index 834f3dd3..8de3fd76 100644 --- 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 index 70d1781b..b1867caf 100644 --- a/modules/spring-tx-ext/spring-tx/pom.xml +++ b/modules/spring-tx-ext/spring-tx/pom.xml @@ -28,12 +28,12 @@ <parent> <groupId>org.apache.ignite</groupId> <artifactId>ignite-spring-tx-parent-ext</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>ignite-spring-tx-ext</artifactId> - <version>${project.parent.version}</version> + <version>2.0.0</version> <dependencies> <dependency> diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml index 85ae94c1..60486192 100644 --- a/parent-internal/pom.xml +++ b/parent-internal/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.ignite</groupId> <artifactId>ignite-parent</artifactId> - <version>2.17.0-SNAPSHOT</version> + <version>2.16.0</version> <relativePath /> <!-- lookup parent from repository --> </parent> @@ -97,6 +97,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> @@ -284,5 +305,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>
