Merge pull request #274 from mbwhite/java-jar-publishing

Fixes for JAR publishing

Author: mbwhite

.github/workflows/build.yml

@@ -5,10 +5,16 @@
 name: Fabric Chaincode and Smart Contract - Java
 on:
   push:
-    branches: ["**"]
+    branches:
+      - main
+      - release-2.5
   pull_request:
-    branches: ["**"]
-  workflow_dispatch:
+    branches:
+      - main
+      - release-2.5
+  create:
+    tags:
+      - "*"  
 
 jobs:
 
@@ -121,12 +127,12 @@ jobs:
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
       - name: Push to registry
         run: |
-          echo $KEYRING_FILE > keyringfile.gpg
-          ./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=keyringfile.gpg -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} publishAllPublicationsToReleaseRepository
-        env:
-          SIGNING_ID: ossrh
+          set -xev
+
+          ./gradlew -Psigning.key=${SIGNING_KEY} -Psigning.password=${SIGNING_PASSWORD} -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} publishAllPublicationsToReleaseRepository
+        env:          
           SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-          KEYRING_FILE: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
           OSSRH_USER: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}}
 
@@ -152,6 +158,8 @@ jobs:
           wget -qO "$PWD/manifest-tool" https://github.com/estesp/manifest-tool/releases/download/v1.0.0/manifest-tool-linux-amd64
           chmod +x ./manifest-tool
 
+          # just debuging
+          echo  ${{  needs.setup.outputs.PACKAGE_VERSION }}
           echo "Version strings are ${PACKAGE_VERSION} ${MINOR_PACKAGE_VERSION}"
 
           docker image load --input build/fabric-javaenv.tar.gz

fabric-chaincode-shim/build.gradle

@@ -8,7 +8,7 @@
         mavenCentral()
     }
     dependencies {
-        classpath 'org.owasp:dependency-check-gradle:7.1.0.1'
+        classpath 'org.owasp:dependency-check-gradle:7.4.3'
     }
 }
 
@@ -41,7 +41,7 @@ tasks.withType(org.gradle.api.tasks.testing.Test) {
 }
 
 dependencies {
-    implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.1.3'
+    implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.2.0'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.62'
     implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.146'
@@ -341,7 +341,11 @@ publishing {
 }
 
 signing {
-    if (project.findProperty('signing.keyId')) {
+    if (project.findProperty('signing.key')) {
+        def signingKey = findProperty("signing.key")
+        def signingPassword = findProperty("signing.password")
+        useInMemoryPgpKeys(signingKey, signingPassword)
+
         sign publishing.publications.shim
         sign publishing.publications.shimJar
     }