Fixes for JAR publishing

Signed-off-by: Matthew B White <[email protected]>

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:
   build:
@@ -72,4 +78,69 @@ jobs:
             :fabric-chaincode-integration-test:build 
             -xdependencyCheckAnalyze 
   
-  
+
+  publishjars:
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+      - name: Push to registry
+        run: |
+          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 }}
+          SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          OSSRH_USER: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}}
+
+
+  publishdocker:
+    runs-on: ubuntu-latest
+    needs: [setup,build]
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
+      - uses: actions/download-artifact@v3
+        with:
+          name: javaenv-docker-image
+          path: build/          
+      - name: Push to registry
+        run: |
+          set -xev
+          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
+          docker images
+          docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
+          echo "Logged in to docker registry"
+          # tag javaenv image to PACKAGE_VERSION
+          docker tag hyperledger/fabric-javaenv hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}
+          # push javaenv to repository
+          docker push hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}
+          ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}" --target "hyperledger/fabric-javaenv:${PACKAGE_VERSION}"
+          ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}" --target "hyperledger/fabric-javaenv:${MINOR_PACKAGE_VERSION}"
+        env:
+          DOCKER_REGISTRY_USERNAME:  ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_REGISTRY_PASSWORD:  ${{ secrets.DOCKERHUB_TOKEN }}
+          PACAKGE_VERSION: ${{  needs.setup.outputs.PACKAGE_VERSION }}
+          MINOR_PACKAGE_VERSION: ${{ needs.setup.outputs.MINOR_PACKAGE_VERSION }}

fabric-chaincode-shim/build.gradle

@@ -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.3.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
     }