[FAB-16845] Correct Logging

Signed-off-by: Matthew B. White <[email protected]>
Change-Id: I40419ce25b8cb7da17b34c8c09914ec5b78d50ce

Author: mbwhite

build.gradle

@@ -11,11 +11,10 @@ version = '1.4.4-SNAPSHOT'
 
 allprojects {
     repositories {
+        mavenCentral()
         mavenLocal()
         jcenter()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         maven { url "https://www.jitpack.io" }
-        mavenCentral()
     }
 }
 

fabric-chaincode-docker/build.gradle

@@ -8,7 +8,6 @@ buildscript {
     repositories {
         mavenLocal()
         jcenter()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         maven { url "https://www.jitpack.io" }
         mavenCentral()
     }

fabric-chaincode-example-maven/pom.xml

@@ -26,7 +26,7 @@
     <repositories>
         <repository>
             <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <url>https://www.jitpack.io</url>
         </repository>
 		<repository>
             <id>nexus</id>

fabric-chaincode-example-sacc/build.gradle

@@ -11,6 +11,7 @@ sourceCompatibility = 1.8
 repositories {
     mavenLocal()
     mavenCentral()
+     maven { url "https://www.jitpack.io" }
 }
 
 dependencies {

fabric-chaincode-example-sacc/src/main/java/org/hyperledger/fabric/example/SimpleAsset.java

@@ -24,7 +24,7 @@ public Response init(ChaincodeStub stub) {
             // Get the args from the transaction proposal
             List<String> args = stub.getParameters();
             if (args.size() != 2) {
-                newErrorResponse("Incorrect arguments. Expecting a key and a value");
+                return newErrorResponse("Incorrect arguments. Expecting a key and a value");
             }
             // Set up any variables or assets here by calling stub.putState()
             // We store the key and the value on the ledger

fabric-chaincode-example-sbe/build.gradle

@@ -11,6 +11,7 @@ sourceCompatibility = 1.8
 repositories {
     mavenLocal()
     mavenCentral()
+     maven { url "https://www.jitpack.io" }
 }
 
 dependencies {

fabric-chaincode-integration-test/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     compile project(':fabric-chaincode-docker')
     testCompile 'org.testcontainers:testcontainers:1.7.1'
-    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.1'
+    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4'
     compile project(':fabric-chaincode-shim')
     implementation group: 'org.json', name: 'json', version: '20180813'
 }
@@ -21,4 +21,4 @@ build.dependsOn project(':fabric-chaincode-docker').buildImage
         exceptionFormat "full"
 
     }
- }
+ }

fabric-chaincode-integration-test/src/test/resources/first-network/scripts/script.sh

@@ -15,7 +15,7 @@ LANGUAGE="$3"
 TIMEOUT="$4"
 VERBOSE="$5"
 : ${CHANNEL_NAME:="mychannel"}
-: ${DELAY:="3"}
+: ${DELAY:="10"}
 : ${LANGUAGE:="java"}
 : ${TIMEOUT:="10"}
 : ${VERBOSE:="false"}

fabric-chaincode-integration-test/src/test/resources/first-network/scripts/utils.sh

@@ -167,12 +167,12 @@ instantiateChaincode() {
   # the "-o" option
   if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then
     set -x
-    peer chaincode instantiate -o orderer.example.com:7050 -C $CHANNEL_NAME -n javacc -l ${LANGUAGE} -v ${VERSION} -c '{"Args":["init","a","100","b","200"]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" >&log.txt
+    peer chaincode instantiate -o orderer.example.com:7050 -C $CHANNEL_NAME -n javacc -l ${LANGUAGE} -v ${VERSION} -c '{"Args":["init","a","100"]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" >&log.txt
     res=$?
     set +x
   else
     set -x
-    peer chaincode instantiate -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n javacc -l ${LANGUAGE} -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" >&log.txt
+    peer chaincode instantiate -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n javacc -l ${LANGUAGE} -v 1.0 -c '{"Args":["init","a","100"]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" >&log.txt
     res=$?
     set +x
   fi

fabric-chaincode-protos/build.gradle

@@ -49,9 +49,9 @@ buildscript {
 dependencies {
     compile 'com.google.protobuf:protobuf-java:3.5.1'
     compile 'com.google.protobuf:protobuf-java-util:3.5.1'
-    compile 'io.grpc:grpc-netty:1.9.0'
-    compile 'io.grpc:grpc-protobuf:1.9.0'
-    compile 'io.grpc:grpc-stub:1.9.0'
+    compile 'io.grpc:grpc-netty:1.23.0'
+    compile 'io.grpc:grpc-protobuf:1.23.0'
+    compile 'io.grpc:grpc-stub:1.23.0'
 }
 
 protobuf {