From 7d973058addb9bfd1c22f00b2b4a34e2405f267c Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:21:14 +0100 Subject: [PATCH 1/7] Naming --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43767e8e..d8754d6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,7 +121,7 @@ jobs: git config --global user.name "GitHub Actions" git pull - - name: Set up JDK Apache Maven Central + - name: Set up JDK OSSRH uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' @@ -132,7 +132,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to Apache Maven Central + - name: Publish to OSSRH run: ../mvnw -B deploy -Possrh -DskipTests env: MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} From 53829e02afaea2f1598094351417054c2a52bb91 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:23:36 +0100 Subject: [PATCH 2/7] Simplify module extraction --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8754d6e..d014f7ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,7 +64,7 @@ jobs: run: | mvnwPath=$(readlink -f ./mvnw) modules=("") # root - modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0')) + modules+=($(grep -oP '(?<=)[^<]+' 'pom.xml')) for i in "${modules[@]}" do echo "Processing $i/pom.xml" @@ -188,7 +188,7 @@ jobs: run: | mvnwPath=$(readlink -f ./mvnw) modules=("") # root - modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0')) + modules+=($(grep -oP '(?<=)[^<]+' 'pom.xml')) for i in "${modules[@]}" do echo "Processing $i/pom.xml" From cf59a66878363d93c2e34dd6a46d4228f1e2eaeb Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:29:58 +0100 Subject: [PATCH 3/7] Speed up check code --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d014f7ba..655f7887 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: ./mvnw -B clean package + run: ./mvnw -B clean package -T2C - name: Check for uncommited changes run: | From bb022ad0cbbcbba74383f5c09550f21f1f547f8a Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 17 Mar 2025 10:14:58 +0100 Subject: [PATCH 4/7] Use SPDX identifier for license name https://maven.apache.org/pom.html#Licenses > Using an SPDX identifier as the license name is recommended Meanwhile https://maven.apache.org/xsd/maven-4.0.0.xsd > The full legal name of the license Can you maybe make up your mind? --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cc8c2819..f41e09d6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 8bac89bb..5544d7d5 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -35,7 +35,7 @@ - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo From da9442e969b44f01462120fd1557b37b25baa271 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 20 Mar 2025 16:03:11 +0000 Subject: [PATCH 5/7] Update dependency com.mycila:license-maven-plugin to v5 --- template-placeholder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 5544d7d5..db200048 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -103,7 +103,7 @@ com.mycila license-maven-plugin - 4.6 + 5.0.0 ${project.organization.url} From 2e7b1b6655563f8f81bdf02ce2c602c3a9be3946 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 21 Mar 2025 12:17:08 +0100 Subject: [PATCH 6/7] sonarcloud was renamed to sonarqubecloud --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 3ad8e88d..d9dbba57 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -200,7 +200,7 @@ jobs: GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} run: | not_failed_conclusion="skipped|neutral|success" - not_relevant_app_slug="dependabot|github-pages|sonarcloud" + not_relevant_app_slug="dependabot|github-pages|sonarqubecloud" echo "Waiting for checks to start..." sleep 40s From 888b4ce0a3b28dcb11fdfec03d8912520d641c03 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 21 Mar 2025 12:39:41 +0100 Subject: [PATCH 7/7] Fix branch deletion being not detected --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index d9dbba57..24af3f35 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -210,7 +210,7 @@ jobs: echo "Checking if update-branch-merged exists" git fetch - if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then + if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then echo "Branch still exists; Continuing..." else echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"