Skip to content

Commit

Permalink
FGJ-81 Release v2.1.0 (#45)
Browse files Browse the repository at this point in the history
* FGJ-81 Release v2.1.0

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

* FGJ-81 Use 2.1 fabric images

Signed-off-by: heatherlp <[email protected]>
  • Loading branch information
heatherlp authored Apr 22, 2020
1 parent 2ca7041 commit 5fd5256
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -73,7 +73,7 @@ Add the following dependency to your project's `pom.xml` file:
<dependency>
<groupId>org.hyperledger.fabric</groupId>
<artifactId>fabric-gateway-java</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</dependency>
```

Expand All @@ -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 | |

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.hyperledger.fabric</groupId>
<artifactId>fabric-gateway-java</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
<packaging>jar</packaging>

<name>fabric-gateway-java</name>
Expand Down Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>org.hyperledger.fabric-sdk-java</groupId>
<artifactId>fabric-sdk-java</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
6 changes: 3 additions & 3 deletions scripts/pullFabricDockerImages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/test/fixtures/chaincode/node/fabcar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion src/test/fixtures/chaincode/node/marbles0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "^2.0.0"
"fabric-shim": "^2.1.0"
}
}
2 changes: 1 addition & 1 deletion src/test/fixtures/docker-compose/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DOCKER_IMG_TAG=:2.0
DOCKER_IMG_TAG=:2.1
FABRIC_CA_TAG=:latest
THIRDPARTY_IMG_TAG=:0.4.16

0 comments on commit 5fd5256

Please sign in to comment.