[FAB-13673] Next release CR for 1.4.0

Version changed to 1.4.1-SNAPSHOT

Change-Id: Ia6209283c1a08e6f1ebaf9932433fd9f9e1abef0
Signed-off-by: gennady <[email protected]>

Author: gennadylaventman

build.gradle

@@ -20,7 +20,7 @@ subprojects {
     apply plugin: 'maven'
 
     group = 'org.hyperledger.fabric-chaincode-java'
-    version = '1.4.0'
+    version = '1.4.1-SNAPSHOT'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

fabric-chaincode-docker/build.gradle

@@ -78,6 +78,6 @@ task copyAllDeps(type: Copy) {
 task buildImage(type: DockerBuildImage) {
     dependsOn copyAllDeps
     inputDir = project.file('Dockerfile').parentFile
-    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.0', 'hyperledger/fabric-javaenv:amd64-latest']
+    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.1', 'hyperledger/fabric-javaenv:amd64-latest']
 }
 

fabric-chaincode-example-gradle/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.0'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.1-SNAPSHOT'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

fabric-chaincode-example-maven/pom.xml

@@ -12,7 +12,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- fabric-chaincode-java -->
-		<fabric-chaincode-java.version>1.4.0</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>1.4.1-SNAPSHOT</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>

fabric-chaincode-example-sacc/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.0'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.1-SNAPSHOT'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

fabric-chaincode-example-sbe/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.0'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.1-SNAPSHOT'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/Utils.java

@@ -378,7 +378,7 @@ static public void sendInstantiateProposal(String chaincode, InstantiateProposal
                         .shuffleOrders(false)
                         .nOfEvents(nofEvents));
         try {
-            instantiateFuture.get(120000, TimeUnit.MILLISECONDS);
+            instantiateFuture.get(240000, TimeUnit.MILLISECONDS);
         } catch (Exception e) {
             System.out.println("We have problem waiting for transaction");
             fail("We have problem waiting for transaction send to orderers");

fabric-chaincode-integration-test/src/test/resources/basic-network/docker-compose.yml

@@ -63,7 +63,7 @@ services:
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=${COMPOSE_PROJECT_NAME}_basic
       - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
       - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb:5984
-      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-1.4.0
+      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-1.4.1
       # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD
       # provide the credentials for ledger to connect to CouchDB.  The username and password must
       # match the username and password set for the associated CouchDB.

fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml

@@ -23,6 +23,6 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
-      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-1.4.0
+      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-1.4.1
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: peer node start