From 55ae964e2dfa6cac03cb751503ac2bcdaac5ce02 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Fri, 26 Nov 2021 08:23:38 +0000 Subject: [PATCH] Release 2.4 Signed-off-by: Matthew B White --- CHANGELOG.md | 5 +++++ build.gradle | 2 +- .../build.gradle.kts | 2 +- .../build.gradle | 2 +- .../fabric-contract-example-maven/pom.xml | 2 +- fabric-chaincode-docker/build.sh | 2 +- .../src/contracts/bare-gradle/build.gradle | 4 ++-- .../src/contracts/bare-maven/pom.xml | 2 +- .../contracts/fabric-ledger-api/build.gradle | 2 +- .../contracts/fabric-shim-api/build.gradle | 4 ++-- .../src/contracts/wrapper-maven/pom.xml | 2 +- release_notes/v2.4.0.txt | 22 +++++++++++++++++++ 12 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 release_notes/v2.4.0.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ded5cc3..c30df179 100644 --- 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 index 618375e6..47384ea1 100644 --- 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 index 400344a5..c3e26ecd 100644 --- 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 index 0189afea..d1647375 100644 --- 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 index 2d887bc0..af57c6db 100644 --- a/examples/fabric-contract-example-maven/pom.xml +++ b/examples/fabric-contract-example-maven/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.4.0-beta + 2.4.0 1.2.0 diff --git a/fabric-chaincode-docker/build.sh b/fabric-chaincode-docker/build.sh index 5d78c1ed..b774cc8b 100644 --- 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 index e794a046..42cc0b38 100644 --- 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 index 2d887bc0..af57c6db 100644 --- 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 @@ UTF-8 - 2.4.0-beta + 2.4.0 1.2.0 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 index 8d713459..ca24d22d 100644 --- 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 index e794a046..42cc0b38 100644 --- 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 index 0e5db2c9..667bcb16 100644 --- 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 @@ UTF-8 - 2.4.0-beta + 2.4.0 1.0.13 diff --git a/release_notes/v2.4.0.txt b/release_notes/v2.4.0.txt new file mode 100644 index 00000000..1d1dd1ea --- /dev/null +++ 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