From 5fd5256fe33535e046495a8e6b5485953bbd33e7 Mon Sep 17 00:00:00 2001 From: heatherlp <40789053+heatherlp@users.noreply.github.com> Date: Wed, 22 Apr 2020 09:49:41 +0100 Subject: [PATCH] FGJ-81 Release v2.1.0 (#45) * FGJ-81 Release v2.1.0 Signed-off-by: heatherlp * FGJ-81 Use 2.1 fabric images Signed-off-by: heatherlp --- README.md | 10 +++++----- pom.xml | 4 ++-- scripts/pullFabricDockerImages.sh | 6 +++--- src/test/fixtures/chaincode/node/fabcar/package.json | 4 ++-- src/test/fixtures/chaincode/node/marbles0/package.json | 2 +- src/test/fixtures/docker-compose/.env | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 72162ee3..399e1f4c 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ class Sample { ### API documentation Full Javadoc documentation is published for each of the following versions: -- [2.0](https://hyperledger.github.io/fabric-gateway-java/master/) +- [2.1](https://hyperledger.github.io/fabric-gateway-java/master/) - [1.4](https://hyperledger.github.io/fabric-gateway-java/release-1.4/) ### Maven @@ -73,7 +73,7 @@ Add the following dependency to your project's `pom.xml` file: org.hyperledger.fabric fabric-gateway-java - 2.0.0 + 2.1.0 ``` @@ -82,16 +82,16 @@ Add the following dependency to your project's `pom.xml` file: Add the following dependency to your project's `build.gradle` file: ```groovy -implementation 'org.hyperledger.fabric:fabric-gateway-java:2.0.0' +implementation 'org.hyperledger.fabric:fabric-gateway-java:2.1.0' ``` ### Compatibility -The following table shows versions of Fabric, Java and other dependencies that are explicitly tested and that are supported for use with version 2.0 of the Fabric Gateway SDK. Refer to the appropriate GitHub branch for compatibility of other release versions. +The following table shows versions of Fabric, Java and other dependencies that are explicitly tested and that are supported for use with version 2.x of the Fabric Gateway SDK. Refer to the appropriate GitHub branch for compatibility of other release versions. | | Tested | Supported | | --- | ------ | --------- | -| **Fabric** | 2.0 | 2.0.x | +| **Fabric** | 2.1 | 2.0.x | | **Java** | 8, 11 | 8+ | | **Platform** | Ubuntu 18.04 | | diff --git a/pom.xml b/pom.xml index 3669e0f1..377be6f5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.hyperledger.fabric fabric-gateway-java - 2.0.0 + 2.1.0 jar fabric-gateway-java @@ -86,7 +86,7 @@ org.hyperledger.fabric-sdk-java fabric-sdk-java - 2.0.0 + 2.1.0 org.mockito diff --git a/scripts/pullFabricDockerImages.sh b/scripts/pullFabricDockerImages.sh index d0ea9e7e..474a91db 100755 --- a/scripts/pullFabricDockerImages.sh +++ b/scripts/pullFabricDockerImages.sh @@ -4,7 +4,7 @@ set -euo pipefail # Pull images from Hyperledger Artifactory and re-tag to latest for IMAGE in peer orderer ca baseos ccenv javaenv nodeenv tools; do - docker pull "hyperledger-fabric.jfrog.io/fabric-${IMAGE}:amd64-2.0-stable" - docker tag "hyperledger-fabric.jfrog.io/fabric-${IMAGE}:amd64-2.0-stable" "hyperledger/fabric-${IMAGE}:amd64-latest" - docker tag "hyperledger-fabric.jfrog.io/fabric-${IMAGE}:amd64-2.0-stable" "hyperledger/fabric-${IMAGE}" + docker pull "hyperledger-fabric.jfrog.io/fabric-${IMAGE}:amd64-2.1-stable" + docker tag "hyperledger-fabric.jfrog.io/fabric-${IMAGE}:amd64-2.1-stable" "hyperledger/fabric-${IMAGE}:amd64-latest" + docker tag "hyperledger-fabric.jfrog.io/fabric-${IMAGE}:amd64-2.1-stable" "hyperledger/fabric-${IMAGE}" done diff --git a/src/test/fixtures/chaincode/node/fabcar/package.json b/src/test/fixtures/chaincode/node/fabcar/package.json index 16f35618..bc7f1374 100644 --- a/src/test/fixtures/chaincode/node/fabcar/package.json +++ b/src/test/fixtures/chaincode/node/fabcar/package.json @@ -17,8 +17,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "^2.0.0", - "fabric-shim": "^2.0.0" + "fabric-contract-api": "^2.1.0", + "fabric-shim": "^2.1.0" }, "nyc": { "exclude": [ diff --git a/src/test/fixtures/chaincode/node/marbles0/package.json b/src/test/fixtures/chaincode/node/marbles0/package.json index 87a317a3..2b75192a 100644 --- a/src/test/fixtures/chaincode/node/marbles0/package.json +++ b/src/test/fixtures/chaincode/node/marbles0/package.json @@ -12,6 +12,6 @@ "engine-strict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "^2.0.0" + "fabric-shim": "^2.1.0" } } diff --git a/src/test/fixtures/docker-compose/.env b/src/test/fixtures/docker-compose/.env index 18f85d47..4fad95eb 100644 --- a/src/test/fixtures/docker-compose/.env +++ b/src/test/fixtures/docker-compose/.env @@ -1,3 +1,3 @@ -DOCKER_IMG_TAG=:2.0 +DOCKER_IMG_TAG=:2.1 FABRIC_CA_TAG=:latest THIRDPARTY_IMG_TAG=:0.4.16