diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c47abd3dd..c7262df11c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,15 @@ name: Release on: + pull_request: push: tags: - 'v*' workflow_dispatch: + inputs: + release_tag: + description: 'v1.0.8-oss' + required: true + jobs: publish: @@ -13,19 +19,22 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + ref: "v1.0.8-oss" +# ref: ${{ github.event.inputs.release_tag }} - name: Set up Java for publishing to Maven Central Repository uses: actions/setup-java@v4 env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} with: java-version: 11 - server-id: ossrh + server-id: central distribution: "adopt" - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE @@ -33,10 +42,10 @@ jobs: run: mvn -Prelease --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - - name: Create GitHub release - uses: softprops/action-gh-release@v1 - with: - files: target/*.jar \ No newline at end of file + # - name: Create GitHub release + # uses: softprops/action-gh-release@v1 + # with: + # files: target/*.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index 48e153b53a..5516f051d8 100644 --- a/pom.xml +++ b/pom.xml @@ -609,109 +609,80 @@ - - release - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.0 - - none - ${project.build.sourceDirectory}:${project.build.directory}/generated-sources/annotations - - - - attach-javadocs - - jar - - - - - + + release + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.8.0 + + none + ${project.build.sourceDirectory}:${project.build.directory}/generated-sources/annotations + + + + attach-javadocs + + jar + + + + + org.apache.maven.plugins maven-gpg-plugin 1.6 + + + + --pinentry-mode + loopback + + + ${project.basedir}/uber-minimal-pom.xml + ${project.build.directory}/${project.build.finalName}-sources.jar + ${project.build.directory}/${project.build.finalName}-javadoc.jar + ${project.build.directory}/${project.build.finalName}-thin.jar + jar + thin + + sign-artifacts - - sign-and-deploy-file + sign - deploy - - ${project.build.directory}/${project.build.finalName}.jar - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - --pinentry-mode - loopback - - - ${project.basedir}/uber-minimal-pom.xml - ${project.build.directory}/${project.build.finalName}-sources.jar - ${project.build.directory}/${project.build.finalName}-javadoc.jar - ${project.build.directory}/${project.build.finalName}-thin.jar - jar - thin - + verify - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true - true + central + true - - - - - - - - - - - - - - - - - - - - - - - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - + + + diff --git a/uber-minimal-pom.xml b/uber-minimal-pom.xml index 743996f6db..856eff51db 100644 --- a/uber-minimal-pom.xml +++ b/uber-minimal-pom.xml @@ -35,8 +35,8 @@ - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://central.sonatype.com/api/v1/publisher