Skip to content

Commit 18c65a6

Browse files
committed
[FABCJ-281] Release 1.4.6
Port of fixes to support Java11 Signed-off-by: Matthew B White <[email protected]>
1 parent b54d8bb commit 18c65a6

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## v1.4.6
2+
Wed 4 Mar 10:21:28 GMT 2020
3+
4+
* [b54d8bb](https://github.com/hyperledger/fabric-chaincode-java/commit/b54d8bb) [FABCJ-280](https://jira.hyperledger.org/browse/FABCJ-280) Copy chaincode into temporary directory before building
5+
* [dac90d2](https://github.com/hyperledger/fabric-chaincode-java/commit/dac90d2) [FAB-6415](https://jira.hyperledger.org/browse/FAB-6415) Replace org.reflections with classgraph
6+
* [f109d19](https://github.com/hyperledger/fabric-chaincode-java/commit/f109d19) [FAB-6415](https://jira.hyperledger.org/browse/FAB-6415) Add javax.xml.bind dependency for Java 11
7+
* [540b9ca](https://github.com/hyperledger/fabric-chaincode-java/commit/540b9ca) [FAB-6415](https://jira.hyperledger.org/browse/FAB-6415) Add javax.annotation dependency for Java 11
8+
* [88e2da2](https://github.com/hyperledger/fabric-chaincode-java/commit/88e2da2) [FABCJ-270](https://jira.hyperledger.org/browse/FABCJ-270) Prepare release 1.4.6
9+
110
## v1.4.5
211
Thu 16 Jan 16:16:48 GMT 2020
312

release_notes/v1.4.6.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
v1.4.6 dd MMMM YYYY
1+
v1.4.6 04 March 2020
22
----------------------------
33

44
Release Notes
55
-------------
66

7+
This release includes changes to tolerate the use of Java 11.
8+
It does not update default JVM used, but backports fixes from v2.0.
9+
10+
711
baseimage version: 0.4.15
812
Java version: openjdk version "1.8.0_181"
913

scripts/changelog.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66
#
7+
set -ev
78

9+
PREVIOUS_TAG=$1
10+
NEW_VERSION=$2
811

9-
echo "## $2" >> CHANGELOG.new
12+
: ${PREVIOUS_TAG:?}
13+
: ${NEW_VERSION:?}
14+
15+
echo "## ${NEW_VERSION}" >> CHANGELOG.new
1016
echo "$(date)" >> CHANGELOG.new
1117
echo "" >> CHANGELOG.new
12-
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
18+
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
1319
echo "" >> CHANGELOG.new
1420
cat CHANGELOG.md >> CHANGELOG.new
1521
mv -f CHANGELOG.new CHANGELOG.md
22+

0 commit comments

Comments
 (0)