From 3ffba88fbbe7b74a18e4d38a260142f8146560dc Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 21 Feb 2025 04:12:20 +0000 Subject: [PATCH 01/47] Update org.springframework.boot to v3.4.3 --- spring-security-advanced-authentication-ui-demo/pom.xml | 2 +- spring-security-advanced-authentication-ui/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 579be61..5ba587b 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -28,7 +28,7 @@ software.xdev.Application - 3.4.2 + 3.4.3 diff --git a/spring-security-advanced-authentication-ui/pom.xml b/spring-security-advanced-authentication-ui/pom.xml index 400ccca..afbd884 100644 --- a/spring-security-advanced-authentication-ui/pom.xml +++ b/spring-security-advanced-authentication-ui/pom.xml @@ -88,13 +88,13 @@ org.springframework.boot spring-boot-starter-web - 3.4.2 + 3.4.3 provided org.springframework.boot spring-boot-starter-security - 3.4.2 + 3.4.3 provided From febb98273d1ba9454ba3c79ab87668b4740ac51c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 22 Feb 2025 04:12:31 +0000 Subject: [PATCH 02/47] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0 --- template-placeholder-demo/pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template-placeholder-demo/pom.xml b/template-placeholder-demo/pom.xml index 1af633c..3702222 100644 --- a/template-placeholder-demo/pom.xml +++ b/template-placeholder-demo/pom.xml @@ -44,7 +44,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 ${maven.compiler.release} diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d4073..0250042 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 ${maven.compiler.release} From 0d53a9b152f4dc3d812f5c44e15ec26df45e98cc Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 24 Feb 2025 04:12:36 +0000 Subject: [PATCH 03/47] Update dependency com.puppycrawl.tools:checkstyle to v10.21.3 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c39fff2..353d78d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.2 + 10.21.3 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d4073..db2a2bf 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.2 + 10.21.3 From 15a053a764be7a91a2ab1d026bff2ca640401215 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 26 Feb 2025 04:14:11 +0000 Subject: [PATCH 04/47] Update dependency org.codehaus.mojo:flatten-maven-plugin to v1.7.0 --- 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 52d4073..c6592b3 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -182,7 +182,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.7.0 ossrh From eacac5add95c89cc33a8d571bae0bcbd5186c3a7 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 27 Feb 2025 04:13:15 +0000 Subject: [PATCH 05/47] Update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.9.0 --- 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 52d4073..0784d8d 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.8.0 + 3.9.0 From a3c85c196e6f18d0f4d71a026136a6336df753fb Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 1 Mar 2025 04:13:31 +0000 Subject: [PATCH 06/47] Update net.sourceforge.pmd to v7.11.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c39fff2..aa2ba15 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.10.0 + 7.11.0 net.sourceforge.pmd pmd-java - 7.10.0 + 7.11.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d4073..44733c5 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.10.0 + 7.11.0 net.sourceforge.pmd pmd-java - 7.10.0 + 7.11.0 From 378beb5450ba1f6ab873b002e6c046e99cd22783 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 5 Mar 2025 04:13:28 +0000 Subject: [PATCH 07/47] 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 c91b69adbd8f64b5f93aaec64d099916980f366f Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 10 Mar 2025 13:17:50 +0100 Subject: [PATCH 08/47] Add link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65404ac..6f21a16 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ A more detailed scenario is available in the [demo](./spring-security-advanced-a > [!NOTE] > By default [Bootstrap](https://github.com/twbs/bootstrap) is loaded from ``cdn.jsdelivr.net``.
> Due to privacy and stability reasons you should ship your own version!
-> An example how this can be done is shown in the demo. +> An example how this can be done is shown in the [demo](https://github.com/xdev-software/spring-security-advanced-authentication-ui/blob/4117d471e036de4dc2a58b2b484f2631afe7af50/spring-security-advanced-authentication-ui-demo/src/main/java/software/xdev/security/MainWebSecurity.java#L44-L51). > [!NOTE] > The ``Advanced``-subsystem uses the pre-``Spring Security 6.4`` / ``Spring Boot 3.4`` templating system (without Regex).
From 0b416f31d309865f45125352fba89b53ac7c7aa8 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 10 Mar 2025 13:20:08 +0100 Subject: [PATCH 09/47] Sync pom I --- .../pom.xml | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 spring-security-advanced-authentication-ui-demo/pom.xml diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml deleted file mode 100644 index 5ba587b..0000000 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - 4.0.0 - - - software.xdev - spring-security-advanced-authentication-ui-root - 2.0.1-SNAPSHOT - - - spring-security-advanced-authentication-ui-demo - 2.0.1-SNAPSHOT - jar - - - XDEV Software - https://xdev.software - - - - 17 - ${javaVersion} - - UTF-8 - UTF-8 - - software.xdev.Application - - 3.4.3 - - - - - - org.springframework.boot - spring-boot-dependencies - ${org.springframework.boot.version} - pom - import - - - - - - - - software.xdev - spring-security-advanced-authentication-ui - ${project.version} - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-oauth2-client - - - - - com.webauthn4j - webauthn4j-core - 0.28.5.RELEASE - - - - org.springframework.boot - spring-boot-devtools - true - - - - - ${project.artifactId} - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - ${maven.compiler.release} - - -proc:none - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${org.springframework.boot.version} - - ${mainClass} - - - - repackage - - repackage - - package - - - - - - From 63fe371ef6f3878cb7d7d6e061fb601c6cf1b43a Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 10 Mar 2025 13:20:19 +0100 Subject: [PATCH 10/47] Sync pom II --- .../pom.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {template-placeholder-demo => spring-security-advanced-authentication-ui-demo}/pom.xml (100%) diff --git a/template-placeholder-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml similarity index 100% rename from template-placeholder-demo/pom.xml rename to spring-security-advanced-authentication-ui-demo/pom.xml From 280bceec56f64dc662046d90e07a9b06d91db73f Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 10 Mar 2025 13:21:26 +0100 Subject: [PATCH 11/47] Sync pom III --- .../pom.xml | 77 +++++++++++++------ 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 3702222..9fba95b 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -6,12 +6,12 @@ software.xdev - template-placeholder-root - 1.0.0-SNAPSHOT + spring-security-advanced-authentication-ui-root + 2.0.1-SNAPSHOT - template-placeholder-demo - 1.0.0-SNAPSHOT + spring-security-advanced-authentication-ui-demo + 2.0.1-SNAPSHOT jar @@ -27,14 +27,55 @@ UTF-8 software.xdev.Application + + 3.4.3 + + + + org.springframework.boot + spring-boot-dependencies + ${org.springframework.boot.version} + pom + import + + + + + software.xdev - template-placeholder + spring-security-advanced-authentication-ui ${project.version} + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-oauth2-client + + + + + com.webauthn4j + webauthn4j-core + 0.28.5.RELEASE + + + + org.springframework.boot + spring-boot-devtools + true + @@ -52,31 +93,21 @@ + - org.apache.maven.plugins - maven-assembly-plugin - 3.7.1 + org.springframework.boot + spring-boot-maven-plugin + ${org.springframework.boot.version} - - - ${mainClass} - - - true - - - - jar-with-dependencies - - false + ${mainClass} - make-assembly - package + repackage - single + repackage + package From 8e371aaa38ad2443a056fc5f0132312a46fae89f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 10 Mar 2025 12:24:40 +0000 Subject: [PATCH 12/47] Update dependency com.webauthn4j:webauthn4j-core to v0.28.6.RELEASE --- spring-security-advanced-authentication-ui-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 9fba95b..58a5ad8 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -68,7 +68,7 @@ com.webauthn4j webauthn4j-core - 0.28.5.RELEASE + 0.28.6.RELEASE From 40fcd975b36c0bf0767bc2d4bf6ecfb312ee79ad Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 10 Mar 2025 12:24:41 +0000 Subject: [PATCH 13/47] Update dependency org.junit.jupiter:junit-jupiter to v5.12.0 --- spring-security-advanced-authentication-ui/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui/pom.xml b/spring-security-advanced-authentication-ui/pom.xml index ba8e288..af30297 100644 --- a/spring-security-advanced-authentication-ui/pom.xml +++ b/spring-security-advanced-authentication-ui/pom.xml @@ -101,7 +101,7 @@ org.junit.jupiter junit-jupiter - 5.11.4 + 5.12.0 test From c60ce8a80b939dc5c7e625e8c3b2103e618e1cd3 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 10 Mar 2025 13:29:34 +0100 Subject: [PATCH 14/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f21a16..60cca6d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/spring-security-advanced-authentication-ui/check-build.yml?branch=develop)](https://github.com/xdev-software/spring-security-advanced-authentication-ui/actions/workflows/check-build.yml?query=branch%3Adevelop) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_spring-security-advanced-authentication-ui&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_spring-security-advanced-authentication-ui) -# spring-security-advanced-authentication-ui +# Advanced authentication UI for Spring Security Modernizes the default Spring Web Authentication/Login UI and makes it easier customizable. From 0a57f91cbf92f2d695cc404000efe92f779372d6 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 13 Mar 2025 08:34:52 +0100 Subject: [PATCH 15/47] 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 16/47] 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 17/47] 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 18/47] 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 19/47] 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: | From bb022ad0cbbcbba74383f5c09550f21f1f547f8a Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 17 Mar 2025 10:14:58 +0100 Subject: [PATCH 20/47] 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 cc8c281..f41e09d 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 8bac89b..5544d7d 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 21/47] 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 5544d7d..db20004 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 22/47] 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 3ad8e88..d9dbba5 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 23/47] 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 d9dbba5..24af3f3 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" From c021044d61db78e1988715ecd6abde9b88f70c67 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 26 Mar 2025 15:49:45 +0100 Subject: [PATCH 24/47] Pin unofficial actions versions https://github.com/xdev-software/base-template/issues/1 --- .github/workflows/broken-links.yml | 4 ++-- .github/workflows/sync-labels.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 48265e8..2b1188e 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -18,7 +18,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@v2 + uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6 # v2 with: fail: false # Don't fail on broken links, create an issue instead @@ -37,7 +37,7 @@ jobs: - name: Create Issue From File if: env.lychee_exit_code != 0 - uses: peter-evans/create-issue-from-file@v5 + uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5 with: issue-number: ${{ steps.find-issue.outputs.number }} title: Link Checker Report diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index ff880f0..0e2beb5 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -19,6 +19,6 @@ jobs: with: sparse-checkout: .github/labels.yml - - uses: EndBug/label-sync@v2 + - uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2 with: config-file: .github/labels.yml From 581b7fb0faa1eb3b591501b251cb733b4d12c6c0 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 26 Mar 2025 16:22:13 +0100 Subject: [PATCH 25/47] Pin unofficial actions versions https://github.com/xdev-software/base-template/issues/1 --- .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 655f788..8bd0f3c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: - name: Create Release id: create_release - uses: shogo82148/actions-create-release@v1 + uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1 with: tag_name: v${{ steps.version.outputs.release }} release_name: v${{ steps.version.outputs.release }} @@ -165,7 +165,7 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Deploy to Github pages - uses: peaceiris/actions-gh-pages@v4 + uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site From 5ced1cc41f894e26af310f1722dcd94e68af5b9e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 29 Mar 2025 04:13:09 +0000 Subject: [PATCH 26/47] Update net.sourceforge.pmd to v7.12.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f41e09d..07c70ba 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.11.0 + 7.12.0 net.sourceforge.pmd pmd-java - 7.11.0 + 7.12.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index db20004..47dd4d8 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.11.0 + 7.12.0 net.sourceforge.pmd pmd-java - 7.11.0 + 7.12.0 From 49db248d25fd4a3106ddaaf092c86a205d357c4c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 31 Mar 2025 04:15:29 +0000 Subject: [PATCH 27/47] Update dependency com.puppycrawl.tools:checkstyle to v10.22.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f41e09d..eb66486 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.4 + 10.22.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index db20004..014b608 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.4 + 10.22.0 From 4eef9ec75c98fcddb0845dfe527b5ae6615db1c3 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 31 Mar 2025 08:37:19 +0200 Subject: [PATCH 28/47] Improve Code Analysis See https://github.com/xdev-software/java-template/issues/13 --- .config/checkstyle/checkstyle.xml | 13 +++++++++- .config/pmd/ruleset.xml | 43 ++++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index a0d7f17..43b5290 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -52,6 +52,7 @@ + @@ -68,6 +69,11 @@ + + + + + @@ -93,7 +99,6 @@ - @@ -122,7 +127,13 @@ + + + + + + diff --git a/.config/pmd/ruleset.xml b/.config/pmd/ruleset.xml index 7a03f17..88a7b5a 100644 --- a/.config/pmd/ruleset.xml +++ b/.config/pmd/ruleset.xml @@ -10,16 +10,38 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -76,9 +98,6 @@ - - - @@ -114,17 +133,33 @@ + + + + + + + + + + + + + + + + - + From e5152dc2243ec5b88ef9d45e6a836ebf10c9aece Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 1 Apr 2025 04:11:14 +0000 Subject: [PATCH 29/47] Update lycheeverse/lychee-action digest to 1d97d84 --- .github/workflows/broken-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 2b1188e..ade0346 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -18,7 +18,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6 # v2 + uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 with: fail: false # Don't fail on broken links, create an issue instead From 4ff7c848a6a29ba54bb1982f5237e16ac325d298 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 3 Apr 2025 04:13:57 +0000 Subject: [PATCH 30/47] Update dependency com.puppycrawl.tools:checkstyle to v10.23.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c46fefe0..6d58c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.22.0 + 10.23.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 5dcf34d..71700cc 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.22.0 + 10.23.0 From 9f5cab50cee12ff7b938c164170d8d064f07be5a Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 22 Apr 2025 08:39:58 +0200 Subject: [PATCH 31/47] Enforce IDEA plugins --- .idea/externalDependencies.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .idea/externalDependencies.xml diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml new file mode 100644 index 0000000..78be5b8 --- /dev/null +++ b/.idea/externalDependencies.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From aadce1e83a862e7298e99e38b3f65493f3ced284 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 22 Apr 2025 11:30:35 +0200 Subject: [PATCH 32/47] Fix PMD / Checksytle --- .../ui/extendable/ExtendableLoginPageAdapter.java | 2 +- .../authentication/ui/extendable/filters/HtmlTemplates.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/ExtendableLoginPageAdapter.java b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/ExtendableLoginPageAdapter.java index 8fa3903..45fa519 100644 --- a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/ExtendableLoginPageAdapter.java +++ b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/ExtendableLoginPageAdapter.java @@ -203,7 +203,7 @@ protected ExtendableLoginPageAdapter( this.copyDataFromExistingFilters = copyDataFromExistingFilters; this.installUsingInitMethod = installWith == InstallWith.INIT_METHOD - || (installWith == null && httpSecurity == null); + || installWith == null && httpSecurity == null; if(!this.installUsingInitMethod) { diff --git a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/HtmlTemplates.java b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/HtmlTemplates.java index 00783e0..580e408 100644 --- a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/HtmlTemplates.java +++ b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/HtmlTemplates.java @@ -31,9 +31,9 @@ * @author Daniel Garnier-Moiroux * @since 6.4 */ -public class HtmlTemplates +public final class HtmlTemplates { - protected HtmlTemplates() + private HtmlTemplates() { } From 0a3ba2252c1def8a016f8803829f2e7428ebc76c Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 22 Apr 2025 11:32:09 +0200 Subject: [PATCH 33/47] Fix pmd --- .../src/main/java/software/xdev/Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui-demo/src/main/java/software/xdev/Application.java b/spring-security-advanced-authentication-ui-demo/src/main/java/software/xdev/Application.java index 83fe4b1..0491f09 100644 --- a/spring-security-advanced-authentication-ui-demo/src/main/java/software/xdev/Application.java +++ b/spring-security-advanced-authentication-ui-demo/src/main/java/software/xdev/Application.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; -@SuppressWarnings("checkstyle:HideUtilityClassConstructor") +@SuppressWarnings({"checkstyle:HideUtilityClassConstructor", "PMD.UseUtilityClass"}) @SpringBootApplication public class Application { From 6351146aad2fe3e3feb5ff33f29fa55c45037108 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 22 Apr 2025 09:35:24 +0000 Subject: [PATCH 34/47] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.3 --- spring-security-advanced-authentication-ui/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui/pom.xml b/spring-security-advanced-authentication-ui/pom.xml index 77b45e4..fd5d895 100644 --- a/spring-security-advanced-authentication-ui/pom.xml +++ b/spring-security-advanced-authentication-ui/pom.xml @@ -198,7 +198,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 From a63712bf19f642b2dd3fa5684ed70756ee41209b Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 22 Apr 2025 09:35:26 +0000 Subject: [PATCH 35/47] Update dependency org.junit.jupiter:junit-jupiter to v5.12.2 --- spring-security-advanced-authentication-ui/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui/pom.xml b/spring-security-advanced-authentication-ui/pom.xml index 77b45e4..83516f4 100644 --- a/spring-security-advanced-authentication-ui/pom.xml +++ b/spring-security-advanced-authentication-ui/pom.xml @@ -101,7 +101,7 @@ org.junit.jupiter junit-jupiter - 5.12.0 + 5.12.2 test From fc4bfa7055153ae21c5566740066851124400ed8 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 22 Apr 2025 09:35:28 +0000 Subject: [PATCH 36/47] Update org.springframework.boot to v3.4.4 --- spring-security-advanced-authentication-ui-demo/pom.xml | 2 +- spring-security-advanced-authentication-ui/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 58a5ad8..36d052c 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -28,7 +28,7 @@ software.xdev.Application - 3.4.3 + 3.4.4 diff --git a/spring-security-advanced-authentication-ui/pom.xml b/spring-security-advanced-authentication-ui/pom.xml index 77b45e4..b1c0823 100644 --- a/spring-security-advanced-authentication-ui/pom.xml +++ b/spring-security-advanced-authentication-ui/pom.xml @@ -88,13 +88,13 @@ org.springframework.boot spring-boot-starter-web - 3.4.3 + 3.4.4 provided org.springframework.boot spring-boot-starter-security - 3.4.3 + 3.4.4 provided From a602acbd843c7f7cff73693a9f6be4ffaa0e9777 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 22 Apr 2025 09:35:30 +0000 Subject: [PATCH 37/47] Update dependency com.webauthn4j:webauthn4j-core to v0.29.0.RELEASE --- spring-security-advanced-authentication-ui-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 58a5ad8..b022394 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -68,7 +68,7 @@ com.webauthn4j webauthn4j-core - 0.28.6.RELEASE + 0.29.0.RELEASE From 855c40a960bb2b60cd0e58a5d4339ab0bf4d6fbd Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 26 Apr 2025 04:15:56 +0000 Subject: [PATCH 38/47] Update net.sourceforge.pmd to v7.13.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6d58c9d..6e8b462 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.12.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.12.0 + 7.13.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 71700cc..e1b29d2 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.12.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.12.0 + 7.13.0 From 7c3c850c225fdac6dadff0b541e6f32944f0b9fd Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 28 Apr 2025 04:16:13 +0000 Subject: [PATCH 39/47] Update dependency com.puppycrawl.tools:checkstyle to v10.23.1 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6d58c9d..79539b2 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.23.0 + 10.23.1 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 71700cc..350e711 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.23.0 + 10.23.1 From 123773fc4f08894e228cfd0b76c90b2e62cb2e3b Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 5 May 2025 04:13:58 +0000 Subject: [PATCH 40/47] Update org.springframework.boot to v3.4.5 --- spring-security-advanced-authentication-ui-demo/pom.xml | 2 +- spring-security-advanced-authentication-ui/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 83b2ce3..4a05449 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -28,7 +28,7 @@ software.xdev.Application - 3.4.4 + 3.4.5 diff --git a/spring-security-advanced-authentication-ui/pom.xml b/spring-security-advanced-authentication-ui/pom.xml index 91c375f..00f3718 100644 --- a/spring-security-advanced-authentication-ui/pom.xml +++ b/spring-security-advanced-authentication-ui/pom.xml @@ -88,13 +88,13 @@ org.springframework.boot spring-boot-starter-web - 3.4.4 + 3.4.5 provided org.springframework.boot spring-boot-starter-security - 3.4.4 + 3.4.5 provided From 25dd0edc236a5305346fd2f2e64c8f058e114b6f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:10:09 +0000 Subject: [PATCH 41/47] Update lycheeverse/lychee-action digest to 82202e5 --- .github/workflows/broken-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index ade0346..0d8c960 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -18,7 +18,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 + uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2 with: fail: false # Don't fail on broken links, create an issue instead From 22946ad08ebadf5f4196a9512ab7055d6f95431c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:12:33 +0000 Subject: [PATCH 42/47] Update lycheeverse/lychee-action digest to 82202e5 --- .github/workflows/broken-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 32f412f..16a3f37 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -19,7 +19,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 + uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2 with: fail: false # Don't fail on broken links, create an issue instead From 3015480ae307ad4fa0be61da6750a26c6e9eff30 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 12 May 2025 15:07:25 +0000 Subject: [PATCH 43/47] Update dependency com.webauthn4j:webauthn4j-core to v0.29.2.RELEASE --- spring-security-advanced-authentication-ui-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-advanced-authentication-ui-demo/pom.xml b/spring-security-advanced-authentication-ui-demo/pom.xml index 83b2ce3..9cd54ec 100644 --- a/spring-security-advanced-authentication-ui-demo/pom.xml +++ b/spring-security-advanced-authentication-ui-demo/pom.xml @@ -68,7 +68,7 @@ com.webauthn4j webauthn4j-core - 0.29.0.RELEASE + 0.29.2.RELEASE From 6b8bdec7766422e80fed7eb74878ccf69614933c Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 19 May 2025 16:14:14 +0200 Subject: [PATCH 44/47] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 116a656..5c85054 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ hs_err_pid* .idea/* !.idea/saveactions_settings.xml !.idea/checkstyle-idea.xml +!.idea/externalDependencies.xml !.idea/inspectionProfiles/ .idea/inspectionProfiles/* From a0c76bcc1a1ab0c7f48a879f5c969885687536f3 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 09:05:07 +0200 Subject: [PATCH 45/47] =?UTF-8?q?OSSRH=20=E2=86=92=20Sonatype=20Maven=20Ce?= =?UTF-8?q?ntral=20Portal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/xdev-software/standard-maven-template/issues/155 --- .github/workflows/release.yml | 12 ++++---- .github/workflows/test-deploy.yml | 12 ++++---- template-placeholder/pom.xml | 51 +++++-------------------------- 3 files changed, 19 insertions(+), 56 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bd0f3c..2cb3393 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,22 +121,22 @@ jobs: git config --global user.name "GitHub Actions" git pull - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH - run: ../mvnw -B deploy -Possrh -DskipTests + - name: Publish to Central Portal + run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 03f5339..8a85891 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -13,21 +13,21 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH - run: ../mvnw -B deploy -Possrh -DskipTests + - name: Publish to Central Portal + run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 19b3fce..55fb55a 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -176,7 +141,7 @@ - ossrh + publish-sonatype-central-portal @@ -220,16 +185,14 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true + published From 1a4d9748107c3be028e90e1f42003c2c2cebfc54 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 09:38:39 +0200 Subject: [PATCH 46/47] Wait until ``validated`` as deployment otherwise takes too long See https://github.com/xdev-software/standard-maven-template/issues/155 --- template-placeholder/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 55fb55a..5a67e47 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -192,7 +192,6 @@ sonatype-central-portal true - published From b0ae2ea659262cac9f24b242f3957728600c4710 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 11:30:05 +0200 Subject: [PATCH 47/47] =?UTF-8?q?OSSRH=20=E2=86=92=20Sonatype=20Maven=20Ce?= =?UTF-8?q?ntral=20Portal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/xdev-software/standard-maven-template/issues/155 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3ace70..285a620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.0.1 +* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) +* Updated dependencies + # 2.0.0 * Added support for Spring Security 6.4+ / Spring Boot 3.4+ #100 * Spring now