Merge pull request #212 from mbwhite/release-2.4

mbwhite · web-flow · commit d596ec869917 · 2021-11-26T13:39:05.000Z
Release 2.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.4.0
+Fri Nov 26 08:21:40 GMT 2021
+
+Release 2.4.0 
+
 ## v2.4.0-beta
 Fri 13 Aug 2021 16:43:31 CEST
 
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@
 
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
-version = '2.4.0-beta'
+version = '2.4.0'
 
 
 // If the nightly property is set, then this is the scheduled main 
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.4.0-beta")
+    implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.0")
     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.4.0-beta'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0'
     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.4.0-beta</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>2.4.0</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.2.0</logback.version>
diff --git a/fabric-chaincode-docker/build.sh b/fabric-chaincode-docker/build.sh
@@ -4,7 +4,7 @@ set -ex
 INPUT_DIR=/chaincode/input
 OUTPUT_DIR=/chaincode/output
 TMP_DIR=$(mktemp -d)
-JARS=$(find ${INPUT_DIR} -name ".jar" | paste -s -d ":" -)
+
 NUM_JARS=$(find ${INPUT_DIR} -name "*.jar" | wc -l)
 
 buildGradle() {
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.4.0-beta'
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.4.0-beta'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.4.0'
     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.4.0-beta</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>2.4.0</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.2.0</logback.version>
diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0-beta'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
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.4.0-beta'
-    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.4.0-beta'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0'
+    implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-protos', version: '2.4.0'
     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.4.0-beta</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>2.4.0</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>
diff --git a/release_notes/v2.4.0.txt b/release_notes/v2.4.0.txt
@@ -0,0 +1,22 @@
+v2.4.0
+--------------------------
+
+Release Notes
+-------------
+This v2.4.0 Release is to support the Fabric v2.4 release. 
+
+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#v240

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.4.0-beta'`
	`23`	`+ compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0'`
`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
`@@ -15,7 +15,7 @@ repositories {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`dependencies {`
`18`		`- implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0-beta'`
	`18`	`+ implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.4.0'`
`19`	`19`	`testImplementation group: 'junit', name: 'junit', version: '4.12'`
`20`	`20`	`}`
`21`	`21`