From 378beb5450ba1f6ab873b002e6c046e99cd22783 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 5 Mar 2025 04:13:28 +0000 Subject: [PATCH 1/6] Update dependency com.puppycrawl.tools:checkstyle to v10.21.4 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e8d4bbd..cc8c281 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.3 + 10.21.4 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 11d38bd..8bac89b 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.3 + 10.21.4 From 0a57f91cbf92f2d695cc404000efe92f779372d6 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 13 Mar 2025 08:34:52 +0100 Subject: [PATCH 2/6] Use correct directory for PMD --- .github/workflows/check-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 0818116..3186173 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -127,7 +127,4 @@ jobs: name: pmd-report if-no-files-found: ignore path: | - target/site/*.html - target/site/css/** - target/site/images/logos/maven-feather.png - target/site/images/external.png + target/reports/*.html From 188e420e46e5cdcdc418d3650617b36db663af91 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 13 Mar 2025 08:35:09 +0100 Subject: [PATCH 3/6] Use correct directory for PMD --- .github/workflows/check-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 3186173..01edc3a 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -127,4 +127,4 @@ jobs: name: pmd-report if-no-files-found: ignore path: | - target/reports/*.html + target/reports/** From 7d973058addb9bfd1c22f00b2b4a34e2405f267c Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:21:14 +0100 Subject: [PATCH 4/6] 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 43767e8..d8754d6 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 5/6] 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 d8754d6..d014f7b 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 6/6] 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 d014f7b..655f788 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: |