diff --git a/.github/workflows/release-to-maven-central.yml b/.github/workflows/release-to-maven-central.yml index d3e3ade3ea3..29bd2d19be2 100644 --- a/.github/workflows/release-to-maven-central.yml +++ b/.github/workflows/release-to-maven-central.yml @@ -1,4 +1,4 @@ -name: release-to-maven-central +name: Release To Maven Central on: workflow_dispatch: @@ -39,12 +39,16 @@ jobs: with: distribution: 'temurin' java-version: '17' - server-id: oss.sonatype.org + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE cache: 'maven' + env: + MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Cache node modules uses: actions/cache@v4 diff --git a/pom.xml b/pom.xml index aee41872e95..a314c642232 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 3.6.0 10.21.2 0.0.43 - 1.7.0 + 0.7.0 v22.12.0 2.2.2 @@ -150,7 +150,6 @@ src/checkstyle/checkstyle.xml src/checkstyle/checkstyle-header.txt - UTF-8 true true true @@ -388,9 +387,9 @@ ${jacoco-maven-plugin.version} - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} @@ -462,28 +461,12 @@ - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - deploy-to-sonatype - deploy - - deploy - release - - - + org.sonatype.central + central-publishing-maven-plugin + true - oss.sonatype.org - https://oss.sonatype.org + central + true @@ -559,10 +542,5 @@ GitHub Packages https://maven.pkg.github.com/codecentric/spring-boot-admin - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - diff --git a/spring-boot-admin-docs/src/site/package.json b/spring-boot-admin-docs/src/site/package.json index 463c4e76781..0b457eacc27 100644 --- a/spring-boot-admin-docs/src/site/package.json +++ b/spring-boot-admin-docs/src/site/package.json @@ -7,7 +7,7 @@ "start": "docusaurus start", "build:current-version-redirect": "sed \"s/@@VERSION@@/$VERSION/g\" current/index.template.html > current/index.html && sed \"s/@@VERSION@@/$VERSION/g\" current/404.template.html > current/404.html", "build": "docusaurus build", - "build:prod": "npm run build && npm run build:current-version-redirect && mv ./build ../../target/generated-docs" + "build:prod": "npm run build && npm run build:current-version-redirect && rm -rf ../../target/generated-docs && mv ./build ../../target/generated-docs" }, "dependencies": { "@docusaurus/core": "^3.6.3", diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml index dcbab3a9d6d..6eda9483aa5 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml @@ -125,7 +125,6 @@ de.codecentric.boot.admin.sample.SpringBootAdminServletApplication false - true