Merge pull request #195 from kemi04/release-2.2

mbwhite · web-flow · commit 01d14933815b · 2021-07-23T11:46:23.000+01:00
release-2.2.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v2.2.3
+Fri 23 Jul 2021 10:18:58 BST
+
+* [1f6423e3](https://github.com/hyperledger/fabric-chaincode-java/commit/1f6423e3) Integration tests extended
+* [4ae67524](https://github.com/hyperledger/fabric-chaincode-java/commit/4ae67524) Tweak coverage limits
+* [52e78b55](https://github.com/hyperledger/fabric-chaincode-java/commit/52e78b55) NettyGrpcServer -- support mutual TLS
+
 ## v2.2.2
 Mon  7 Jun 2021 11:35:03 BST
 
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@
 
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
-version = '2.2.2'
+version = '2.2.3'
 allprojects {
     repositories {
         mavenCentral()
diff --git a/examples/fabric-contract-example-external/build.gradle b/examples/fabric-contract-example-external/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.+'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.3'
     compile group: 'org.json', name: 'json', version: '20180813'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.11.1'
diff --git a/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts b/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts
@@ -19,7 +19,7 @@ java {
 
 
 dependencies {
-    implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.2")
+    implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.3")
     implementation("org.json:json:20180813")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
            
diff --git a/examples/fabric-contract-example-gradle/build.gradle b/examples/fabric-contract-example-gradle/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.2'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.3'
     compile group: 'org.json', name: 'json', version: '20180813'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.11.1'
diff --git a/examples/fabric-contract-example-maven/pom.xml b/examples/fabric-contract-example-maven/pom.xml
@@ -12,7 +12,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- fabric-chaincode-java -->
-		<fabric-chaincode-java.version>2.2.2</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>2.2.3</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>
diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle
@@ -71,6 +71,6 @@ task copyAllDeps(type: Copy) {
 task buildImage(type: DockerBuildImage) {
     dependsOn copyAllDeps
     inputDir = project.file('Dockerfile').parentFile
-    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-2.2.2', 'hyperledger/fabric-javaenv:amd64-latest']
+    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-2.2.3', 'hyperledger/fabric-javaenv:amd64-latest']
 }
 
diff --git a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle
@@ -15,8 +15,8 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.2'
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.2.2'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.3'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.2.3'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
diff --git a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml
@@ -12,7 +12,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- fabric-chaincode-java -->
-		<fabric-chaincode-java.version>2.2.2</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>2.2.3</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>
diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle
@@ -15,8 +15,8 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.2'
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.2.2'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.3'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.2.3'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
diff --git a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml
@@ -12,7 +12,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- fabric-chaincode-java -->
-		<fabric-chaincode-java.version>2.2.2</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>2.2.3</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>
diff --git a/release_notes/v2.2.3.txt b/release_notes/v2.2.3.txt
@@ -0,0 +1,22 @@
+v2.2.3
+--------------------------
+
+Release Notes
+-------------
+This v2.2.3 Release is a bug fix release of the release-2.2 branch
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+none
+
+Change Log
+----------
+https://github.com/hyperledger/fabric-chaincode-java/blob/release-2.x/CHANGELOG.md#v222

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ repositories {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`
`23`		`- compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.+'`
	`23`	`+ compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.3'`
`24`	`24`	`compile group: 'org.json', name: 'json', version: '20180813'`
`25`	`25`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'`
`26`	`26`	`testImplementation 'org.assertj:assertj-core:3.11.1'`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,6 @@ task copyAllDeps(type: Copy) {`
`71`	`71`	`task buildImage(type: DockerBuildImage) {`
`72`	`72`	`dependsOn copyAllDeps`
`73`	`73`	`inputDir = project.file('Dockerfile').parentFile`
`74`		`- tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-2.2.2', 'hyperledger/fabric-javaenv:amd64-latest']`
	`74`	`+ tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-2.2.3', 'hyperledger/fabric-javaenv:amd64-latest']`
`75`	`75`	`}`
`76`	`76`