Skip to content

Commit

Permalink
Regular Maintainece Task
Browse files Browse the repository at this point in the history
- 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]>
  • Loading branch information
mbwhite authored and jt-nti committed May 23, 2022
1 parent dba9965 commit d1d093b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
2 changes: 2 additions & 0 deletions COMPATIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ This table shows the summary of the compatibility of the Java libraries at versi
| ----------------------- | ----------------------------- | --------- | ----------------------------- | ---------- |
| Java libraries **v1.4** | Yes | Yes | Yes | Yes |
| Java libraries **v2.1** | Yes | No | Yes | Yes |
| Java libraries **v2.4** | Yes | No | Yes | Yes |


Testing is performed with
- Java v8: Openjdk version 1.8.0_222
Expand Down
14 changes: 4 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,21 @@

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

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.
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.

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

## Issues

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.

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.

> **Note:** Please use Rocket.Chat instead of JIRA to ask questions.
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.

## Fixes

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.
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.

## Enhancements

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.

> **Note:** A more formal RFC process is under development for Hyperledger Fabric enhancement requests.
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.

## Pull Requests

Expand Down
15 changes: 8 additions & 7 deletions fabric-chaincode-shim/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ dependencies {
implementation project(':fabric-chaincode-protos')
implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
implementation 'org.bouncycastle:bcprov-jdk15on:1.62'
implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.47'
implementation group: 'com.github.everit-org.json-schema', name: 'org.everit.json.schema', version: '1.12.1'
implementation group: 'org.json', name: 'json', version: '20180813'
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.11.1'
implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.146'
implementation group: 'com.github.everit-org.json-schema', name: 'org.everit.json.schema', version: '1.14.1'
implementation 'org.json:json:20220320'
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.20.1'

// Required if using Java 11+ as no longer bundled in the core libraries
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
implementation 'io.grpc:grpc-netty-shaded:1.34.1'
implementation 'io.grpc:grpc-protobuf:1.34.1'
implementation 'io.grpc:grpc-stub:1.34.1'
implementation 'io.grpc:grpc-netty-shaded:1.46.0'
implementation 'io.grpc:grpc-protobuf:1.46.0'
implementation 'io.grpc:grpc-stub:1.46.0'

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ public void testStartingContractRouterWithStartingAChaincodeServer() throws IOEx
).start();

try {
Thread.sleep(1000);
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Expand Down

0 comments on commit d1d093b

Please sign in to comment.