Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
plugins {
id "com.github.ben-manes.versions" version "0.54.0"
id "com.diffplug.spotless" version "8.4.0"
id "com.gradleup.nmcp.aggregation" version "1.4.4"
id "com.gradleup.nmcp" version "1.4.4" apply false
id "com.gradleup.nmcp.aggregation" version "1.5.0"
id "com.gradleup.nmcp" version "1.5.0" apply false
}

version = '2.5.9'
Expand Down Expand Up @@ -38,6 +38,7 @@ dependencies {

allprojects {
apply plugin: "com.diffplug.spotless"
apply plugin: "com.github.ben-manes.versions"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion fabric-chaincode-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN curl -s "https://get.sdkman.io" | bash
SHELL ["/bin/bash", "-c"]

RUN . /root/.sdkman/bin/sdkman-init.sh \
&& sdk install gradle 9.4.1 \
&& sdk install gradle 9.5.0 \
&& sdk install maven 3.9.15

FROM ${JAVA_IMAGE} AS dependencies
Expand Down
18 changes: 7 additions & 11 deletions fabric-chaincode-shim/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ plugins {
id 'signing'
id 'jacoco'
id 'pmd'
id "com.gradleup.nmcp"
id 'com.gradleup.nmcp'
}

pmd {
toolVersion = '7.20.0'
toolVersion = '7.24.0'
ruleSetFiles = files('../pmd-ruleset.xml')
ruleSets = [] // explicitly set to empty to avoid using the default configuration
ignoreFailures = false
consoleOutput = true
}

pmdTest.enabled = false
Expand All @@ -30,13 +31,8 @@ tasks.withType(Test).configureEach {
}

dependencies {
constraints {
pmd('org.apache.commons:commons-lang3:3.19.0') {
because('CVE-2025-48924')
}
}
implementation platform('com.google.protobuf:protobuf-bom:4.34.1')
implementation platform('io.grpc:grpc-bom:1.80.0')
implementation platform('io.grpc:grpc-bom:1.81.0')
implementation platform('io.opentelemetry:opentelemetry-bom:1.61.0')
implementation platform("org.bouncycastle:bc-jdk18on-bom:1.84")

Expand All @@ -61,7 +57,7 @@ dependencies {
implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
implementation 'io.opentelemetry:opentelemetry-extension-trace-propagators'
implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.40.0'
implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.26.1-alpha'
implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.27.0-alpha'
}

sourceSets {
Expand Down Expand Up @@ -283,8 +279,8 @@ signing {
useInMemoryPgpKeys(signingKey, signingPassword)

required = {
gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToNmcpRepository")
|| gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToGitHubRepository")
gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToNmcpRepository") ||
gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToGitHubRepository")
}

sign publishing.publications.shim
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class InvocationStubImpl implements ChaincodeStub {
private static final String UNSPECIFIED_END_KEY = "";
private static final Logger LOGGER = Logger.getLogger(InvocationStubImpl.class.getName());

public static final String MAX_UNICODE_RUNE = "\udbff\udfff";
private static final String MAX_UNICODE_RUNE = "\udbff\udfff";
private static final String CORE_PEER_LOCALMSPID = "CORE_PEER_LOCALMSPID";

private static final Function<QueryResultBytes, org.hyperledger.fabric.protos.ledger.queryresult.KeyModification>
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 10 additions & 21 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.