diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 602c60148..dee522804 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,14 +14,14 @@ jobs: with: java-version: '17' distribution: 'temurin' - server-id: nexus-releases + server-id: central-portal server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Publish package env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_USERNAME: ${{ secrets.CENTRAL_PORTAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.CENTRAL_PORTAL_TOKEN }} run: | cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import; - mvn clean deploy -U -P release -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} -DskipTests \ No newline at end of file + mvn clean deploy -B -U -P release -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} -Dmaven.test.skip=true \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ec0a94033..6432d510a 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -69,11 +69,11 @@ jobs: with: java-version: ${{ needs.set-jdk.outputs.jdk }} distribution: 'temurin' - server-id: nexus-snapshots + server-id: central-portal server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Publish package - run: mvn clean deploy -B -U -Psonatype + run: mvn clean deploy -B -U -Dmaven.test.skip=true env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file + MAVEN_USERNAME: ${{ secrets.CENTRAL_PORTAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.CENTRAL_PORTAL_TOKEN }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1677f13c9..cec5b4612 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,6 @@ 0.8.12 1.3.0 - 3.5.1 3.4.0 @@ -194,16 +193,6 @@ jacoco-maven-plugin ${jacoco.version} - - org.apache.maven.plugins - maven-shade-plugin - ${maven-shade-plugin.version} - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - @@ -214,6 +203,7 @@ org.apache.maven.plugins maven-clean-plugin + ${maven-clean-plugin.version} @@ -236,7 +226,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco.version} jacoco-initialize @@ -263,6 +252,18 @@ ${argLine} + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + org.codehaus.mojo flatten-maven-plugin @@ -305,32 +306,6 @@ release - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - package - - jar-no-fork - - - - - org.apache.maven.plugins maven-gpg-plugin @@ -347,42 +322,31 @@ - - sonatype - - - nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - always - - - - nexus-releases - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - true - - - false - - - - - nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ + central-portal + https://central.sonatype.com/repository/maven-snapshots/ - nexus-releases - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central-portal + https://ossrh-staging-api.central.sonatype.com/service/local/ + + + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + always + + + diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index d9b706254..5cc08bfe6 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -289,6 +289,30 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + package + + jar-no-fork + + + + org.codehaus.mojo flatten-maven-plugin @@ -322,32 +346,6 @@ release - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - package - - jar-no-fork - - - - - org.apache.maven.plugins maven-gpg-plugin @@ -367,12 +365,27 @@ - nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ + central-portal + https://central.sonatype.com/repository/maven-snapshots/ - nexus-releases - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central-portal + https://ossrh-staging-api.central.sonatype.com/service/local/ + + + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + always + + +