From 855c40a960bb2b60cd0e58a5d4339ab0bf4d6fbd Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 26 Apr 2025 04:15:56 +0000 Subject: [PATCH 01/19] 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 6d58c9da..6e8b462c 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 71700cc3..e1b29d2d 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 02/19] 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 6d58c9da..79539b23 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 71700cc3..350e7112 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 25dd0edc236a5305346fd2f2e64c8f058e114b6f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:10:09 +0000 Subject: [PATCH 03/19] 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 ade03464..0d8c9606 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 04/19] 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 32f412fa..16a3f376 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 11b7e2349d2a1f2469d14dc8cc189ab9996fbaa3 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 13 May 2025 17:14:18 +0200 Subject: [PATCH 05/19] Use default display --- .../src/main/resources/META-INF/resources/manifest.webmanifest | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest b/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest index e673c34a..8d4e1a8d 100644 --- a/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest +++ b/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest @@ -1,7 +1,6 @@ { "name": "Demo", "short_name": "Demo", - "display": "standalone", "background_color": "#c02222", "theme_color": "#c02222", "start_url": ".", From ff55964737e85ae73098e8c34420f7a2334700f7 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 14 May 2025 04:14:50 +0000 Subject: [PATCH 06/19] Update com.vaadin to v24.7.3 --- demo/pom.xml | 2 +- vaadin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/pom.xml b/demo/pom.xml index fd395b7b..0abb0e92 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,7 +22,7 @@ UTF-8 - 24.7.2 + 24.7.3 3.4.5 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 1510c48a..f5b770b8 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -97,7 +97,7 @@ com.vaadin vaadin-bom - 24.7.2 + 24.7.3 pom import From 9a98c73dd0fac46f53a32fd838b804920973a809 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 14 May 2025 04:14:53 +0000 Subject: [PATCH 07/19] Update dependency software.xdev:tci-base to v1.1.2 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index fd395b7b..0ce725c3 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -124,7 +124,7 @@ software.xdev tci-base - 1.1.0 + 1.1.2 From 5770e16d22cb56319080dc98c60ef9434c003371 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 14 May 2025 04:14:55 +0000 Subject: [PATCH 08/19] Update dependency org.seleniumhq.selenium:selenium-dependencies-bom to v4.32.0 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index fd395b7b..9e580ac9 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -131,7 +131,7 @@ org.seleniumhq.selenium selenium-dependencies-bom - 4.31.0 + 4.32.0 pom import From 3d299145b654bb524f48f4db30726fa344b14c27 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 14 May 2025 04:14:56 +0000 Subject: [PATCH 09/19] Update dependency software.xdev:testcontainers-advanced-imagebuilder to v1.1.0 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index fd395b7b..d1261608 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -187,7 +187,7 @@ software.xdev testcontainers-advanced-imagebuilder - 1.0.2 + 1.1.0 org.testcontainers From 6319052990d439a6166141ed7ceadf00b34789d3 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 14 May 2025 04:14:57 +0000 Subject: [PATCH 10/19] Update dependency software.xdev:testcontainers-selenium to v1.2.0 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index fd395b7b..502b11eb 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -177,7 +177,7 @@ software.xdev testcontainers-selenium - 1.1.0 + 1.2.0 software.xdev From ef5faa3c0b2ba80e9e9cf5cee610f54f38a1eae9 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 14 May 2025 09:56:31 +0200 Subject: [PATCH 11/19] Cleanup: Use framework class --- .../sse/demo/tci/db/factory/DBTCIFactory.java | 2 +- .../sse/demo/tci/oidc/factory/OIDCTCIFactory.java | 2 +- .../tci/selenium/factory/BrowserTCIFactory.java | 2 +- .../xdev/sse/demo/tci/util/ContainerMemory.java | 15 --------------- .../tci/webapp/factory/RestWebAppTCIFactory.java | 2 +- .../webapp/factory/VaadinWebAppTCIFactory.java | 2 +- 6 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java diff --git a/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java b/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java index f4f623bd..b5813c14 100644 --- a/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java +++ b/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java @@ -8,8 +8,8 @@ import software.xdev.sse.demo.tci.db.DBTCI; import software.xdev.sse.demo.tci.db.containers.DBContainer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class DBTCIFactory extends PreStartableTCIFactory diff --git a/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java b/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java index 15483798..e3769516 100644 --- a/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java +++ b/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java @@ -9,8 +9,8 @@ import software.xdev.sse.demo.tci.oidc.OIDCTCI; import software.xdev.sse.demo.tci.oidc.containers.OIDCServerContainer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class OIDCTCIFactory extends PreStartableTCIFactory diff --git a/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java b/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java index bf71b57c..31321a3d 100644 --- a/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java +++ b/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java @@ -18,8 +18,8 @@ import software.xdev.sse.demo.tci.selenium.BrowserTCI; import software.xdev.sse.demo.tci.selenium.containers.SeleniumBrowserWebDriverContainer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; import software.xdev.testcontainers.selenium.containers.browser.BrowserWebDriverContainer; import software.xdev.testcontainers.selenium.containers.recorder.SeleniumRecordingContainer; diff --git a/demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java b/demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java deleted file mode 100644 index e339cdc1..00000000 --- a/demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java +++ /dev/null @@ -1,15 +0,0 @@ -package software.xdev.sse.demo.tci.util; - -public final class ContainerMemory -{ - // Docker uses 1024 as conversion - public static final long M128M = 128 * 1024L * 1024L; - public static final long M256M = M128M * 2; - public static final long M512M = M256M * 2; - public static final long M1G = M512M * 2; - public static final long M2G = M1G * 2; - - private ContainerMemory() - { - } -} diff --git a/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java b/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java index 3b76188d..0b3e1e76 100644 --- a/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java +++ b/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java @@ -3,12 +3,12 @@ import java.time.Duration; import java.util.function.Consumer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.sse.demo.tci.webapp.RestWebAppTCI; import software.xdev.sse.demo.tci.webapp.WebAppTCI; import software.xdev.sse.demo.tci.webapp.containers.RestWebAppContainer; import software.xdev.sse.demo.tci.webapp.containers.WebAppContainerBuilder; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class RestWebAppTCIFactory extends PreStartableTCIFactory diff --git a/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java b/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java index 4e6246eb..803533ff 100644 --- a/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java +++ b/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java @@ -3,12 +3,12 @@ import java.time.Duration; import java.util.function.Consumer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.sse.demo.tci.webapp.VaadinWebAppTCI; import software.xdev.sse.demo.tci.webapp.WebAppTCI; import software.xdev.sse.demo.tci.webapp.containers.VaadinWebAppContainer; import software.xdev.sse.demo.tci.webapp.containers.WebAppContainerBuilder; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class VaadinWebAppTCIFactory extends PreStartableTCIFactory From 8c327a78a20274b60b7edefd5c50ad8513e4a49b Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 14 May 2025 13:43:13 +0200 Subject: [PATCH 12/19] Improve docs IntRef: JS-569 --- oauth2-oidc/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oauth2-oidc/README.md b/oauth2-oidc/README.md index 4dd621e9..4f4821d3 100644 --- a/oauth2-oidc/README.md +++ b/oauth2-oidc/README.md @@ -22,7 +22,8 @@ Also provides a [OAuth2/OIDC server "is offline" fallback](./src/main/java/softw #### Requirements -* The OAuth2/OIDC Server should provide a [refresh token](https://datatracker.ietf.org/doc/html/rfc6749#section-1.5) (to recheck authentication).
Usually this can be achieved with the [``offline_access`` scope](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess). +* The OAuth2/OIDC Server should provide a [refresh token](https://datatracker.ietf.org/doc/html/rfc6749#section-1.5) (to recheck authentication).
Usually this can be achieved with the [``offline_access`` scope](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess) but it's highly dependent on the OIDC Provider. +For example IdentityServer requires it, while KeyCloak must not use it at all (as the UI otherwise asks every time for a login) and requires a different setting. #### Usage From 65cee9114afceb9a7214aa3ab0b29bf7c12af214 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 14 May 2025 13:44:36 +0200 Subject: [PATCH 13/19] Typo IntRef: JS-569 --- oauth2-oidc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauth2-oidc/README.md b/oauth2-oidc/README.md index 4f4821d3..fb733519 100644 --- a/oauth2-oidc/README.md +++ b/oauth2-oidc/README.md @@ -23,7 +23,7 @@ Also provides a [OAuth2/OIDC server "is offline" fallback](./src/main/java/softw #### Requirements * The OAuth2/OIDC Server should provide a [refresh token](https://datatracker.ietf.org/doc/html/rfc6749#section-1.5) (to recheck authentication).
Usually this can be achieved with the [``offline_access`` scope](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess) but it's highly dependent on the OIDC Provider. -For example IdentityServer requires it, while KeyCloak must not use it at all (as the UI otherwise asks every time for a login) and requires a different setting. +For example IdentityServer requires it, while KeyCloak must not use it at all (as the UI otherwise asks for a login every time) and requires a different setting. #### Usage From 61ba4ec0a8be2efa5cc2741a901e15e47794331a Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 04:13:29 +0000 Subject: [PATCH 14/19] Update com.vaadin to v24.7.4 --- demo/pom.xml | 2 +- vaadin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/pom.xml b/demo/pom.xml index 2707e6b9..feb176eb 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,7 +22,7 @@ UTF-8 - 24.7.3 + 24.7.4 3.4.5 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 288fb23e..08fb169a 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -97,7 +97,7 @@ com.vaadin vaadin-bom - 24.7.3 + 24.7.4 pom import From 5c139d45cd32862308f2aaeb8b26068839d13ce2 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 04:13:31 +0000 Subject: [PATCH 15/19] Update dependency org.springdoc:springdoc-openapi-starter-webmvc-ui to v2.8.8 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index 2707e6b9..ef0e7ded 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -154,7 +154,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.8.6 + 2.8.8 From 6b8bdec7766422e80fed7eb74878ccf69614933c Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 19 May 2025 16:14:14 +0200 Subject: [PATCH 16/19] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 116a656e..5c850540 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 17/19] =?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 8bd0f3c2..2cb33930 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 03f5339e..8a858912 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 19b3fce8..55fb55a6 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 18/19] 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 55fb55a6..5a67e474 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -192,7 +192,6 @@ sonatype-central-portal true - published From dbb9e355bfe16919850ce5862f0b753359523abc Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 10:02:52 +0200 Subject: [PATCH 19/19] =?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 +++ bom/pom.xml | 50 ++++---------------------------- codec-sha256/pom.xml | 50 ++++---------------------------- crypto-symmetric-managed/pom.xml | 50 ++++---------------------------- crypto-symmetric/pom.xml | 50 ++++---------------------------- csp/pom.xml | 50 ++++---------------------------- metrics/pom.xml | 50 ++++---------------------------- oauth2-oidc-remember-me/pom.xml | 50 ++++---------------------------- oauth2-oidc/pom.xml | 50 ++++---------------------------- vaadin/pom.xml | 50 ++++---------------------------- web-sidecar-actuator/pom.xml | 50 ++++---------------------------- web-sidecar-common/pom.xml | 50 ++++---------------------------- web/pom.xml | 50 ++++---------------------------- 13 files changed, 76 insertions(+), 528 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2753866c..17fd84cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.0.5 +* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) +* Updated dependencies + # 1.0.4 * OAuth2-OIDC * ``DefaultDeAuthApplier``: Use already present request/response if possible diff --git a/bom/pom.xml b/bom/pom.xml index b1da2bee..c59c47b3 100644 --- a/bom/pom.xml +++ b/bom/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/ - - - @@ -167,7 +132,7 @@ - ossrh + publish-sonatype-central-portal @@ -211,16 +176,13 @@ - 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 diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 3efad847..866bb6c5 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/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/ - - - org.junit.jupiter @@ -191,7 +156,7 @@ - ossrh + publish-sonatype-central-portal @@ -235,16 +200,13 @@ - 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 diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index f6295472..9d94a998 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/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/ - - - @@ -211,7 +176,7 @@ - ossrh + publish-sonatype-central-portal @@ -255,16 +220,13 @@ - 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 diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index cfb2f51d..3248dbfe 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/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/ - - - org.junit.jupiter @@ -191,7 +156,7 @@ - ossrh + publish-sonatype-central-portal @@ -235,16 +200,13 @@ - 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 diff --git a/csp/pom.xml b/csp/pom.xml index 97caa4f7..e901b73f 100644 --- a/csp/pom.xml +++ b/csp/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/ - - - @@ -200,7 +165,7 @@ - ossrh + publish-sonatype-central-portal @@ -244,16 +209,13 @@ - 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 diff --git a/metrics/pom.xml b/metrics/pom.xml index 34f3a376..711f10de 100644 --- a/metrics/pom.xml +++ b/metrics/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/ - - - @@ -195,7 +160,7 @@ - ossrh + publish-sonatype-central-portal @@ -239,16 +204,13 @@ - 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 diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 25d925fc..23fdbfcb 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/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/ - - - @@ -225,7 +190,7 @@ - ossrh + publish-sonatype-central-portal @@ -269,16 +234,13 @@ - 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 diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 80027488..cc734ba5 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/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/ - - - @@ -244,7 +209,7 @@ - ossrh + publish-sonatype-central-portal @@ -288,16 +253,13 @@ - 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 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 08fb169a..9f0a214a 100644 --- a/vaadin/pom.xml +++ b/vaadin/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/ - - - @@ -241,7 +206,7 @@ - ossrh + publish-sonatype-central-portal @@ -285,16 +250,13 @@ - 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 diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 77205bd8..88744755 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/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/ - - - @@ -228,7 +193,7 @@ - ossrh + publish-sonatype-central-portal @@ -272,16 +237,13 @@ - 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 diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index 49eb0025..ce0819b3 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/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/ - - - @@ -205,7 +170,7 @@ - ossrh + publish-sonatype-central-portal @@ -249,16 +214,13 @@ - 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 diff --git a/web/pom.xml b/web/pom.xml index f6a2d04d..a32c9d8c 100644 --- a/web/pom.xml +++ b/web/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/ - - - @@ -195,7 +160,7 @@ - ossrh + publish-sonatype-central-portal @@ -239,16 +204,13 @@ - 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