Revert "Unified release workflow for shaded and thin JARs (#1073)" (#1081)

## Description
<!-- Provide a brief summary of the changes made and the issue they aim
to address.-->
This reverts commit 9a5e7c9.
NO_CHANGELOG=true

## Testing
<!-- Describe how the changes have been tested-->

## Additional Notes to the Reviewer
<!-- Share any additional context or insights that may help the reviewer
understand the changes better. This could include challenges faced,
limitations, or compromises made during the development process.
Also, mention any areas of the code that you would like the reviewer to
focus on specifically. -->

Author: jayantsing-db

.github/workflows/release-thin.yml

@@ -0,0 +1,66 @@
+name: Release Thin JAR
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  publish-thin:
+    runs-on:
+      group: databricks-protected-runner-group
+      labels: linux-ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Java for publishing to Maven Central Repository
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: "adopt"
+          server-id: central
+          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: Build thin JAR
+        run: |
+          mvn -B -DskipTests package
+
+      - name: Verify thin jar exists
+        run: |
+          VERSION=$(grep -m1 '<version>' pom.xml | sed 's/.*<version>\(.*\)<\/version>.*/\1/')
+          test -f "target/databricks-jdbc-${VERSION}-oss-thin.jar"
+
+      - name: Publish Thin JAR as Separate Artifact to Maven Central
+        run: |
+          VERSION=$(grep -m1 '<version>' pom.xml | sed 's/.*<version>\(.*\)<\/version>.*/\1/')
+          mvn -Prelease gpg:sign-and-deploy-file \
+            -Dfile="target/databricks-jdbc-${VERSION}-oss-thin.jar" \
+            -DrepositoryId=central \
+            -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
+            -DgroupId=com.databricks \
+            -DartifactId=databricks-jdbc-thin \
+            -Dversion="${VERSION}" \
+            -Dpackaging=jar \
+            -DgeneratePom=true \
+            -Dgpg.passphrase="${GPG_PASSPHRASE}"
+        env:
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+
+      - name: Upload Thin JAR to GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            target/*-oss-thin.jar
+

.github/workflows/release.yml

@@ -27,15 +27,9 @@ jobs:
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg-passphrase: GPG_PASSPHRASE
 
-      - name: Configure GPG
+      - name: Publish to the Maven Central Repository
         run: |
-          echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
-          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
-          gpg-connect-agent reloadagent /bye
-
-      - name: Publish shaded JAR to Maven Central
-        run: |
-          # Deploy main artifacts (shaded uber JAR, sources, javadoc)
+          # Deploy main artifacts (uber JAR, sources, javadoc)
           mvn -Prelease --batch-mode deploy \
             -Dnvd.api.key=${{ secrets.NVD_API_KEY }} \
             -Dossindex.username=${{ secrets.OSSINDEX_USERNAME }} \
@@ -45,26 +39,8 @@ jobs:
           MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
           MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
 
-      - name: Publish thin JAR as separate artifact to Maven Central
-        run: |
-          VERSION=$(grep -m1 '<version>' pom.xml | sed 's/.*<version>\(.*\)<\/version>.*/\1/')
-          mvn -Prelease gpg:sign-and-deploy-file \
-            -Dfile="target/databricks-jdbc-${VERSION}-thin.jar" \
-            -DpomFile=thin_public_pom.xml \
-            -DrepositoryId=central \
-            -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
-            -DgroupId=com.databricks \
-            -DartifactId=databricks-jdbc-thin \
-            -Dversion="${VERSION}" \
-            -Dpackaging=jar \
-            -Dgpg.passphrase="${GPG_PASSPHRASE}"
-        env:
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          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
+            files: target/*.jar

pom.xml

@@ -474,30 +474,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <!-- Attach unshaded JAR before shade plugin runs -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>attach-thin-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <type>jar</type>
-                  <classifier>thin</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>