diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c47abd3dd..b0abfab426 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,25 +16,27 @@ jobs: - 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 }} 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 + - name: Configure GPG + run: | + echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf + echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf + gpg-connect-agent reloadagent /bye + - name: Publish to the Maven Central Repository 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.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - name: Create GitHub release uses: softprops/action-gh-release@v1 diff --git a/pom.xml b/pom.xml index 48e153b53a..270a2153df 100644 --- a/pom.xml +++ b/pom.xml @@ -616,7 +616,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources @@ -629,7 +629,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.8.0 none ${project.build.sourceDirectory}:${project.build.directory}/generated-sources/annotations @@ -647,71 +647,46 @@ org.apache.maven.plugins maven-gpg-plugin 1.6 + + + --batch + --pinentry-mode + loopback + --no-tty + --yes + + ${env.GPG_PASSPHRASE} + + ${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 + published - - - - - - - - - - - - - - - - - - - - - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - diff --git a/uber-minimal-pom.xml b/uber-minimal-pom.xml index 743996f6db..41cecd664d 100644 --- a/uber-minimal-pom.xml +++ b/uber-minimal-pom.xml @@ -33,10 +33,4 @@ GitHub Issues https://github.com/databricks/databricks-jdbc/issues - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - -