FABJ-516 Release v2.1.0 (#49)

* FABJ-516 Release v2.1.0

Signed-off-by: heatherlp <[email protected]>

* FABJ-516 Use 2.1 fabric images

Signed-off-by: heatherlp <[email protected]>

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.1.0
+Thu 16 Apr 2020 14:01:44 BST
+
+* [90c9f45](https://github.com/hyperledger/fabric-sdk-java/commit/90c9f45) Use SafeConstructor with YAML parser (#46)
+* [fd81d1e](https://github.com/hyperledger/fabric-sdk-java/commit/fd81d1e) Explicit trigger for PR builds (#43)
+
 ## v2.0.0
 Wed 22 Jan 2020 15:27:37 GMT
 

README.md

@@ -39,6 +39,7 @@ SDK's `Enrollment` interface.
 
 |Release | Notes |Summary|
 |--------|:------|:------|
+|2.1     | [v2.1 release notes](./release_notes/v2.1.0.txt)| Minor update |
 |2.0     | [v2.0 release notes](./docs/release_v2.0.0_notes.md) | <ul><li>New lifecycle chaincode management</li><li>Connection config handlers</li><li>Application setting executor service</li><li>Queued block listener</li></ul>   |
 |1.4     | None | Minor updates no Fabric changes|
 |1.3     | [v1.3 release notes](./docs/release_v1.3.0_notes.md)|<ul><li>Java chaincode support</li><li>Query chaincode collection configuration</li><li>Identity Mixer transaction unlinkabilty support</li></ul> |
@@ -95,11 +96,11 @@ pom.xml
 ```
 
 ### Java and Node Chaincode environment
-You may also need to on your <span style="color:red"><b>v2.0</b> </span>  Fabric network docker deployment explicitly pull the Java and Node chaincode environments for now.
+You may also need to on your <span style="color:red"><b>v2.1</b> </span>  Fabric network docker deployment explicitly pull the Java and Node chaincode environments for now.
 
-`docker pull hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable&&docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest&&docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv`
+`docker pull hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.1.0-stable&&docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.1.0-stable hyperledger/fabric-nodeenv:amd64-latest&&docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.1.0-stable hyperledger/fabric-nodeenv`
 
-`docker pull hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable&&docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest&&docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv`
+`docker pull hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.1.0-stable&&docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.1.0-stable hyperledger/fabric-javaenv:amd64-latest&&docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.1.0-stable hyperledger/fabric-javaenv`
 
 ## Known limitations and restrictions
 
@@ -111,9 +112,9 @@ You may also need to on your <span style="color:red"><b>v2.0</b> </span>  Fabric
 Latest Fabric builds are seldom needed except for those working on the very latest Fabric features.
 Some information to help with that can been found in [Developer Instructions](./docs/DeveloperInstructions.md)
 
-## v2.0 builds of Fabric and Fabric-ca needed for the integration test
+## v2.1 builds of Fabric and Fabric-ca needed for the integration test
 
-To get a functioning Fabric v2.0 network needed by the SDK Integration tests.
+To get a functioning Fabric v2.1 network needed by the SDK Integration tests.
 In the directory `src/test/fixture/sdkintegration` issue :
 
 `./fabric.sh restart`
@@ -282,7 +283,7 @@ and execute the following commands:
  * configtxgen --configPath . -outputCreateChannelTx foo.tx -profile TwoOrgsChannel_v13 -channelID foo
  * configtxgen --configPath . -outputCreateChannelTx bar.tx -profile TwoOrgsChannel_v13 -channelID bar
 
-For v2.0 integration, cd to the `src/test/fixture/sdkintegration/e2e-2Orgs/v2.0` directory
+For v2.1 integration, cd to the `src/test/fixture/sdkintegration/e2e-2Orgs/v2.1` directory
  * configtxgen --configPath . -outputCreateChannelTx v2channel.tx -profile TwoOrgsChannel_v20 -channelID v2channel
  * configtxgen --configPath . -outputBlock orderer.block -profile TwoOrgsOrdererGenesis_v20 -channelID systemordererchannel
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.hyperledger.fabric-sdk-java</groupId>
     <artifactId>fabric-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <name>fabric-java-sdk</name>
     <description>Java SDK for Hyperledger fabric project</description>
     <url>https://www.hyperledger.org/community/projects</url>

release_notes/v2.1.0.txt

@@ -0,0 +1,26 @@
+v2.1.0
+------
+
+Release Notes
+-------------
+Updated Java SDK to support Hyperledger Fabric v2.1.
+
+The v2.1.0 release supercedes v2.0.0 and there are minimal changes between them, please see the change log for a full list of updates.
+The release-1.4 branch is currently LTS, please see the proposed Fabric LTS strategy for more information:
+https://github.com/hyperledger/fabric-rfcs/pull/23
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+none
+
+Change Log
+----------
+https://github.com/hyperledger/fabric-sdk-java/blob/master/CHANGELOG.md#v2.1.0

src/test/fixture/sdkintegration/.env

@@ -52,6 +52,15 @@ ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED=false
 FAB_CONFIG_GEN_VERS=v2.0
 V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
 V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
+IMAGE_TAG_FABRIC=:2.0
+IMAGE_TAG_FABRIC_CA=:1.4
+
+##V 2.1
+FAB_CONFIG_GEN_VERS=v2.1
+V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
+V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
+IMAGE_TAG_FABRIC=:2.1
+IMAGE_TAG_FABRIC_CA=:1.4
 
 ## Latest
 #FAB_CONFIG_GEN_VERS=v2.0

src/test/fixture/sdkintegration/javacc/2.0/sample1/build.gradle → src/test/fixture/sdkintegration/javacc/2.1/sample1/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.+'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.+'
 }
 
 shadowJar {

src/test/fixture/sdkintegration/nodecc/sample1/package.json

@@ -13,6 +13,6 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "fabric-shim": "2.0.0"
+        "fabric-shim": "2.1.0"
     }
 }

src/test/fixture/sdkintegration/nodecc/sample_11/package.json

@@ -13,6 +13,6 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "fabric-shim": "2.0.0"
+        "fabric-shim": "2.1.0"
     }
 }

src/test/java/org/hyperledger/fabric/sdk/testutils/TestConfig.java

@@ -91,7 +91,7 @@ public boolean isRunningFabricTLS() {
     private final HashMap<String, SampleOrg> sampleOrgs = new HashMap<>();
 
     private static final String ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION
-            = System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION") == null ? "2.0.0" : System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
+            = System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION") == null ? "2.1.0" : System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
 
     int[] fabricVersion = new int[3];
 

src/test/java/org/hyperledger/fabric/sdkintegration/IntegrationSuite.java

@@ -33,7 +33,7 @@ public class IntegrationSuite {
     static {
         String sdkTestVersion = System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
         if (null == sdkTestVersion) {
-            sdkTestVersion = "2.0";
+            sdkTestVersion = "2.1";
         }
         final String[] fvs = sdkTestVersion.split("\\.");
         if (fvs.length < 2) {
@@ -54,7 +54,7 @@ public class IntegrationSuite {
                 End2endIdemixIT.class, PrivateDataIT.class, ServiceDiscoveryIT.class, HFCAClientIT.class));
         runmap.put("1.4", runmap.get("1.3"));
 
-        runmap.put("2.0", Arrays.asList(End2endIT.class, End2endAndBackAgainIT.class, UpdateChannelIT.class,
+        runmap.put("2.1", Arrays.asList(End2endIT.class, End2endAndBackAgainIT.class, UpdateChannelIT.class,
                 NetworkConfigIT.class, End2endNodeIT.class, End2endJavaIT.class, End2endAndBackAgainNodeIT.class,
                 End2endIdemixIT.class, PrivateDataIT.class, End2endLifecycleIT.class, ServiceDiscoveryIT.class, HFCAClientIT.class));
     }
@@ -87,7 +87,7 @@ public static Path getJavaChaincodePath(String chaincodeName) {
         if (fabricMajorVersion == 1 && fabricMinorVersion == 4) {
             chaincodeRootPath = JAVA_CHAINCODE_PATH.resolve("1.4");
         } else if (fabricMajorVersion == 2) {
-            chaincodeRootPath = JAVA_CHAINCODE_PATH.resolve("2.0");
+            chaincodeRootPath = JAVA_CHAINCODE_PATH.resolve("2.1");
         } else {
             throw new RuntimeException(String.format("Unexpected Fabric version for Java chaincode: %d.%d",
                     fabricMajorVersion, fabricMinorVersion));