[FABCJ-273] Release 2.0.0

Release version 2.0.0

Signed-off-by: Matthew B White <[email protected]>

CHANGELOG.md

@@ -1,3 +1,14 @@
+## v2.0.0
+Fri 24 Jan 10:26:03 GMT 2020
+
+* [659a1c4](https://github.com/hyperledger/fabric-chaincode-java/commit/659a1c4) Port fixes from master branch for Coverage & typos
+* [9cf1e6a](https://github.com/hyperledger/fabric-chaincode-java/commit/9cf1e6a) [FABCI-482](https://jira.hyperledger.org/browse/FABCI-482) Update Nexus URL's to Artifactory
+* [7ab7145](https://github.com/hyperledger/fabric-chaincode-java/commit/7ab7145) Fix typos in README.md
+* [67fdc40](https://github.com/hyperledger/fabric-chaincode-java/commit/67fdc40) [FABCJ-259](https://jira.hyperledger.org/browse/FABCJ-259) Pagination Fix
+* [1609425](https://github.com/hyperledger/fabric-chaincode-java/commit/1609425) Update maintainers list
+* [1a45e3d](https://github.com/hyperledger/fabric-chaincode-java/commit/1a45e3d) [FABCJ-95](https://jira.hyperledger.org/browse/FABCJ-95) Checkstyle
+
+
 ## v2.0.0-beta
 Thu 12 Dec 12:45:44 GMT 2019
 

build.gradle

@@ -6,7 +6,7 @@
 
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
-version = '2.0.0-beta.1'
+version = '2.0.0'
 allprojects {
     repositories {
         mavenCentral()

ci/azure-pipelines.yml

@@ -13,13 +13,13 @@ schedules:
     displayName: "Chaincode Java Nightly Driver"
     branches:
       include:
-        - master
+        - "release-2.0"
     always: true
 
 trigger:
   branches:
     include:
-      - "master"
+      - "release-2.0"
   tags:
     include:
       - "*"
@@ -134,6 +134,8 @@ stages:
               mkdir -p $(Build.SourceBranchName)/api
               rm -rf $(Build.SourceBranchName)/api/*
               cp -r fabric-chaincode-shim/build/docs/javadoc/* $(Build.SourceBranchName)/api
+
+              # if the gh-pages is present from the previous script, then copy across the files across.
               if [ -d gh-pages ]; then
                 find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'master' -o -name 'release-*' \) -exec rm -rf {} \;
                 cp -r gh-pages/* .
@@ -153,17 +155,13 @@ stages:
   - stage: Publish_tag
     condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
     jobs:
-      - job: publish_release
+      - job: docker_publish
         steps:
           - template: templates/build-data.yml
           - task: DownloadPipelineArtifact@2
             inputs:
               artifact: javaenv-docker-image
               path: $(Build.SourcesDirectory)/build
-          - task: DownloadSecureFile@1
-            name: keyring
-            inputs:
-              secureFile: secring.gpg
           - script: |
               wget -qO "$PWD/manifest-tool" https://github.com/estesp/manifest-tool/releases/download/v1.0.0/manifest-tool-linux-amd64
               chmod +x ./manifest-tool   
@@ -173,14 +171,21 @@ stages:
               docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
               echo "Logged in to docker registry"
               # tag javaenv image to PACKAGE_VERSION
-              docker tag hyperledger/fabric-javaenv fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)-beta
+              docker tag hyperledger/fabric-javaenv hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)
               # push javaenv to repository
               docker push hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)
-              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)-beta" --target "hyperledger/fabric-javaenv:$(BuildData.PACKAGE_VERSION)-beta"
-              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)-beta" --target "hyperledger/fabric-javaenv:2.0"              
+              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-javaenv:$(BuildData.PACKAGE_VERSION)"
+              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-javaenv:2.0"              
             env:
               DOCKER_REGISTRY_USERNAME: $(DockerHub-Username)
               DOCKER_REGISTRY_PASSWORD: $(DockerHub-Password)
+      - job: jar_publish
+        steps:
+          - template: templates/build-data.yml
+          - task: DownloadSecureFile@1
+            name: keyring
+            inputs:
+              secureFile: secring.gpg
           - script: |
               ./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=${KEYRING_FILE} -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} uploadArchives
             env:

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.0.0-beta.1'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.0.0'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

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.0.0-beta.1'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.0.0'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

release_notes/v2.0.0.txt

@@ -0,0 +1,29 @@
+v2.0.0 20 January 2020
+--------------------------
+
+Release Notes
+-------------
+Java chaincode v2.0.0 includes multiple improvements:
+
+Javaenv docker images is now based on Alpine to reduce the size.
+Integration tests have been improved.
+Java chaincode extra validation during start.
+Added support for maven projects.
+
+adoptopenjdk/openjdk11:jdk-11.0.4_11-alpine is now used instead of baseimage for the basis of javaenv Docker image.
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+none
+
+Change Log
+----------
+https://github.com/hyperledger/fabric-chaincode-java/blob/master/CHANGELOG.md#v200

scripts/changelog.sh

@@ -4,11 +4,19 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+set -ev
 
+PREVIOUS_TAG=$1
+NEW_VERSION=$2
 
-echo "## $2\n$(date)" >> CHANGELOG.new
+: ${PREVIOUS_TAG:?}
+: ${NEW_VERSION:?}
+
+echo "## ${NEW_VERSION}" >> CHANGELOG.new
+echo "$(date)" >> CHANGELOG.new
 echo "" >> CHANGELOG.new
-git log $1..HEAD  --oneline | grep -v Merge | sed -e "s/\[\(FAB-[0-9]*\)\]/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/ \(FAB-[0-9]*\)/ \[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric-chaincode-java\/commit\/\1)/" >> CHANGELOG.new
+git log ${PREVIOUS_TAG}..HEAD  --oneline | grep -v Merge | sed -e "s/\[\{0,1\}\(FAB[^0-9]*-[0-9]*\)\]\{0,1\}/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric-chaincode-java\/commit\/\1)/" >> CHANGELOG.new
 echo "" >> CHANGELOG.new
 cat CHANGELOG.md >> CHANGELOG.new
 mv -f CHANGELOG.new CHANGELOG.md
+