Skip to content

Commit d1d093b

Browse files
mbwhitejt-nti
authored andcommitted
Regular Maintainece Task
- Update dependencies - Confirm local build instructions are valid - Any code warngins/linting errors that can be removed? Signed-off-by: Matthew B White <[email protected]>
1 parent dba9965 commit d1d093b

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

COMPATIBILITY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ This table shows the summary of the compatibility of the Java libraries at versi
1111
| ----------------------- | ----------------------------- | --------- | ----------------------------- | ---------- |
1212
| Java libraries **v1.4** | Yes | Yes | Yes | Yes |
1313
| Java libraries **v2.1** | Yes | No | Yes | Yes |
14+
| Java libraries **v2.4** | Yes | No | Yes | Yes |
15+
1416

1517
Testing is performed with
1618
- Java v8: Openjdk version 1.8.0_222

CONTRIBUTING.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,21 @@
22

33
We welcome contributions to the [Hyperledger Fabric](https://hyperledger-fabric.readthedocs.io) Project. There's always plenty to do!
44

5-
If you have any questions about the project or how to contribute, you can find us in the [fabric-java-chaincode](https://chat.hyperledger.org/channel/fabric-java-chaincode) Hyperledger Rocket.Chat channel.
5+
If you have any questions about the project or how to contribute, you can find us in the [fabric-contracts-api](https://discordapp.com/channels/905194001349627914/943090527920877598) channel on Discord.
66

77
Here are a few guidelines to help you contribute successfully...
88

99
## Issues
1010

11-
We currently track bug reports using the [Hyperledger JIRA](https://jira.hyperledger.org/issues/?jql=project+%3D+FAB+AND+component+%3D+fabric-chaincode-java) tool.
12-
13-
If you find a bug which we don't already know about, you can help us by creating a new issue describing the problem. Please include as much detail as possible to help us track down the cause.
14-
15-
> **Note:** Please use Rocket.Chat instead of JIRA to ask questions.
11+
All issues are tracked in the issues tab in github. If you find a bug which we don't already know about, you can help us by creating a new issue describing the problem. Please include as much detail as possible to help us track down the cause.
1612

1713
## Fixes
1814

19-
If you want to begin contributing code, looking through our open issues is a good way to start. Try looking for recent issues with detailed descriptions first, or ask us on Rocket.Chat if you're unsure which issue to choose.
15+
If you want to begin contributing code, looking through our open issues is a good way to start. Try looking for recent issues with detailed descriptions first, or ask us on Discord if you're unsure which issue to choose.
2016

2117
## Enhancements
2218

23-
Make sure you have the support of the Hyperledger Fabric community before investing a lot of effort in project enhancements. For example, discuss your proposal on Rocket.Chat or open a JIRA issue for feedback before starting work.
24-
25-
> **Note:** A more formal RFC process is under development for Hyperledger Fabric enhancement requests.
19+
Make sure you have the support of the Hyperledger Fabric community before investing a lot of effort in project enhancements. Please look up the Fabric RFC process for large changes.
2620

2721
## Pull Requests
2822

fabric-chaincode-shim/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,16 @@ dependencies {
4444
implementation project(':fabric-chaincode-protos')
4545
implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
4646
implementation 'org.bouncycastle:bcprov-jdk15on:1.62'
47-
implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.47'
48-
implementation group: 'com.github.everit-org.json-schema', name: 'org.everit.json.schema', version: '1.12.1'
49-
implementation group: 'org.json', name: 'json', version: '20180813'
50-
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.11.1'
47+
implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.146'
48+
implementation group: 'com.github.everit-org.json-schema', name: 'org.everit.json.schema', version: '1.14.1'
49+
implementation 'org.json:json:20220320'
50+
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.20.1'
51+
5152
// Required if using Java 11+ as no longer bundled in the core libraries
5253
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
53-
implementation 'io.grpc:grpc-netty-shaded:1.34.1'
54-
implementation 'io.grpc:grpc-protobuf:1.34.1'
55-
implementation 'io.grpc:grpc-stub:1.34.1'
54+
implementation 'io.grpc:grpc-netty-shaded:1.46.0'
55+
implementation 'io.grpc:grpc-protobuf:1.46.0'
56+
implementation 'io.grpc:grpc-stub:1.46.0'
5657

5758
implementation platform("io.opentelemetry:opentelemetry-bom:1.6.0")
5859

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ public void testStartingContractRouterWithStartingAChaincodeServer() throws IOEx
407407
).start();
408408

409409
try {
410-
Thread.sleep(1000);
410+
Thread.sleep(5000);
411411
} catch (InterruptedException e) {
412412
e.printStackTrace();
413413
}

0 commit comments

Comments
 (0)