From 25dd0edc236a5305346fd2f2e64c8f058e114b6f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:10:09 +0000 Subject: [PATCH 1/9] 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 2/9] 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 846206f01ca7d1fb69abb747cc3b9c279eb09a29 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 12 May 2025 15:07:50 +0000 Subject: [PATCH 3/9] Update dependency software.xdev:testcontainers-selenium to v1.2.0 --- tci-advanced-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tci-advanced-demo/pom.xml b/tci-advanced-demo/pom.xml index ab50a047..7d8af696 100644 --- a/tci-advanced-demo/pom.xml +++ b/tci-advanced-demo/pom.xml @@ -130,7 +130,7 @@ software.xdev testcontainers-selenium - 1.1.0 + 1.2.0 software.xdev From 7593b8ba530394aa970d9b6858ca77ebd70cfd51 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 13 May 2025 04:13:26 +0000 Subject: [PATCH 4/9] Update dependency software.xdev:testcontainers-advanced-imagebuilder to v1.1.0 --- tci-advanced-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tci-advanced-demo/pom.xml b/tci-advanced-demo/pom.xml index ab50a047..0d63291a 100644 --- a/tci-advanced-demo/pom.xml +++ b/tci-advanced-demo/pom.xml @@ -140,7 +140,7 @@ software.xdev testcontainers-advanced-imagebuilder - 1.0.2 + 1.1.0 org.testcontainers From 6b8bdec7766422e80fed7eb74878ccf69614933c Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 19 May 2025 16:14:14 +0200 Subject: [PATCH 5/9] 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 6/9] =?UTF-8?q?OSSRH=20=E2=86=92=20Sonatype=20Maven=20Cent?= =?UTF-8?q?ral=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 7/9] 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 e2ab48eeaeab9bd379aee400c69745f012d87f0f Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 10:51:14 +0200 Subject: [PATCH 8/9] =?UTF-8?q?OSSRH=20=E2=86=92=20Sonatype=20Maven=20Cent?= =?UTF-8?q?ral=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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30029b05..3c1aa823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.1.3 +* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) + # 1.1.2 * Update docs * Fix ``ContainerMemory#M8G`` being the same as ``ContainerMemory#M4G`` From a4cad49ca2762afe7e3a0ef88b168a1424d5ebec Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 10:52:44 +0200 Subject: [PATCH 9/9] Fix pom --- tci-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tci-base/pom.xml b/tci-base/pom.xml index 7fdd51fa..fc6ea007 100644 --- a/tci-base/pom.xml +++ b/tci-base/pom.xml @@ -180,7 +180,7 @@ - jakarta: + org.apache.maven.plugins