Skip to content

Commit e19aadf

Browse files
mbwhitejt-nti
authored andcommitted
[FAB-17045] Release v1.4.4 Java Chaincode
- Bug fix release. Please see CHANGELOG.md Change-Id: Iaa6e4d8ebdfb59f733964caedca1b892df23203e Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
1 parent ab9c0df commit e19aadf

File tree

10 files changed

+159
-27
lines changed

10 files changed

+159
-27
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## v1.4.4
2+
Mon 11 Nov 15:57:05 GMT 2019
3+
4+
* [5ce56df](https://github.com/hyperledger/fabric-chaincode-java/commit/5ce56df) [FAB-16712](https://jira.hyperledger.org/browse/FAB-16712) Update contributing guide
5+
* [baaaef8](https://github.com/hyperledger/fabric-chaincode-java/commit/baaaef8) [FAB-16315](https://jira.hyperledger.org/browse/FAB-16315) Improved Load Ability
6+
* [c7efeb4](https://github.com/hyperledger/fabric-chaincode-java/commit/c7efeb4) [FAB-16871](https://jira.hyperledger.org/browse/FAB-16871) Deprecate Logger interface
7+
* [a4938e8](https://github.com/hyperledger/fabric-chaincode-java/commit/a4938e8) [FAB-16845](https://jira.hyperledger.org/browse/FAB-16845) Correct Logging
8+
* [f0a1784](https://github.com/hyperledger/fabric-chaincode-java/commit/f0a1784) [FAB-16817](https://jira.hyperledger.org/browse/FAB-16817) manifest classpath
9+
* [f6c007a](https://github.com/hyperledger/fabric-chaincode-java/commit/f6c007a) fabric-chaincode-java update to baseimage 0.4.16
10+
* [5f6d88d](https://github.com/hyperledger/fabric-chaincode-java/commit/5f6d88d) [FAB-16711](https://jira.hyperledger.org/browse/FAB-16711) azure pipelines
11+
* [388802e](https://github.com/hyperledger/fabric-chaincode-java/commit/388802e) [FAB-16745](https://jira.hyperledger.org/browse/FAB-16745) Remove SDK from integration tests
12+
* [b58f11d](https://github.com/hyperledger/fabric-chaincode-java/commit/b58f11d) [FAB-16680](https://jira.hyperledger.org/browse/FAB-16680) Fix cloudflare error on jitpack.io
13+
* [8cca4bb](https://github.com/hyperledger/fabric-chaincode-java/commit/8cca4bb) [FAB-16315](https://jira.hyperledger.org/browse/FAB-16315) Unrequired lock
14+
* [bd59b34](https://github.com/hyperledger/fabric-chaincode-java/commit/bd59b34) [FAB-16217](https://jira.hyperledger.org/browse/FAB-16217) Do not load JSON Schema schema from network
15+
* [55c29f9](https://github.com/hyperledger/fabric-chaincode-java/commit/55c29f9) [FAB-15895](https://jira.hyperledger.org/browse/FAB-15895) Added client identity to context
16+
117
## v1.4.3
218
Wed 31 Jul 11:20:26 BST 2019
319

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apply plugin: 'idea'
88
apply plugin: 'eclipse-wtp'
99
apply plugin: 'com.dorongold.task-tree'
10-
version = '1.4.4-SNAPSHOT'
10+
version = '1.4.4'
1111
buildscript {
1212
repositories {
1313
maven {

ci/azure-pipelines.yml

Lines changed: 105 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
# cf https://crontab.guru/#0_23_*_*_*
99
schedules:
1010
- cron: "0 23 * * *"
11-
displayName: 'Chaincode Java Nightly Driver'
11+
displayName: 'Chaincode 1.4 Java Nightly Driver'
1212
branches:
1313
include:
14-
- master
1514
- release-1.4
1615
always: true
1716

@@ -21,7 +20,6 @@ trigger:
2120
branches:
2221
include:
2322
- 'master'
24-
- 'release-1.4'
2523
tags:
2624
include:
2725
- '*'
@@ -31,8 +29,16 @@ trigger:
3129
# this isn't set so command line output is given
3230
#
3331
variables:
34-
component: fabric-chaincode-node
35-
pipeline: ci
32+
- group: Chaincode_Java_Creds
33+
- group: JARSigningPublish
34+
- name: component
35+
value: fabric-chaincode-java
36+
- name: pipeline
37+
value: ci
38+
- name: NEXUS_REPO_URL
39+
value: nexus3.hyperledger.org:10003
40+
- name: PUSH_VERSION
41+
value: stable
3642

3743
pool:
3844
vmImage: 'ubuntu-latest'
@@ -45,7 +51,9 @@ stages:
4551
jobs:
4652
- job: main
4753
steps:
48-
- script: env
54+
- script: |
55+
env | sort
56+
java -version
4957
- task: Gradle@2
5058
inputs:
5159
workingDirectory: ''
@@ -60,24 +68,101 @@ stages:
6068
- task: PublishCodeCoverageResults@1
6169
inputs:
6270
summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/fabric-chaincode-shim/build/reports/jacoco/test/jacocoTestReport.xml'
71+
- task: PublishCodeCoverageResults@1
72+
inputs:
73+
summaryFileLocation: "$(System.DefaultWorkingDirectory)/**/fabric-chaincode-shim/build/reports/jacoco/test/jacocoTestReport.xml"
74+
# Copy the built artifacts to the staging directory, tgz, and the docker image
75+
- script: |
76+
set -ev
77+
./gradlew publishToMavenLocal
78+
tar -zcvf localmaven.tgz ${HOME}/.m2/repository/org/hyperledger
79+
docker image save hyperledger/fabric-javaenv | gzip > $(Build.ArtifactStagingDirectory)/fabric-javaenv.tar.gz
80+
displayName: 'Package tgz and docker image'
81+
- task: PublishBuildArtifacts@1
82+
inputs:
83+
pathToPublish: localmaven.tgz
84+
artifactName: java-tgz
85+
- task: PublishBuildArtifacts@1
86+
inputs:
87+
pathToPublish: $(Build.ArtifactStagingDirectory)/fabric-javaenv.tar.gz
88+
artifactName: javaenv-docker-image
89+
90+
91+
# Publish the snapshot images etc.
92+
# Original source of these is https://github.com/hyperledger/ci-management/blob/master/jjb/fabric-chaincode-java/shell/include-raw-publish-docker-jar.sh
93+
- job:
94+
dependsOn: main
95+
condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
96+
steps:
97+
- task: DownloadPipelineArtifact@2
98+
inputs:
99+
artifact: java-docker-image
100+
path: $(Build.SourcesDirectory)/build
101+
- script: |
102+
docker image load --input build/fabric-javaenv.tar.gz
103+
docker images
104+
# Publish docker images to nexus repository
105+
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
106+
echo "Logged in to docker registry"
107+
# tag javaenv image to $PUSH_VERSION
108+
docker tag hyperledger/fabric-javaenv ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-${MAPPED_VERSION}
109+
# push javaenv to nexus repository
110+
docker push ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-${MAPPED_VERSION}
111+
env:
112+
DOCKER_REGISTRY_USERNAME: $(GITHUB_REGISTRY_USER)
113+
DOCKER_REGISTRY_PASSWORD: $(GITHUB_REGISTRY_PWD_TOKEN)
114+
DOCKER_REGISTRY_URL: docker.pkg.github.com/hyperledger/fabric-chaincode-java
115+
MAPPED_VERSION: $(PUSH_VERSION)
116+
117+
# As the next script is more complex and uses loops, run this descretely in a sh file
118+
# Publishing step for git tags
63119
- stage: Publish_tag
64120
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
65121
jobs:
66-
- job: update_version
122+
- job: publish_release
67123
steps:
124+
125+
- task: DownloadPipelineArtifact@2
126+
inputs:
127+
artifact: java-docker-image
128+
path: $(Build.SourcesDirectory)/build
129+
- task: DownloadSecureFile@1
130+
name: keyring
131+
inputs:
132+
secureFile: secring.gpg
68133
- script: |
69134
env | sort
70-
echo "Update the version number"
71-
echo "Make sure release notes are present"
72-
echo "Make sure change history is present"
73-
- job: npm_publish
74-
steps:
75-
- script: |
76-
echo "Setup .npmrc"
77-
echo "Use pipeline secret to login"
78-
echo "publish"
79-
- job: jsdoc_publish
80-
steps:
135+
136+
# temporarily use this approach instead of the gittag
137+
VERSION=$(cat build.gradle | sed -n "s/version =.*'\(.*\)\(-SNAPSHOT\)\?'/\1/p"
138+
VERSION=${VERSION// }
139+
echo Version is :${VERSION}:
140+
141+
142+
docker image load --input build/fabric-javaenv.tar.gz
143+
docker images
144+
# Publish docker images to nexus repository
145+
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
146+
echo "Logged in to docker registry"
147+
# tag javaenv image to $PUSH_VERSION
148+
docker tag hyperledger/fabric-javaenv fabric-javaenv:amd64-${VERSION}
149+
# push javaenv to nexus repository
150+
docker push fabric-javaenv:amd64-${VERSION}
151+
env:
152+
DOCKER_REGISTRY_USERNAME: $(DockerHub-Username)
153+
DOCKER_REGISTRY_PASSWORD: $(DockerHub-Password)
81154
- script: |
82-
echo "checkout docs branch"
83-
echo "checking"
155+
env | sort
156+
157+
# temporarily use this approach instead of the gittag
158+
VERSION=$(cat build.gradle | sed -n "s/version =.*'\(.*\)\(-SNAPSHOT\)\?'/\1/p"
159+
VERSION=${VERSION// }
160+
echo Version is :${VERSION}:
161+
162+
./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=${KEYRING_FILE} -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} uploadArchives
163+
env:
164+
SIGNING_ID: $(JAR-Signing-Id)
165+
SIGNING_PASSWORD: $(JAR-Signing-Password)
166+
KEYRING_FILE: $(keyring.secureFilePath)
167+
OSSRH_USER: $(OSSRH-User)
168+
OSSRH_PASSWORD: $(OSSRH-Password)

fabric-chaincode-example-gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repositories {
1515
}
1616

1717
dependencies {
18-
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4-SNAPSHOT'
18+
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4'
1919
testCompile group: 'junit', name: 'junit', version: '4.12'
2020
}
2121

fabric-chaincode-example-maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1313

1414
<!-- fabric-chaincode-java -->
15-
<fabric-chaincode-java.version>1.4.4-SNAPSHOT</fabric-chaincode-java.version>
15+
<fabric-chaincode-java.version>1.4.4</fabric-chaincode-java.version>
1616

1717
<!-- Logging -->
1818
<logback.version>1.0.13</logback.version>

fabric-chaincode-example-sacc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repositories {
1515
}
1616

1717
dependencies {
18-
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4-SNAPSHOT'
18+
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4'
1919
testCompile group: 'junit', name: 'junit', version: '4.12'
2020
}
2121

fabric-chaincode-example-sbe/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repositories {
1515
}
1616

1717
dependencies {
18-
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4-SNAPSHOT'
18+
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4'
1919
testCompile group: 'junit', name: 'junit', version: '4.12'
2020
}
2121

fabric-contract-example/gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
}
2121

2222
dependencies {
23-
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4-SNAPSHOT'
23+
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4'
2424
compile group: 'org.json', name: 'json', version: '20180813'
2525
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
2626
testImplementation 'org.assertj:assertj-core:3.11.1'

fabric-contract-example/maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1313

1414
<!-- fabric-chaincode-java -->
15-
<fabric-chaincode-java.version>1.4.4-SNAPSHOT</fabric-chaincode-java.version>
15+
<fabric-chaincode-java.version>1.4.4</fabric-chaincode-java.version>
1616

1717
<!-- Logging -->
1818
<logback.version>1.0.13</logback.version>

release_notes/v1.4.4.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
v1.4.4 11 November 2019
2+
----------------------------
3+
4+
Release Notes
5+
-------------
6+
7+
The Contract Programming model was introduced with v1.4.3; this release has fixes
8+
upong the original version that improvde stability and performance.
9+
10+
This version should be used in real scenarios.
11+
12+
For more information on the Contract Programming Model please
13+
see https://hyperledger-fabric.readthedocs.io/en/developapps/developing_applications.html
14+
15+
baseimage version: 0.4.15
16+
Java version: openjdk version "1.8.0_181"
17+
18+
Known Vulnerabilities
19+
---------------------
20+
none
21+
22+
Resolved Vulnerabilities
23+
------------------------
24+
none
25+
26+
Known Issues & Workarounds
27+
--------------------------
28+
none
29+
Change Log
30+
----------
31+
https://github.com/hyperledger/fabric-chaincode-java/blob/release-1.4/CHANGELOG.md#v144

0 commit comments

Comments
 (0)