From 93ff6bbf852bd6cbe5903c70cb529887ad246938 Mon Sep 17 00:00:00 2001 From: heatherlp Date: Tue, 14 Apr 2020 15:10:38 +0100 Subject: [PATCH] FABCJ-283 Bump version number to 2.1.1 - Also fixed lines in azure-pipelines Signed-off-by: heatherlp --- build.gradle | 2 +- ci/azure-pipelines.yml | 2 +- fabric-chaincode-docker/build.gradle | 2 +- .../src/contracts/fabric-chaincode-example-sacc/build.gradle | 2 +- .../src/contracts/fabric-chaincode-example-sbe/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8a406574..8b04e2fb 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'idea' apply plugin: 'eclipse-wtp' -version = '2.1.0' +version = '2.1.1' allprojects { repositories { mavenCentral() diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index f16fab0b..dfd6b53a 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -125,7 +125,7 @@ stages: ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}: javadoc_release: master ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}: - javadoc_release: release-$(BuildData.MINOR_PACKAGE_VERSION) + javadoc_release: $[format('release-{0}',dependencies.displayenv.outputs['BuildData.MINOR_PACKAGE_VERSION'])] steps: - script: ./gradlew javadoc displayName: 'Build JavaDoc' diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle index d8901232..abb178b8 100644 --- 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.1.0', 'hyperledger/fabric-javaenv:amd64-latest'] + tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-2.1.1', 'hyperledger/fabric-javaenv:amd64-latest'] } diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sacc/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sacc/build.gradle index 596551a6..94d6f09c 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sacc/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sacc/build.gradle @@ -14,7 +14,7 @@ repositories { } dependencies { - compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.1.0' + compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.1.1' testCompile group: 'junit', name: 'junit', version: '4.12' } diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sbe/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sbe/build.gradle index 89fee105..e0085359 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sbe/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sbe/build.gradle @@ -14,7 +14,7 @@ repositories { } dependencies { - compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.1.0' + compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.1.1' testCompile group: 'junit', name: 'junit', version: '4.12' }