From 2945fb912ba4b8829bffedad005ffdf1e5b51554 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Wed, 23 Jul 2025 14:32:19 +0100 Subject: [PATCH 1/2] Enable dependabot dependency updates Configure dependabot for the following ecosystems: - docker - github-actions - gradle - maven Signed-off-by: Mark S. Lewis --- .github/dependabot.yml | 34 +++++++++++++++++++ .../build.gradle.kts | 2 +- .../fabric-contract-example-maven/pom.xml | 3 +- .../src/contracts/bare-gradle/build.gradle | 7 +--- .../src/contracts/bare-maven/pom.xml | 4 --- .../contracts/fabric-ledger-api/build.gradle | 7 +--- .../contracts/fabric-shim-api/build.gradle | 7 +--- 7 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..aab134c6 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,34 @@ +version: 2 +updates: + - package-ecosystem: docker + directories: + - "/fabric-chaincode-docker" + - "/examples/fabric-contract-example-as-service" + schedule: + interval: weekly + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: weekly + - package-ecosystem: gradle + directories: + - "/" + - "/fabric-chaincode-docker" + - "/examples/fabric-contract-example-as-service" + - "/examples/fabric-contract-example-gradle" + - "/examples/fabric-contract-example-gradle-kotlin" + - "/examples/ledger-api" + - "/fabric-chaincode-integration-test" + - "/fabric-chaincode-integration-test/src/contracts/bare-gradle" + - "/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api" + - "/fabric-chaincode-integration-test/src/contracts/fabric-shim-api" + - "/fabric-chaincode-shim" + schedule: + interval: weekly + - package-ecosystem: maven + directories: + - "/examples/fabric-contract-example-maven" + - "/fabric-chaincode-integration-test/src/contracts/bare-maven" + - "/fabric-chaincode-integration-test/src/contracts/wrapper-maven" + schedule: + interval: weekly diff --git a/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts b/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts index ffd88adc..f182c963 100644 --- a/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts +++ b/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts @@ -5,7 +5,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "8.3.6" id("org.jetbrains.kotlin.jvm") version "1.9.22" } diff --git a/examples/fabric-contract-example-maven/pom.xml b/examples/fabric-contract-example-maven/pom.xml index 39f1e39d..4adbd9f1 100644 --- a/examples/fabric-contract-example-maven/pom.xml +++ b/examples/fabric-contract-example-maven/pom.xml @@ -111,8 +111,7 @@ maven-compiler-plugin 3.1 - ${java.version} - ${java.version} + ${java.version} diff --git a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle index 84e1f21a..4cdac1e7 100644 --- a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle @@ -6,13 +6,8 @@ plugins { group 'org.hyperledger.fabric-chaincode-java' version '1.0-SNAPSHOT' -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} - compileJava { - options.compilerArgs.addAll(['--release', '11']) + options.release = 11 } repositories { diff --git a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml index 2671d423..8a90c06d 100644 --- a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml +++ b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml @@ -21,10 +21,6 @@ jitpack.io https://www.jitpack.io - - artifactory - https://hyperledger.jfrog.io/hyperledger/fabric-maven - localfabirc file://${project.basedir}/repository diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle index ab453cbe..8ae407d5 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle @@ -6,13 +6,8 @@ plugins { group 'org.hyperledger.fabric-chaincode-java' version '' -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} - compileJava { - options.compilerArgs.addAll(['--release', '11']) + options.release = 11 } repositories { diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle index 7eee2b31..0c7ccc99 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle @@ -6,13 +6,8 @@ plugins { group 'org.hyperledger.fabric-chaincode-java' version '1.0-SNAPSHOT' -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} - compileJava { - options.compilerArgs.addAll(['--release', '11']) + options.release = 11 } repositories { From 5c0566454d0e04a84d2f65176549ec3699bd6d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 13:39:32 +0000 Subject: [PATCH 2/2] Bump junit.jupiter.version in /examples/fabric-contract-example-maven Bumps `junit.jupiter.version` from 5.13.1 to 5.13.4. Updates `org.junit.jupiter:junit-jupiter-api` from 5.13.1 to 5.13.4 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.1...r5.13.4) Updates `org.junit.jupiter:junit-jupiter-params` from 5.13.1 to 5.13.4 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.1...r5.13.4) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.13.1 to 5.13.4 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.1...r5.13.4) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-version: 5.13.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 5.13.4 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 5.13.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- examples/fabric-contract-example-maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/fabric-contract-example-maven/pom.xml b/examples/fabric-contract-example-maven/pom.xml index 4adbd9f1..ca906e01 100644 --- a/examples/fabric-contract-example-maven/pom.xml +++ b/examples/fabric-contract-example-maven/pom.xml @@ -19,7 +19,7 @@ 1.7.5 - 5.13.1 + 5.13.4 1.13.1