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 { diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index a361d7f1..be7ae32d 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/fabric-chaincode-shim/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-exporter-otlp' implementation 'io.opentelemetry:opentelemetry-extension-trace-propagators' implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.32.0' - implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.16.0-alpha' + implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.19.0-alpha' } sourceSets {