Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit da7d5cd

Browse files
v1.4.11 release (#65)
Signed-off-by: Mark S. Lewis <[email protected]>
1 parent 04508d9 commit da7d5cd

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.4.11
2+
Fri 3 Jul 2020 14:09:39 BST
3+
4+
* [04508d9](https://github.com/hyperledger/fabric-sdk-java/commit/04508d9) [FABJ-521] Allow arrays of PEM content in connection profile (#63)
5+
16
## v1.4.9
27
Tue 12 May 2020 10:30:57 BST
38

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.hyperledger.fabric-sdk-java</groupId>
55
<artifactId>fabric-sdk-java</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.4.9</version>
7+
<version>1.4.11</version>
88
<name>fabric-java-sdk</name>
99
<description>Java SDK for Hyperledger fabric project</description>
1010
<url>https://www.hyperledger.org/community/projects</url>

scripts/changelog.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
# SPDX-License-Identifier: Apache-2.0
66
#
77

8+
if [ $# -ne 2 ]; then
9+
echo 'Missing required arguments: lastReleaseCommitHash releaseVersion' >&2
10+
exit 1
11+
fi
12+
813
echo "## $2\n$(date)" >> CHANGELOG.new
914
echo "" >> CHANGELOG.new
1015
git log $1..HEAD --oneline | grep -v Merge | sed -e "s/\[\(FAB-[0-9]*\)\]/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric-sdk-java\/commit\/\1)/" >> CHANGELOG.new

src/main/java/org/hyperledger/fabric/sdk/NetworkConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@ Channel loadChannel(HFClient client, String channelName) throws NetworkConfigura
485485
}
486486

487487
JsonObject channels = getJsonObject(jsonConfig, "channels");
488+
if (null == channels) {
489+
throw new NetworkConfigurationException("Channel configuration has no channels defined.");
490+
}
488491

489492
JsonObject jsonChannel = getJsonObject(channels, channelName);
490493
if (null == jsonChannel) {

0 commit comments

Comments
 (0)