From ad8fc2fba73e951b460dab8d915be93a76f22b22 Mon Sep 17 00:00:00 2001 From: Justin Yang <90252834+justin-themedium@users.noreply.github.com> Date: Mon, 1 Nov 2021 17:40:29 +0900 Subject: [PATCH] =?UTF-8?q?test-network:=20Make=20the=20regexp=20of=20chec?= =?UTF-8?q?king=20version=20more=20strict=20(backpo=E2=80=A6=20(#516)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated dependencies for Json and fabric-chaincode-shim:2.+ in java samples (#481) * fixed json dependencies for java Signed-off-by: fraVlaca * updated dependency for asset-tranfer-sbe: now declaing also org.hyperledger.fabric.protos.common Signed-off-by: fraVlaca * "corrected typo of last commit and added testImplementation 'org.hyperledger.fabric.protos.common'" Signed-off-by: fraVlaca * included correct dependecy for fabric-protos and added com.google.protobuf as well Signed-off-by: fraVlaca Signed-off-by: Justin Yang * test-network: Make the regexp of checking version more strict (backport #515) Signed-off-by: Justin Yang * Updated dependencies fabric-chaincode-shim:2.2.+ in java samples from 2.+ Signed-off-by: Justin Yang Co-authored-by: fraVlaca <86831094+fraVlaca@users.noreply.github.com> --- asset-transfer-basic/chaincode-java/build.gradle | 7 ++++--- asset-transfer-events/chaincode-java/build.gradle | 7 ++++--- .../chaincode-java/build.gradle | 9 +++++---- asset-transfer-sbe/chaincode-java/build.gradle | 10 +++++++--- test-network/network.sh | 4 ++-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/asset-transfer-basic/chaincode-java/build.gradle b/asset-transfer-basic/chaincode-java/build.gradle index 5f90c5ac..1b28865f 100644 --- a/asset-transfer-basic/chaincode-java/build.gradle +++ b/asset-transfer-basic/chaincode-java/build.gradle @@ -12,10 +12,11 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - compileOnly 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' + implementation 'org.json:json:+' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' diff --git a/asset-transfer-events/chaincode-java/build.gradle b/asset-transfer-events/chaincode-java/build.gradle index f68178d0..9f7fca66 100644 --- a/asset-transfer-events/chaincode-java/build.gradle +++ b/asset-transfer-events/chaincode-java/build.gradle @@ -12,8 +12,9 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - compileOnly 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' + implementation 'org.json:json:+' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' } repositories { @@ -48,4 +49,4 @@ jacocoTestReport { dependsOn test } -installDist.dependsOn check \ No newline at end of file +installDist.dependsOn check diff --git a/asset-transfer-private-data/chaincode-java/build.gradle b/asset-transfer-private-data/chaincode-java/build.gradle index bb48d5b6..327a21fe 100644 --- a/asset-transfer-private-data/chaincode-java/build.gradle +++ b/asset-transfer-private-data/chaincode-java/build.gradle @@ -12,10 +12,11 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - compileOnly 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' + implementation 'org.json:json:+' + + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' @@ -59,4 +60,4 @@ test { } } -installDist.dependsOn check \ No newline at end of file +installDist.dependsOn check diff --git a/asset-transfer-sbe/chaincode-java/build.gradle b/asset-transfer-sbe/chaincode-java/build.gradle index 5f90c5ac..3d5b72ac 100644 --- a/asset-transfer-sbe/chaincode-java/build.gradle +++ b/asset-transfer-sbe/chaincode-java/build.gradle @@ -12,10 +12,14 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - compileOnly 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' + implementation 'org.json:json:+' + implementation 'com.google.protobuf:protobuf-java:3.+' + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-protos:2.2.+' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.2.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' diff --git a/test-network/network.sh b/test-network/network.sh index 0768cd66..66fe0493 100755 --- a/test-network/network.sh +++ b/test-network/network.sh @@ -61,8 +61,8 @@ function checkPrereqs() { fi # use the fabric tools container to see if the samples and binaries match your # docker images - LOCAL_VERSION=$(peer version | sed -ne 's/ Version: //p') - DOCKER_IMAGE_VERSION=$(docker run --rm hyperledger/fabric-tools:$IMAGETAG peer version | sed -ne 's/ Version: //p' | head -1) + LOCAL_VERSION=$(peer version | sed -ne 's/^ Version: //p') + DOCKER_IMAGE_VERSION=$(docker run --rm hyperledger/fabric-tools:$IMAGETAG peer version | sed -ne 's/^ Version: //p') infoln "LOCAL_VERSION=$LOCAL_VERSION" infoln "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION"