From d9c4007497305f567da93adcf7a052de3e291f3c Mon Sep 17 00:00:00 2001 From: Tomasz Tylenda Date: Tue, 3 Feb 2026 15:04:10 +0100 Subject: [PATCH 1/4] Update Next Iteration GHA --- .github/workflows/PrepareNextIteration.yml | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/PrepareNextIteration.yml b/.github/workflows/PrepareNextIteration.yml index 31cf5889293..a7e232f8cf0 100644 --- a/.github/workflows/PrepareNextIteration.yml +++ b/.github/workflows/PrepareNextIteration.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: nextVersion: - description: Version number of the next iteration + description: Version number of the next iteration (e.g. 8.4-SNAPSHOT) required: true jobs: @@ -15,20 +15,29 @@ jobs: pull-requests: write contents: write + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NEXT_VERSION: ${{ inputs.nextVersion }} + steps: - name: Checkout Sources uses: actions/checkout@v4 - name: Update Version Number - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NEXT_VERSION: ${{ inputs.nextVersion }} run: | git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" - git checkout -b gh-action/next-iteration + git config --global core.autocrlf input + git config --global core.safecrlf true + BRANCH="gh-action/next-iteration.${{ github.run_id }}" + git checkout -b "${BRANCH}" mvn versions:set -DgenerateBackupPoms=false -DnewVersion="${NEXT_VERSION}" git commit -m 'Prepare next development iteration' -a - git push --set-upstream origin gh-action/next-iteration - gh pr create -B master --title 'Prepare next development iteration' --body '' + git push --set-upstream origin "${BRANCH}" + + - name: Create Pull Request + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh pr create --base master --title "Prepare next development iteration ${NEXT_VERSION}" --body '' From 5527d05f23975a4b2e1bad4810dd414455f93084 Mon Sep 17 00:00:00 2001 From: Tomasz Tylenda Date: Tue, 3 Feb 2026 15:54:00 +0100 Subject: [PATCH 2/4] Trigger CI --- .github/workflows/PrepareNextIteration.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/PrepareNextIteration.yml b/.github/workflows/PrepareNextIteration.yml index a7e232f8cf0..70232d2d84d 100644 --- a/.github/workflows/PrepareNextIteration.yml +++ b/.github/workflows/PrepareNextIteration.yml @@ -25,6 +25,7 @@ jobs: uses: actions/checkout@v4 - name: Update Version Number + id: update-version run: | git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" @@ -35,9 +36,14 @@ jobs: mvn versions:set -DgenerateBackupPoms=false -DnewVersion="${NEXT_VERSION}" git commit -m 'Prepare next development iteration' -a git push --set-upstream origin "${BRANCH}" + echo "branch=${BRANCH}" >> $GITHUB_OUTPUT - name: Create Pull Request env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh pr create --base master --title "Prepare next development iteration ${NEXT_VERSION}" --body '' + + - name: Trigger Continuous Integration + run: | + gh workflow run build.yml --ref "${{ steps.update-version.outputs.branch }}" From c2152d40c8f35d25e985b205c99ad474f03127ae Mon Sep 17 00:00:00 2001 From: Tomasz Tylenda Date: Tue, 3 Feb 2026 17:49:28 +0100 Subject: [PATCH 3/4] cleanup --- .github/workflows/PrepareNextIteration.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/PrepareNextIteration.yml b/.github/workflows/PrepareNextIteration.yml index 70232d2d84d..f62c56bf48a 100644 --- a/.github/workflows/PrepareNextIteration.yml +++ b/.github/workflows/PrepareNextIteration.yml @@ -39,8 +39,6 @@ jobs: echo "branch=${BRANCH}" >> $GITHUB_OUTPUT - name: Create Pull Request - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh pr create --base master --title "Prepare next development iteration ${NEXT_VERSION}" --body '' From 6aa6d154029412f5605cdd6f33de74dda18923a4 Mon Sep 17 00:00:00 2001 From: tomasz-tylenda-sonarsource Date: Tue, 3 Feb 2026 16:50:51 +0000 Subject: [PATCH 4/4] Prepare next development iteration --- check-list/pom.xml | 2 +- docs/java-custom-rules-example/pom.xml | 2 +- docs/pom.xml | 2 +- external-reports/pom.xml | 2 +- its/autoscan/pom.xml | 2 +- its/plugin/plugins/java-extension-plugin/pom.xml | 2 +- its/plugin/plugins/pom.xml | 2 +- its/plugin/pom.xml | 2 +- its/plugin/tests/pom.xml | 2 +- its/pom.xml | 2 +- its/ruling/pom.xml | 2 +- java-checks-aws/pom.xml | 2 +- java-checks-common/pom.xml | 2 +- java-checks-test-sources/aws/pom.xml | 2 +- java-checks-test-sources/default/pom.xml | 2 +- java-checks-test-sources/java-17/pom.xml | 2 +- java-checks-test-sources/pom.xml | 2 +- java-checks-test-sources/spring-3.2/pom.xml | 2 +- java-checks-test-sources/spring-web-4.0/pom.xml | 2 +- java-checks-test-sources/test-classpath-reader/pom.xml | 2 +- java-checks-testkit/pom.xml | 2 +- java-checks/pom.xml | 2 +- java-frontend/pom.xml | 2 +- java-jsp/pom.xml | 2 +- java-surefire/pom.xml | 2 +- pom.xml | 2 +- sonar-java-plugin/pom.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/check-list/pom.xml b/check-list/pom.xml index 69245a9359d..25e30dbb257 100644 --- a/check-list/pom.xml +++ b/check-list/pom.xml @@ -7,7 +7,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING check-list diff --git a/docs/java-custom-rules-example/pom.xml b/docs/java-custom-rules-example/pom.xml index ac705654837..5f106b24d30 100644 --- a/docs/java-custom-rules-example/pom.xml +++ b/docs/java-custom-rules-example/pom.xml @@ -4,7 +4,7 @@ org.sonarsource.java docs - 8.24.0-SNAPSHOT + 9.5-TESTING diff --git a/docs/pom.xml b/docs/pom.xml index fc0ce165fd2..ebba2766f69 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING docs diff --git a/external-reports/pom.xml b/external-reports/pom.xml index 764ef24b95d..ddf15128123 100644 --- a/external-reports/pom.xml +++ b/external-reports/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING external-reports diff --git a/its/autoscan/pom.xml b/its/autoscan/pom.xml index 6aece8f8ddb..6b5248098c4 100644 --- a/its/autoscan/pom.xml +++ b/its/autoscan/pom.xml @@ -6,7 +6,7 @@ org.sonarsource.java java-its - 8.24.0-SNAPSHOT + 9.5-TESTING it-java-autoscan diff --git a/its/plugin/plugins/java-extension-plugin/pom.xml b/its/plugin/plugins/java-extension-plugin/pom.xml index bb8b1d86b8d..0e6d08dc2af 100644 --- a/its/plugin/plugins/java-extension-plugin/pom.xml +++ b/its/plugin/plugins/java-extension-plugin/pom.xml @@ -4,7 +4,7 @@ org.sonarsource.java it-java-plugin-plugins - 8.24.0-SNAPSHOT + 9.5-TESTING java-extension-plugin diff --git a/its/plugin/plugins/pom.xml b/its/plugin/plugins/pom.xml index 53453ca1e2f..3883468ed5a 100644 --- a/its/plugin/plugins/pom.xml +++ b/its/plugin/plugins/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java it-java-plugin - 8.24.0-SNAPSHOT + 9.5-TESTING it-java-plugin-plugins diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml index a0b13e1a994..5fcb7921847 100644 --- a/its/plugin/pom.xml +++ b/its/plugin/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java-its - 8.24.0-SNAPSHOT + 9.5-TESTING it-java-plugin diff --git a/its/plugin/tests/pom.xml b/its/plugin/tests/pom.xml index e3d57a5c497..da3fcf16730 100644 --- a/its/plugin/tests/pom.xml +++ b/its/plugin/tests/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java it-java-plugin - 8.24.0-SNAPSHOT + 9.5-TESTING it-java-plugin-tests diff --git a/its/pom.xml b/its/pom.xml index 37020d8ea3c..423390588b0 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-its diff --git a/its/ruling/pom.xml b/its/ruling/pom.xml index cb98756d78d..25418c2ded0 100644 --- a/its/ruling/pom.xml +++ b/its/ruling/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java-its - 8.24.0-SNAPSHOT + 9.5-TESTING it-java-ruling diff --git a/java-checks-aws/pom.xml b/java-checks-aws/pom.xml index 536d735f0e2..b10cd802b1d 100644 --- a/java-checks-aws/pom.xml +++ b/java-checks-aws/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-checks-aws diff --git a/java-checks-common/pom.xml b/java-checks-common/pom.xml index 940d949b13a..2bced8b6fd5 100644 --- a/java-checks-common/pom.xml +++ b/java-checks-common/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-checks-common diff --git a/java-checks-test-sources/aws/pom.xml b/java-checks-test-sources/aws/pom.xml index 53fc552cc26..76ed1df06b3 100644 --- a/java-checks-test-sources/aws/pom.xml +++ b/java-checks-test-sources/aws/pom.xml @@ -7,7 +7,7 @@ org.sonarsource.java java-checks-test-sources - 8.24.0-SNAPSHOT + 9.5-TESTING aws diff --git a/java-checks-test-sources/default/pom.xml b/java-checks-test-sources/default/pom.xml index 00d59ddbd0e..cccb121af76 100644 --- a/java-checks-test-sources/default/pom.xml +++ b/java-checks-test-sources/default/pom.xml @@ -7,7 +7,7 @@ org.sonarsource.java java-checks-test-sources - 8.24.0-SNAPSHOT + 9.5-TESTING default diff --git a/java-checks-test-sources/java-17/pom.xml b/java-checks-test-sources/java-17/pom.xml index c48c50a867d..2acec267765 100644 --- a/java-checks-test-sources/java-17/pom.xml +++ b/java-checks-test-sources/java-17/pom.xml @@ -7,7 +7,7 @@ org.sonarsource.java java-checks-test-sources - 8.24.0-SNAPSHOT + 9.5-TESTING java-17 diff --git a/java-checks-test-sources/pom.xml b/java-checks-test-sources/pom.xml index 44427f4adcd..4e442be1571 100644 --- a/java-checks-test-sources/pom.xml +++ b/java-checks-test-sources/pom.xml @@ -7,7 +7,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-checks-test-sources diff --git a/java-checks-test-sources/spring-3.2/pom.xml b/java-checks-test-sources/spring-3.2/pom.xml index 23601dbf024..6200dc10c71 100644 --- a/java-checks-test-sources/spring-3.2/pom.xml +++ b/java-checks-test-sources/spring-3.2/pom.xml @@ -7,7 +7,7 @@ org.sonarsource.java java-checks-test-sources - 8.24.0-SNAPSHOT + 9.5-TESTING spring-3.2 diff --git a/java-checks-test-sources/spring-web-4.0/pom.xml b/java-checks-test-sources/spring-web-4.0/pom.xml index 3b68ca576d9..1262a153c7e 100644 --- a/java-checks-test-sources/spring-web-4.0/pom.xml +++ b/java-checks-test-sources/spring-web-4.0/pom.xml @@ -6,7 +6,7 @@ org.sonarsource.java java-checks-test-sources - 8.24.0-SNAPSHOT + 9.5-TESTING spring-web-4.0 diff --git a/java-checks-test-sources/test-classpath-reader/pom.xml b/java-checks-test-sources/test-classpath-reader/pom.xml index 5fecf78ef08..cfd03fcc2a8 100644 --- a/java-checks-test-sources/test-classpath-reader/pom.xml +++ b/java-checks-test-sources/test-classpath-reader/pom.xml @@ -6,7 +6,7 @@ org.sonarsource.java java-checks-test-sources - 8.24.0-SNAPSHOT + 9.5-TESTING test-classpath-reader diff --git a/java-checks-testkit/pom.xml b/java-checks-testkit/pom.xml index 008dd9482de..a17c1a331cb 100644 --- a/java-checks-testkit/pom.xml +++ b/java-checks-testkit/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-checks-testkit diff --git a/java-checks/pom.xml b/java-checks/pom.xml index c72ccb9dad5..6aa621a73ff 100644 --- a/java-checks/pom.xml +++ b/java-checks/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-checks diff --git a/java-frontend/pom.xml b/java-frontend/pom.xml index 3c82dafd07e..6afce3e3ab0 100644 --- a/java-frontend/pom.xml +++ b/java-frontend/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-frontend diff --git a/java-jsp/pom.xml b/java-jsp/pom.xml index 5f96e1046cd..10757e23d07 100644 --- a/java-jsp/pom.xml +++ b/java-jsp/pom.xml @@ -6,7 +6,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-jsp diff --git a/java-surefire/pom.xml b/java-surefire/pom.xml index 078aa970da6..e39d24a4e15 100644 --- a/java-surefire/pom.xml +++ b/java-surefire/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING java-surefire diff --git a/pom.xml b/pom.xml index df89bef4113..a94c25e42a5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING pom SonarJava Code Analyzer for Java :: Parent POM diff --git a/sonar-java-plugin/pom.xml b/sonar-java-plugin/pom.xml index 52bbe2e5932..bd40875ae8d 100644 --- a/sonar-java-plugin/pom.xml +++ b/sonar-java-plugin/pom.xml @@ -6,7 +6,7 @@ org.sonarsource.java java - 8.24.0-SNAPSHOT + 9.5-TESTING sonar-java-plugin