Swap to using the published fabric-protos libraries

Signed-off-by: fraVlaca <[email protected]>
hyperledger · Jul 15, 2022 · 80a36ee · 80a36ee
1 parent 4f665e3
commit 80a36ee
Show file tree

Hide file tree

Showing 91 changed files with 452 additions and 60,033 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 This is a Java based implementation of Hyperledger Fabric chaincode shim APIs, which enables development of smart contracts using the Java language.
 
-This project creates `fabric-chaincode-protos` and `fabric-chaincode-shim` jar
+This project creates `fabric-chaincode-shim` jar
 files for developers' consumption and the `hyperledger/fabric-javaenv` docker image
 to run Java chaincode.
 
@@ -16,10 +16,6 @@ Application developers interested in developing Java smart contracts for Hyperle
 
 ## Project structure
 
-### fabric-chaincode-protos
-
-Contains the protobuf definition files used by Java shim to communicate with Fabric peers.
-
 ### fabric-chaincode-shim
 
 Contains the java shim classes that define Java chaincode API and way to communicate with Fabric peers.

diff --git a/RELEASING.md b/RELEASING.md
@@ -6,7 +6,6 @@ The following artifacts are created as a result of releasing Fabric Chaincode Ja
     - [fabric-javaenv](https://hub.docker.com/r/hyperledger/fabric-javaenv)
 - Java libraries
     - [fabric-chaincode-shim](https://search.maven.org/search?q=a:fabric-chaincode-shim)
-    - [fabric-chaincode-protos](https://search.maven.org/search?q=a:fabric-chaincode-protos)
 
 **Note:** A docker image with a matching V.R version is required before releasing a new version of Fabric.
 

diff --git a/build.gradle b/build.gradle
@@ -56,12 +56,6 @@ subprojects {
         testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.9.1'
     }
 
-    if (!it.name.equals('fabric-chaincode-protos')) {
-        tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:all,-try"
-        }
-    }
-
     test {
         useJUnitPlatform()
     }

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -107,7 +107,6 @@ stages:
             # Copy the built artifacts to the staging directory, tgz, and the docker image
           - script: |
               set -ev
-              ./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=${KEYRING_FILE} publishProtosJarPublicationToMavenLocal
               ./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=${KEYRING_FILE} publishShimJarPublicationToMavenLocal
               tar -zcvf localmaven.tgz ${HOME}/.m2/repository/org/hyperledger
               docker image save hyperledger/fabric-javaenv | gzip > $(Build.ArtifactStagingDirectory)/fabric-javaenv.tar.gz

diff --git a/ci/publish_jar_nexus.sh b/ci/publish_jar_nexus.sh
@@ -14,7 +14,7 @@ function abort {
     exit -1
 }
 
-for binary in shim protos; do
+for binary in shim; do
 echo "Pushing fabric-chaincode-$binary.$PUSH_VERSION.jar to maven releases.."
 cp $WORKSPACE/fabric-chaincode-$binary/build/libs/fabric-chaincode-$binary-$PUSH_VERSION.jar $WORKSPACE/fabric-chaincode-$binary/build/libs/fabric-chaincode-$binary.$PUSH_VERSION.jar
 mvn org.apache.maven.plugins:maven-deploy-plugin:deploy-file \

diff --git a/examples/fabric-contract-example-maven/pom.xml b/examples/fabric-contract-example-maven/pom.xml
@@ -46,9 +46,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hyperledger.fabric-chaincode-java</groupId>
-			<artifactId>fabric-chaincode-protos</artifactId>
-			<version>${fabric-chaincode-java.version}</version>
+			<groupId>org.hyperledger.fabric</groupId>
+			<artifactId>fabric-protos</artifactId>
+			<version>0.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 

diff --git a/fabric-chaincode-docker/Dockerfile b/fabric-chaincode-docker/Dockerfile
@@ -32,8 +32,6 @@ RUN chmod +x /root/chaincode-java/build.sh
 WORKDIR /root/chaincode-java/shim-src
 RUN gradle \
     clean \
-    fabric-chaincode-protos:build \
-    fabric-chaincode-protos:publishToMavenLocal \
     fabric-chaincode-shim:build \
     fabric-chaincode-shim:publishToMavenLocal \
     -x javadoc \
@@ -42,10 +40,6 @@ RUN gradle \
     -x checkstyleTest \
     -x dependencyCheckAnalyze
 
-# Installing all protos jar dependencies to maven local
-WORKDIR /root/chaincode-java/shim-src/fabric-chaincode-protos/build/publications/protosJar/
-RUN mvn -f pom-default.xml compile
-
 # Installing all shim jar dependencies to maven local
 WORKDIR /root/chaincode-java/shim-src/fabric-chaincode-shim/build/publications/shimJar/
 RUN mvn -f pom-default.xml compile

diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle
@@ -52,11 +52,6 @@ task copyAllDeps(type: Copy) {
         into('build/distributions/chaincode-java/shim-src/fabric-chaincode-shim/')
     }
 
-    copy {
-        from project(':fabric-chaincode-protos').getProjectDir()
-        into('build/distributions/chaincode-java/shim-src/fabric-chaincode-protos/')
-    }
-
     copy {
         from project.getParent().file("build.gradle")
         into('build/distributions/chaincode-java/shim-src/')

diff --git a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle
@@ -16,7 +16,7 @@ repositories {
 
 dependencies {
     implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.1'
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.4.1'
+    implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.1.3'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'

diff --git a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml
@@ -46,9 +46,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hyperledger.fabric-chaincode-java</groupId>
-			<artifactId>fabric-chaincode-protos</artifactId>
-			<version>${fabric-chaincode-java.version}</version>
+			<groupId>org.hyperledger.fabric</groupId>
+			<artifactId>fabric-protos</artifactId>
+			<version>0.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 

diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle
@@ -16,7 +16,7 @@ repositories {
 
 dependencies {
     implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.1'
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.4.1'
+    implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.1.3'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'

diff --git a/...st/src/contracts/fabric-shim-api/src/main/java/org/hyperledger/fabric/example/AllAPI.java b/...st/src/contracts/fabric-shim-api/src/main/java/org/hyperledger/fabric/example/AllAPI.java
@@ -10,7 +10,6 @@
 import org.hyperledger.fabric.metrics.MetricsProvider;
 import org.hyperledger.fabric.shim.ledger.*;
 import org.hyperledger.fabric.shim.*;
-//import org.hyperledger.fabric.protos.peer.ChaincodeShim;
 import java.util.*;
 import static java.nio.charset.StandardCharsets.UTF_8;
 

diff --git a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml
@@ -46,9 +46,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hyperledger.fabric-chaincode-java</groupId>
-			<artifactId>fabric-chaincode-protos</artifactId>
-			<version>${fabric-chaincode-java.version}</version>
+			<groupId>org.hyperledger.fabric</groupId>
+			<artifactId>fabric-protos</artifactId>
+			<version>0.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 

diff --git a/fabric-chaincode-protos/build.gradle b/fabric-chaincode-protos/build.gradle