From 2d979610afe6d9f8804b7605cda99208c1f29982 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 25 Jul 2024 08:58:11 +0200 Subject: [PATCH 1/4] feat: remove project root from the docker image --- .../actions/publish-docker-image/action.yml | 21 ++---- build.gradle.kts | 65 +++++++------------ .../build.gradle.kts | 1 - .../build.gradle.kts | 1 - .../edc-runtime-memory/build.gradle.kts | 1 - .../build.gradle.kts | 1 - .../build.gradle.kts | 1 - .../runtime/mock-connector/build.gradle.kts | 1 - gradle/libs.versions.toml | 2 + .../edc-dast-runtime/build.gradle.kts | 1 - 10 files changed, 33 insertions(+), 62 deletions(-) diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml index f8eeb56ac..7a6845f16 100644 --- a/.github/actions/publish-docker-image/action.yml +++ b/.github/actions/publish-docker-image/action.yml @@ -42,22 +42,12 @@ inputs: docker_tag: required: false description: 'additional docker tags' - do_push: - required: false - default: 'false' - description: 'whether or not to actually push the image' + runs: using: "composite" steps: - uses: actions/checkout@v4 - - name: Download OpenTelemetry - shell: bash - run: |- - # "jq -r" removes the quotation marks, that would trip up "wget" - URL=$(grep "val openTelemetryAgentUrl = " build.gradle.kts | awk -F'= ' '{print $2}' | jq -r) - wget -O ${{ inputs.rootDir }}/opentelemetry-javaagent.jar -q $URL - ##################### # Login to DockerHub ##################### @@ -101,12 +91,13 @@ runs: - name: Build and push uses: docker/build-push-action@v3 with: - context: . + context: ${{ inputs.rootDir }} file: ${{ inputs.rootDir }}/build/resources/docker/Dockerfile build-args: | - JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar - OTEL_JAR=${{ inputs.rootDir }}/opentelemetry-javaagent.jar - push: ${{ inputs.do_push == 'true' }} + JAR=build/libs/${{ inputs.imagename }}.jar + OTEL_JAR=build/resources/otel/opentelemetry-javaagent.jar + ADDITIONAL_FILES=build/legal/* + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/build.gradle.kts b/build.gradle.kts index aae6e22eb..7ab4eb2ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -140,45 +140,26 @@ allprojects { } -// the "dockerize" task is added to all projects that use the `shadowJar` plugin subprojects { afterEvaluate { + // the "dockerize" task is added to all projects that use the `shadowJar` plugin if (project.plugins.hasPlugin("com.github.johnrengelman.shadow")) { - val buildDir = project.layout.buildDirectory.get().asFile - - val agentFile = buildDir.resolve("opentelemetry-javaagent.jar") - // create task to download the opentelemetry agent - val openTelemetryAgentUrl = "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.32.0/opentelemetry-javaagent.jar" - val downloadOtel = tasks.create("downloadOtel") { - // only execute task if the opentelemetry agent does not exist. invoke the "clean" task to force - onlyIf { - !agentFile.exists() - } - // this task could be the first in the graph, so "build/" may not yet exist. Let's be defensive - doFirst { - buildDir.mkdirs() - } - // download the jar file - doLast { - val download = { url: String, destFile: File -> - ant.invokeMethod( - "get", - mapOf("src" to url, "dest" to destFile) - ) - } - logger.lifecycle("Downloading OpenTelemetry Agent") - download(openTelemetryAgentUrl, agentFile) + val downloadOpentelemetryAgent = tasks.create("downloadOpentelemetryAgent", Copy::class) { + val openTelemetry = configurations.create("open-telemetry") + + dependencies { + openTelemetry(libs.opentelemetry.javaagent) } - } - val shadowJarTask = tasks.named(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME).get() + from(openTelemetry) + into("build/resources/otel") + rename { "opentelemetry-javaagent.jar" } + } - // this task copies some legal docs into the build folder, so we can easily copy them into the docker images val copyLegalDocs = tasks.create("copyLegalDocs", Copy::class) { from(project.rootProject.projectDir) - into("${buildDir}/legal") + into("build/legal") include("SECURITY.md", "NOTICE.md", "DEPENDENCIES", "LICENSE") - dependsOn(shadowJarTask) } val copyDockerfile = tasks.create("copyDockerfile", Copy::class) { @@ -186,31 +167,35 @@ subprojects { into(project.layout.buildDirectory.dir("resources").get().dir("docker")) include("Dockerfile") } - shadowJarTask.dependsOn(copyDockerfile) + + val shadowJarTask = tasks.named(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME).get() + + shadowJarTask + .dependsOn(copyDockerfile) + .dependsOn(copyLegalDocs) + .dependsOn(downloadOpentelemetryAgent) //actually apply the plugin to the (sub-)project apply(plugin = "com.bmuschko.docker-remote-api") val dockerTask: DockerBuildImage = tasks.create("dockerize", DockerBuildImage::class) { - dockerFile.set(project.layout.buildDirectory.asFile.get().toPath().resolve("resources").resolve("docker").resolve("Dockerfile").toFile()) + dockerFile.set(File("build/resources/docker/Dockerfile")) val dockerContextDir = project.projectDir images.add("${project.name}:${project.version}") images.add("${project.name}:latest") - // specify platform with the -Dplatform flag: - if (System.getProperty("platform") != null) + + if (System.getProperty("platform") != null) { platform.set(System.getProperty("platform")) + } + buildArgs.put("JAR", "build/libs/${project.name}.jar") - buildArgs.put("OTEL_JAR", agentFile.relativeTo(dockerContextDir).path) + buildArgs.put("OTEL_JAR", "build/resources/otel/opentelemetry-javaagent.jar") buildArgs.put("ADDITIONAL_FILES", "build/legal/*") inputDir.set(file(dockerContextDir)) } - // make sure always runs after "dockerize" and after "copyOtel" - dockerTask - .dependsOn(shadowJarTask) - .dependsOn(downloadOtel) - .dependsOn(copyLegalDocs) + dockerTask.dependsOn(shadowJarTask) } } diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts index 0d86a03a9..289c9532f 100644 --- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts +++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts @@ -40,7 +40,6 @@ dependencies { tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts index 778df1b0a..f3a1e20d5 100644 --- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts +++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts @@ -40,7 +40,6 @@ dependencies { tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } diff --git a/edc-controlplane/edc-runtime-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts index 34c05b3dd..69342bf8e 100644 --- a/edc-controlplane/edc-runtime-memory/build.gradle.kts +++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts @@ -36,7 +36,6 @@ dependencies { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts index 69a0aac64..467e34996 100644 --- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts +++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts @@ -43,7 +43,6 @@ dependencies { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts index 16a144279..97d7c742c 100644 --- a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts +++ b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts @@ -36,7 +36,6 @@ dependencies { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } diff --git a/edc-tests/runtime/mock-connector/build.gradle.kts b/edc-tests/runtime/mock-connector/build.gradle.kts index e70d6c33b..a15964124 100644 --- a/edc-tests/runtime/mock-connector/build.gradle.kts +++ b/edc-tests/runtime/mock-connector/build.gradle.kts @@ -58,7 +58,6 @@ edcBuild { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c4cf97eb..fe4189b1e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,7 @@ jupiter = "5.10.3" nimbus = "9.40" netty-mockserver = "5.15.0" okhttp = "4.12.0" +opentelemetry = "1.32.0" postgres = "42.7.3" restAssured = "5.5.0" rsApi = "4.0.0" @@ -220,6 +221,7 @@ jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-js junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" } nimbus-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus" } okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } +opentelemetry-javaagent = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent", version.ref = "opentelemetry" } netty-mockserver = { module = "org.mock-server:mockserver-netty", version.ref = "netty-mockserver" } postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" } restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" } diff --git a/samples/edc-dast/edc-dast-runtime/build.gradle.kts b/samples/edc-dast/edc-dast-runtime/build.gradle.kts index e35263d02..0da28d0b6 100644 --- a/samples/edc-dast/edc-dast-runtime/build.gradle.kts +++ b/samples/edc-dast/edc-dast-runtime/build.gradle.kts @@ -49,7 +49,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("${project.name}.jar") } From 6ae6ab6b134957853deefa10d9526279046b33b5 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 25 Jul 2024 09:19:29 +0200 Subject: [PATCH 2/4] dependencies --- DEPENDENCIES | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 5c7a88595..a23e50b9a 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -63,6 +63,7 @@ maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-prov maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.17.2, Apache-2.0, approved, #14195 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.0, Apache-2.0, approved, #13668 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.2, Apache-2.0, approved, #13668 +maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.13.5, Apache-2.0, approved, #2404 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.2, Apache-2.0, approved, #14162 maven/mavencentral/com.fasterxml.uuid/java-uuid-generator/4.1.0, Apache-2.0, approved, clearlydefined @@ -208,6 +209,7 @@ maven/mavencentral/io.netty/netty-transport/4.1.110.Final, Apache-2.0 AND BSD-3- maven/mavencentral/io.netty/netty-transport/4.1.111.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-transport/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.32.0, Apache-2.0, approved, #11684 +maven/mavencentral/io.opentelemetry.javaagent/opentelemetry-javaagent/1.32.0, Apache-2.0, restricted, clearlydefined maven/mavencentral/io.opentelemetry/opentelemetry-api/1.32.0, Apache-2.0, approved, #11682 maven/mavencentral/io.opentelemetry/opentelemetry-context/1.32.0, Apache-2.0, approved, #11683 maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.45, Apache-2.0, approved, #9687 @@ -354,24 +356,18 @@ maven/mavencentral/org.eclipse.edc/api-core/0.8.0, Apache-2.0, approved, technol maven/mavencentral/org.eclipse.edc/api-observability/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-index-sql/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/auth-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/autodoc-processor/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot-lib/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/callback-static-endpoint/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/catalog-api/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/catalog-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/catalog-util-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/connector-core/0.8.0, Apache-2.0, approved, technology.edc @@ -380,7 +376,6 @@ maven/mavencentral/org.eclipse.edc/contract-definition-api/0.8.0, Apache-2.0, ap maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/contract-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/control-api-configuration/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.8.0, Apache-2.0, approved, technology.edc @@ -397,10 +392,8 @@ maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.8.0, Apache-2.0, app maven/mavencentral/org.eclipse.edc/control-plane-transform/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/core-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/core-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/core-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crawler-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crawler-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/crawler-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/credential-query-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.8.0, Apache-2.0, approved, technology.edc @@ -452,7 +445,6 @@ maven/mavencentral/org.eclipse.edc/federated-catalog-api/0.8.0, Apache-2.0, appr maven/mavencentral/org.eclipse.edc/federated-catalog-cache-sql/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/federated-catalog-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/federated-catalog-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/federated-catalog-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http/0.8.0, Apache-2.0, approved, technology.edc @@ -508,24 +500,18 @@ maven/mavencentral/org.eclipse.edc/participant-context-spi/0.8.0, Apache-2.0, ap maven/mavencentral/org.eclipse.edc/policy-definition-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-model/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-model/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-model/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/presentation-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/query-lib/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/secrets-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-core/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-core/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-lease/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/state-machine-lib/0.8.0, Apache-2.0, approved, technology.edc @@ -533,10 +519,8 @@ maven/mavencentral/org.eclipse.edc/store-lib/0.8.0, Apache-2.0, approved, techno maven/mavencentral/org.eclipse.edc/token-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/token-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-local/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-spi/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transfer-data-plane-signaling/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transfer-process-api/0.8.0, Apache-2.0, approved, technology.edc @@ -548,7 +532,6 @@ maven/mavencentral/org.eclipse.edc/transform-lib/0.8.0, Apache-2.0, approved, te maven/mavencentral/org.eclipse.edc/transform-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/util-lib/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/util-lib/0.8.0, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/util-lib/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-data-address-http-data/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc From 9fe0c437e10ac3a2fb6532c69ed244f821791f6f Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 25 Jul 2024 11:45:24 +0200 Subject: [PATCH 3/4] Trigger build From 5e086d6a69c758cfd6385fee95beb24b441a12a9 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 25 Jul 2024 11:57:24 +0200 Subject: [PATCH 4/4] dependencies --- DEPENDENCIES | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index a23e50b9a..317a680dd 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -63,7 +63,6 @@ maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-prov maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.17.2, Apache-2.0, approved, #14195 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.0, Apache-2.0, approved, #13668 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.2, Apache-2.0, approved, #13668 -maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.13.5, Apache-2.0, approved, #2404 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.2, Apache-2.0, approved, #14162 maven/mavencentral/com.fasterxml.uuid/java-uuid-generator/4.1.0, Apache-2.0, approved, clearlydefined @@ -356,18 +355,24 @@ maven/mavencentral/org.eclipse.edc/api-core/0.8.0, Apache-2.0, approved, technol maven/mavencentral/org.eclipse.edc/api-observability/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-index-sql/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/auth-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/autodoc-processor/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot-lib/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/callback-static-endpoint/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/catalog-api/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/catalog-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/catalog-util-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/connector-core/0.8.0, Apache-2.0, approved, technology.edc @@ -376,6 +381,7 @@ maven/mavencentral/org.eclipse.edc/contract-definition-api/0.8.0, Apache-2.0, ap maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/contract-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/control-api-configuration/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.8.0, Apache-2.0, approved, technology.edc @@ -392,8 +398,10 @@ maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.8.0, Apache-2.0, app maven/mavencentral/org.eclipse.edc/control-plane-transform/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/core-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/core-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/core-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crawler-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crawler-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/crawler-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/credential-query-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.8.0, Apache-2.0, approved, technology.edc @@ -445,6 +453,7 @@ maven/mavencentral/org.eclipse.edc/federated-catalog-api/0.8.0, Apache-2.0, appr maven/mavencentral/org.eclipse.edc/federated-catalog-cache-sql/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/federated-catalog-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/federated-catalog-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/federated-catalog-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http/0.8.0, Apache-2.0, approved, technology.edc @@ -500,18 +509,24 @@ maven/mavencentral/org.eclipse.edc/participant-context-spi/0.8.0, Apache-2.0, ap maven/mavencentral/org.eclipse.edc/policy-definition-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-model/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-model/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-model/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/presentation-api/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/query-lib/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/secrets-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-core/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-core/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-lease/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/state-machine-lib/0.8.0, Apache-2.0, approved, technology.edc @@ -519,8 +534,10 @@ maven/mavencentral/org.eclipse.edc/store-lib/0.8.0, Apache-2.0, approved, techno maven/mavencentral/org.eclipse.edc/token-core/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/token-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-local/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-spi/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-spi/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transfer-data-plane-signaling/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transfer-process-api/0.8.0, Apache-2.0, approved, technology.edc @@ -532,6 +549,7 @@ maven/mavencentral/org.eclipse.edc/transform-lib/0.8.0, Apache-2.0, approved, te maven/mavencentral/org.eclipse.edc/transform-spi/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/util-lib/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/util-lib/0.8.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/util-lib/0.8.1-20240719-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-data-address-http-data/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-lib/0.8.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-spi/0.7.2-SNAPSHOT, Apache-2.0, approved, technology.edc