From 5c54afcc04e5fde9aaed08568128d1c73922505e Mon Sep 17 00:00:00 2001 From: Jothi Prakash Date: Tue, 5 Aug 2025 09:39:38 +0530 Subject: [PATCH 01/12] testing --- .github/workflows/release.yml | 34 +++++++++++++------- pom.xml | 60 ++++++++++------------------------- uber-minimal-pom.xml | 6 ---- 3 files changed, 38 insertions(+), 62 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c47abd3dd..d59e321ac3 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: + # workflow_dispatch: + # inputs: + # release_tag: + # description: 'v1.0.8-oss' + # required: true + jobs: publish: @@ -13,19 +19,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + # ref: "v1.0.8-oss" + ref: ${{ github.event.pull_request.head.sha }} +# 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 +43,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..20ebbd8bed 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,17 +647,8 @@ org.apache.maven.plugins maven-gpg-plugin 1.6 - - - - - sign-and-deploy-file - - deploy + - ${project.build.directory}/${project.build.finalName}.jar - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ --pinentry-mode @@ -671,47 +662,28 @@ jar thin + + + sign-artifacts + + sign + + 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..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/ - - From 4fe1b0d9a6bcd96a0c6d233785ef606825d42228 Mon Sep 17 00:00:00 2001 From: Jothi Prakash Date: Tue, 5 Aug 2025 09:55:24 +0530 Subject: [PATCH 02/12] nit --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d59e321ac3..ad74f2ddd6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: gpg-passphrase: GPG_PASSPHRASE - name: Publish to the Maven Central Repository - run: mvn -Prelease --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} + run: mvn -Prelease -X --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }} From 89cea095b228852d7a93d4dc2121aa7605794ff5 Mon Sep 17 00:00:00 2001 From: Jothi Prakash Date: Tue, 5 Aug 2025 11:04:21 +0530 Subject: [PATCH 03/12] nit --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad74f2ddd6..b0ea982296 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,8 +28,8 @@ jobs: uses: actions/setup-java@v4 env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - MAVEN_CENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} with: java-version: 11 server-id: central @@ -43,8 +43,8 @@ jobs: run: mvn -Prelease -X --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - MAVEN_CENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_CENTRAL_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 From d8690e2c54e7a37b9d0e1c551267c1e6f172a678 Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 15:24:10 +0530 Subject: [PATCH 04/12] Update release.yml I hope this works out though. --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b0ea982296..5199fa1bf6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,13 +29,13 @@ jobs: env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + MAVEN_CENTRAL_SECRET: ${{ secrets.MAVEN_CENTRAL_SECRET }} with: java-version: 11 server-id: central distribution: "adopt" server-username: MAVEN_CENTRAL_USERNAME - server-password: MAVEN_CENTRAL_PASSWORD + server-password: MAVEN_CENTRAL_SECRET gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE @@ -44,9 +44,9 @@ jobs: env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + MAVEN_CENTRAL_SECRET: ${{ secrets.MAVEN_CENTRAL_SECRET }} # - name: Create GitHub release # uses: softprops/action-gh-release@v1 # with: - # files: target/*.jar \ No newline at end of file + # files: target/*.jar From 3cd87ec8dd4c7ed97a3722e82aacb06a2064a96f Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 16:13:45 +0530 Subject: [PATCH 05/12] Modify based on env secrets --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5199fa1bf6..0e6028beda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_SECRET: ${{ secrets.MAVEN_CENTRAL_SECRET }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_SECRET }} with: java-version: 11 server-id: central @@ -44,7 +44,7 @@ jobs: env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_SECRET: ${{ secrets.MAVEN_CENTRAL_SECRET }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_SECRET }} # - name: Create GitHub release # uses: softprops/action-gh-release@v1 From 7c8851f6a3ec243f7034bad15e8395c300ce2eef Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 16:15:21 +0530 Subject: [PATCH 06/12] Add a wait-until in pom release --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 20ebbd8bed..2f072e0015 100644 --- a/pom.xml +++ b/pom.xml @@ -680,6 +680,7 @@ central true + published From ca8b5a033b7793febc76f9d839be05c5ae76780d Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 17:31:26 +0530 Subject: [PATCH 07/12] modify passing of vars in release.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🤞 --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e6028beda..a1fb455dd1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,17 +34,17 @@ jobs: java-version: 11 server-id: central distribution: "adopt" - server-username: MAVEN_CENTRAL_USERNAME - server-password: MAVEN_CENTRAL_SECRET + server-username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + server-password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: GPG_PASSPHRASE + gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - name: Publish to the Maven Central Repository run: mvn -Prelease -X --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_SECRET }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} # - name: Create GitHub release # uses: softprops/action-gh-release@v1 From 8712f33806447d8fb4faa26fc0e73ac152a96903 Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 18:20:33 +0530 Subject: [PATCH 08/12] configure gpg explicitly --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1fb455dd1..07195086ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,6 +39,12 @@ jobs: gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: ${{ secrets.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 -X --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} env: From 0ab25eb167da4ef2d6684e3e35880694cdb7ebf7 Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 18:23:12 +0530 Subject: [PATCH 09/12] Update pom.xml to include gpg changes --- pom.xml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 2f072e0015..270a2153df 100644 --- a/pom.xml +++ b/pom.xml @@ -647,22 +647,24 @@ 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 - - + + + --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 From 7a3391f8da08330d695e5d78b0e7a59180e7f8c9 Mon Sep 17 00:00:00 2001 From: Samikshya Chand <148681192+samikshya-db@users.noreply.github.com> Date: Tue, 5 Aug 2025 19:05:52 +0530 Subject: [PATCH 10/12] Update release.yml --- .github/workflows/release.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07195086ee..972588eb2e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,18 +26,14 @@ jobs: - name: Set up Java for publishing to Maven Central Repository uses: actions/setup-java@v4 - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_SECRET }} with: java-version: 11 server-id: central distribution: "adopt" - server-username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - server-password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} + gpg-passphrase: GPG_PASSPHRASE - name: Configure GPG run: | From 06b548ed3f36bd5c1d80555e9c7caab1b59f3add Mon Sep 17 00:00:00 2001 From: Jothi Prakash Date: Thu, 7 Aug 2025 16:54:41 +0530 Subject: [PATCH 11/12] Refactor release.yml to enable workflow_dispatch and streamline checkout process --- .github/workflows/release.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 972588eb2e..9c0aeca975 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,15 +1,9 @@ name: Release on: - pull_request: push: tags: - 'v*' - # workflow_dispatch: - # inputs: - # release_tag: - # description: 'v1.0.8-oss' - # required: true - + workflow_dispatch: jobs: publish: @@ -19,10 +13,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - # ref: "v1.0.8-oss" - ref: ${{ github.event.pull_request.head.sha }} -# ref: ${{ github.event.inputs.release_tag }} - name: Set up Java for publishing to Maven Central Repository uses: actions/setup-java@v4 @@ -48,7 +38,7 @@ jobs: MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - # - name: Create GitHub release - # uses: softprops/action-gh-release@v1 - # with: - # files: target/*.jar + - name: Create GitHub release + uses: softprops/action-gh-release@v1 + with: + files: target/*.jar From 0c974ba47c8f55b57e113339484dc3bf8b19681c Mon Sep 17 00:00:00 2001 From: Jothi Prakash Date: Thu, 7 Aug 2025 17:00:33 +0530 Subject: [PATCH 12/12] Remove unnecessary debug flag from Maven deploy command in release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c0aeca975..b0abfab426 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: gpg-connect-agent reloadagent /bye - name: Publish to the Maven Central Repository - run: mvn -Prelease -X --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} + run: mvn -Prelease --batch-mode deploy -Dnvd.api.key=${{ secrets.NVD_API_KEY }} env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} @@ -41,4 +41,4 @@ jobs: - name: Create GitHub release uses: softprops/action-gh-release@v1 with: - files: target/*.jar + files: target/*.jar \ No newline at end of file