Skip to content

Commit 2be9de1

Browse files
mbwhitembwhite
authored
Merge pull request #101 from jt-nti/283-prepare-release
[FABCJ-283] Prepare release 2.1
2 parents b4434a2 + 0853a6b commit 2be9de1

File tree

6 files changed

+77
-36
lines changed

6 files changed

+77
-36
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v2.1.0
2+
Thu 9 Apr 2020 14:13:36 BST
3+
4+
* [72e6f78](https://github.com/hyperledger/fabric-chaincode-java/commit/72e6f78) [FABCJ-283](https://jira.hyperledger.org/browse/FABCJ-283) Update docker image version
5+
* [54606f8](https://github.com/hyperledger/fabric-chaincode-java/commit/54606f8) [FABCJ-269](https://jira.hyperledger.org/browse/FABCJ-269) Compatibility Matrix
6+
17
## v2.0.1
28
Wed 4 Mar 16:38:58 GMT 2020
39

‎COMPATIBILITY.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ Github is used for code base management, issues should reported in the [FABCJ](h
55

66
## Summary of Compatibility
77

8-
This table shows the summary of the compatibility of the Java libraries at versions 1.4 and 2.0, together with the JVM version they require and the Fabric Peer versions they can communicate with.
8+
This table shows the summary of the compatibility of the Java libraries at versions 1.4 and 2.1, together with the JVM version they require and the Fabric Peer versions they can communicate with.
99

10-
| | Fabric Peer v1.4 connectivity | Java 8 VM | Fabric Peer v2.0 Connectivity | Java 11 VM |
10+
| | Fabric Peer v1.4 connectivity | Java 8 VM | Fabric Peer v2.1 Connectivity | Java 11 VM |
1111
| ----------------------- | ----------------------------- | --------- | ----------------------------- | ---------- |
1212
| Java libraries **v1.4** | Yes | Yes | Yes | Yes |
13-
| Java libraries **v2.0** | Yes | No | Yes | Yes |
13+
| Java libraries **v2.1** | Yes | No | Yes | Yes |
1414

1515
Testing is performed with
1616
- Java v8: Openjdk version 1.8.0_222
1717
- Java v11: Openjdk version 11.04_11
1818

19-
By default a Fabric Peer v1.4 will create a Java 8 VM, and a Fabric Peer v2.0 will create a Java 11 VM. Whilst is the default, the docker image used to host the chaincode and contracts can be altered. Set the environment variable `CORE_CHAINCODE_JAVA_RUNTIME` on the peer to the name of the docker image. For example `CORE_CHAINCODE_JAVA_RUNTIME=example/customJavaRuntime:latest`
19+
By default a Fabric Peer v1.4 will create a Java 8 VM, and a Fabric Peer v2.1 will create a Java 11 VM. Whilst is the default, the docker image used to host the chaincode and contracts can be altered. Set the environment variable `CORE_CHAINCODE_JAVA_RUNTIME` on the peer to the name of the docker image. For example `CORE_CHAINCODE_JAVA_RUNTIME=example/customJavaRuntime:latest`
2020

21-
The Java Libraries will connect to the peer whilst running; this is referred to as 'Fabric Peer Connectivity' in the table. For example, whilst the Fabric Peer v1.4 will create a Java 8 environment, if a Java 11 environment was configured, the Java Libraries at v2.0.0 still function when connecting to the Fabric Peer v1.4.
21+
The Java Libraries will connect to the peer whilst running; this is referred to as 'Fabric Peer Connectivity' in the table. For example, whilst the Fabric Peer v1.4 will create a Java 8 environment, if a Java 11 environment was configured, the Java Libraries at v2.1.0 still function when connecting to the Fabric Peer v1.4.
2222

2323
## Compatibility
2424

@@ -28,26 +28,26 @@ The key elements are : 
2828
- the version of the JVM used to run the code
2929
- When starting a chaincode container to run a Smart Contract the version of the runtime that is used is determined by these factors:
3030

31-
Fabric v1.4.2, and Fabric v2.0.0 will, by default, start up docker image to host the chaincode and contracts. The version of the docker image used is defined by the version of Fabric in use.
31+
Fabric v1.4.2, and Fabric v2.1.0 will, by default, start up docker image to host the chaincode and contracts. The version of the docker image used is defined by the version of Fabric in use.
3232

33-
With Fabric v2.0.0, the chaincode container can be configured to be started by other means, and not the Peer. In this case, the environment used is not in the control of Fabric.
33+
With Fabric v2.1.0, the chaincode container can be configured to be started by other means, and not the Peer. In this case, the environment used is not in the control of Fabric.
3434

3535
The Java libraries are produced are `group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim'`
3636

3737
### Supported JVMs
3838

39-
v1.4.x and v2.0.0 Java Libraries are supported running in Java 11 with the x86_64 architecture. Later Java 11 versions are supported but are not tested.
39+
v1.4.x and v2.1.0 Java Libraries are supported running in Java 11 with the x86_64 architecture. Later Java 11 versions are supported but are not tested.
4040

4141
v1.4.x Java Libraries are supported running in Java 8 with the  x86_64 architecture. Later Java 8 versions are supported but are not tested.
4242

4343
Architecture Support: all docker images, JVMs, tools are tested under x86_64 ONLY
4444

4545
### Default Peer Runtime selection
4646

47-
When using Fabric 2.0.0, the default docker image that is used to run the Java chaincode is *openjdk11:jdk-11.04_11-alpine*
47+
When using Fabric 2.1.0, the default docker image that is used to run the Java chaincode is *openjdk11:jdk-11.04_11-alpine*
4848

49-
With the default docker image used by Fabric 2.0.0. should the packaged Java code contains a maven or gradle build script, it will be built using Gradle 5.6.2, or Maven 3.6.2 (if both Gradle and Maven files are present Gradle is used. Gradle build files can be groovy, or kotlin. If the Gradle wrapper is present, this will used in preference to the installed version of Gradle)
49+
With the default docker image used by Fabric 2.1.0. should the packaged Java code contains a maven or gradle build script, it will be built using Gradle 5.6.2, or Maven 3.6.2 (if both Gradle and Maven files are present Gradle is used. Gradle build files can be groovy, or kotlin. If the Gradle wrapper is present, this will used in preference to the installed version of Gradle)
5050

5151
### Supported Runtime communication with the Peer
5252

53-
Subject to a suitable runtime environment, the 1.4.4 and 2.0.0 Java Libraries can used to communicate with a Fabric 2.0.0 or 1.4.4 Peer - with the level of functionality that is implied by the Fabric version in use. 
53+
Subject to a suitable runtime environment, the 1.4.4 and 2.1.0 Java Libraries can used to communicate with a Fabric 2.1.0 or 1.4.4 Peer - with the level of functionality that is implied by the Fabric version in use. 

‎ci/azure-pipelines.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ schedules:
1313
displayName: "Chaincode Java Nightly Driver"
1414
branches:
1515
include:
16-
- "release-2.0"
16+
- "release-2.x"
1717
always: true
1818

1919
trigger:
2020
branches:
2121
include:
22-
- "release-2.0"
22+
- "release-2.x"
2323
tags:
2424
include:
2525
- "*"
@@ -50,9 +50,11 @@ pool:
5050
stages:
5151
- stage: Build_and_test
5252
jobs:
53-
- job: main
54-
steps:
53+
- job: displayenv
54+
steps:
5555
- template: templates/build-data.yml
56+
- job: main
57+
steps:
5658
- task: Gradle@2
5759
inputs:
5860
workingDirectory: ""
@@ -117,7 +119,13 @@ stages:
117119
artifactName: javaenv-docker-image
118120

119121
- job: javadoc
122+
dependsOn: displayenv
120123
condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
124+
variables:
125+
${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
126+
javadoc_release: master
127+
${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}:
128+
javadoc_release: release-$(BuildData.MINOR_PACKAGE_VERSION)
121129
steps:
122130
- script: ./gradlew javadoc
123131
displayName: 'Build JavaDoc'
@@ -131,9 +139,9 @@ stages:
131139
- script: |
132140
git fetch origin
133141
git checkout -b gh-pages origin/gh-pages
134-
mkdir -p $(Build.SourceBranchName)/api
135-
rm -rf $(Build.SourceBranchName)/api/*
136-
cp -r fabric-chaincode-shim/build/docs/javadoc/* $(Build.SourceBranchName)/api
142+
mkdir -p $(javadoc_release)/api
143+
rm -rf $(javadoc_release)/api/*
144+
cp -r fabric-chaincode-shim/build/docs/javadoc/* $(javadoc_release)/api
137145
138146
# if the gh-pages is present from the previous script, then copy across the files across.
139147
if [ -d gh-pages ]; then

‎ci/templates/build-data.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ steps:
22
- script: |
33
env | sort
44
java -version
5+
# handle full version number
56
VERSION=$(./gradlew -q printVersionName | head -n 1 | cut -d'-' -f1)
67
VERSION=${VERSION// }
78
echo Current version in code is :${VERSION}:
89
echo "##vso[task.setvariable variable=PACKAGE_VERSION;isOutput=true]${VERSION}"
10+
# handle minor version
11+
MINOR_VERSION=$(echo $VERSION | sed 's/^\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
12+
MINOR_VERSION=${MINOR_VERSION// }
13+
echo Current minor version in code is :${MINOR_VERSION}:
14+
echo "##vso[task.setvariable variable=MINOR_PACKAGE_VERSION;isOutput=true]${MINOR_VERSION}"
915
name: BuildData
1016
displayName: 'Build data'

‎docs/_includes/header.html‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,19 @@
33
<div class="wrapper">
44
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
55

6-
{%- assign num_releases = site.releases | size -%}
7-
{%- if num_releases > 0 -%}
8-
<nav class="site-nav">
9-
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
10-
<label for="nav-trigger">
11-
<span class="menu-icon">
12-
<svg viewBox="0 0 18 15" width="18px" height="15px">
13-
<path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
14-
</svg>
15-
</span>
16-
</label>
6+
<nav class="site-nav">
7+
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
8+
<label for="nav-trigger">
9+
<span class="menu-icon">
10+
<svg viewBox="0 0 18 15" width="18px" height="15px">
11+
<path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
12+
</svg>
13+
</span>
14+
</label>
1715

18-
<div class="trigger">
19-
{%- for release in site.releases -%}
20-
<a class="page-link" href="https://github.com/hyperledger/fabric-chaincode-java/tree/{{ release }}">{{ release | escape }}</a>
21-
{%- endfor -%}
22-
</div>
23-
</nav>
24-
{%- endif -%}
16+
<div class="trigger">
17+
<a class="page-link" href="https://github.com/hyperledger/fabric-chaincode-java/">View on GitHub</a>
18+
</div>
19+
</nav>
2520
</div>
2621
</header>

‎release_notes/v2.1.0.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
v2.0.1 4 March 2020
2+
--------------------------
3+
4+
Release Notes
5+
-------------
6+
There are minimal changes between v2.0.0 and v2.1.0, please see the change log for a full list of updates.
7+
8+
The release-2.0 branch has been renamed to release-2.x; the v2.1.0 release supercedes v2.0.0.
9+
The release-1.4 branch is currently LTS, please see the proposed Fabric LTS strategy for more information:
10+
https://github.com/hyperledger/fabric-rfcs/pull/23
11+
12+
Known Vulnerabilities
13+
---------------------
14+
none
15+
16+
Resolved Vulnerabilities
17+
------------------------
18+
none
19+
20+
Known Issues & Workarounds
21+
--------------------------
22+
none
23+
24+
Change Log
25+
----------
26+
https://github.com/hyperledger/fabric-chaincode-java/blob/release-2.x/CHANGELOG.md#v210

0 commit comments

Comments
 (0)