[FABCJ-270] Prepare release 1.4.6

mbwhite · jt-nti · commit 88e2da209e79 · 2020-01-17T14:37:28.000Z
- version update
- template releases notes
- add mising ) to JAR release script
- align docker image tagging with other branches

Signed-off-by: Matthew B White &lt;whitemat@uk.ibm.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'com.dorongold.task-tree'
-version = '1.4.5'
+version = '1.4.6'
 buildscript {
   repositories {
     maven {
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -128,7 +128,8 @@ stages:
             inputs:
               secureFile: secring.gpg
           - script: |
-              env | sort
+              wget -qO "$PWD/manifest-tool" https://github.com/estesp/manifest-tool/releases/download/v1.0.0/manifest-tool-linux-amd64
+              chmod +x ./manifest-tool   
 
               # temporarily use this approach instead of the gittag
               VERSION=$(cat build.gradle |  sed -n "s/version =.*'\(.*\)\(-SNAPSHOT\)\?'/\1/p")  
@@ -140,18 +141,22 @@ stages:
               docker images
               docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
               echo "Logged in to docker registry"
-              # tag javaenv image to $PUSH_VERSION
+
+              # tag javaenv image 
               docker tag hyperledger/fabric-javaenv fabric-javaenv:amd64-${VERSION}
+              
               # push javaenv to repository
               docker push hyperledger/fabric-javaenv:amd64-${VERSION}
+              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${VERSION}" --target "hyperledger/fabric-javaenv:${VERSION}"
+              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${VERSION}" --target "hyperledger/fabric-javaenv:1.4"                            
             env:
               DOCKER_REGISTRY_USERNAME: $(DockerHub-Username)
               DOCKER_REGISTRY_PASSWORD: $(DockerHub-Password)
           - script: |
               env | sort
 
               # temporarily use this approach instead of the gittag
-              VERSION=$(cat build.gradle |  sed -n "s/version =.*'\(.*\)\(-SNAPSHOT\)\?'/\1/p"  
+              VERSION=$(cat build.gradle |  sed -n "s/version =.*'\(.*\)\(-SNAPSHOT\)\?'/\1/p")  
               VERSION=${VERSION// }
               echo Version is :${VERSION}:
               
diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle
@@ -80,6 +80,6 @@ task copyAllDeps(type: Copy) {
 task buildImage(type: DockerBuildImage) {
     dependsOn copyAllDeps
     inputDir = project.file('Dockerfile').parentFile
-    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.5', 'hyperledger/fabric-javaenv:amd64-latest']
+    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.6', 'hyperledger/fabric-javaenv:amd64-latest']
 }
 
diff --git a/fabric-chaincode-example-gradle/build.gradle b/fabric-chaincode-example-gradle/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
diff --git a/fabric-chaincode-example-maven/pom.xml b/fabric-chaincode-example-maven/pom.xml
@@ -12,7 +12,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- fabric-chaincode-java -->
-		<fabric-chaincode-java.version>1.4.5</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>1.4.6</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>
diff --git a/fabric-chaincode-example-sacc/build.gradle b/fabric-chaincode-example-sacc/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
diff --git a/fabric-chaincode-example-sbe/build.gradle b/fabric-chaincode-example-sbe/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
diff --git a/fabric-chaincode-integration-test/build.gradle b/fabric-chaincode-integration-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     compile project(':fabric-chaincode-docker')
     testCompile 'org.testcontainers:testcontainers:1.7.1'
-    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.5'
+    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.6'
     compile project(':fabric-chaincode-shim')
     implementation group: 'org.json', name: 'json', version: '20180813'
 }
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
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'
     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
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
diff --git a/fabric-contract-example/gradle/build.gradle b/fabric-contract-example/gradle/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'
     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/fabric-contract-example/maven/pom.xml b/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>1.4.5</fabric-chaincode-java.version>
+		<fabric-chaincode-java.version>1.4.6</fabric-chaincode-java.version>
 
 		<!-- Logging -->
 		<logback.version>1.0.13</logback.version>
diff --git a/release_notes/v1.4.6.txt b/release_notes/v1.4.6.txt
@@ -0,0 +1,23 @@
+v1.4.6 dd MMMM YYYY
+----------------------------
+
+Release Notes
+-------------
+
+baseimage version: 0.4.15
+Java version:      openjdk version "1.8.0_181"
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+none
+Change Log
+----------
+https://github.com/hyperledger/fabric-chaincode-java/blob/release-1.4/CHANGELOG.md#v146

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,6 @@ task copyAllDeps(type: Copy) {`
`80`	`80`	`task buildImage(type: DockerBuildImage) {`
`81`	`81`	`dependsOn copyAllDeps`
`82`	`82`	`inputDir = project.file('Dockerfile').parentFile`
`83`		`- tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.5', 'hyperledger/fabric-javaenv:amd64-latest']`
	`83`	`+ tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.6', 'hyperledger/fabric-javaenv:amd64-latest']`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ repositories {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`dependencies {`
`18`		`- compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.5'`
	`18`	`+ compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.6'`
`19`	`19`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compile project(':fabric-chaincode-docker')`
`3`	`3`	`testCompile 'org.testcontainers:testcontainers:1.7.1'`
`4`		`- testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.5'`
	`4`	`+ testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.6'`
`5`	`5`	`compile project(':fabric-chaincode-shim')`
`6`	`6`	`implementation group: 'org.json', name: 'json', version: '20180813'`
`7`	`7`	`}`