From edd7719cef13c838c6859c7228c29b84b5fce3e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:45:27 +0200 Subject: [PATCH] build(deps): bump edc from 0.2.1 to 0.3.0 (#121) * build(deps): bump edc from 0.2.1 to 0.3.0 Bumps `edc` from 0.2.1 to 0.3.0. Updates `org.eclipse.edc:api-core` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:api-observability` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:auth-tokenbased` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:boot` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/GradlePlugins/releases) - [Commits](https://github.com/eclipse-edc/GradlePlugins/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:configuration-filesystem` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:connector-core` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:control-plane-core` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:control-plane-spi` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-api` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-aws-s3` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Technology-Aws/releases) - [Commits](https://github.com/eclipse-edc/Technology-Aws/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-azure-storage` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Technology-Azure/releases) - [Commits](https://github.com/eclipse-edc/Technology-Azure/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-client` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-core` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-http` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-selector-api` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-selector-client` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-selector-core` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-spi` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:data-plane-util` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:dsp` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:http` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:iam-mock` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:jersey-micrometer` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:jetty-micrometer` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:json-ld` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:junit` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:management-api` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:micrometer-core` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:monitor-jdk-logger` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:provision-aws-s3` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Technology-Aws/releases) - [Commits](https://github.com/eclipse-edc/Technology-Aws/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:runtime-metamodel` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:transfer-data-plane` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:transfer-process-api` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:transfer-pull-http-receiver` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:transfer-spi` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:util` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:vault-azure` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Technology-Azure/releases) - [Commits](https://github.com/eclipse-edc/Technology-Azure/compare/v0.2.1...v0.3.0) Updates `org.eclipse.edc:vault-filesystem` from 0.2.1 to 0.3.0 - [Release notes](https://github.com/eclipse-edc/Connector/releases) - [Commits](https://github.com/eclipse-edc/Connector/compare/v0.2.1...v0.3.0) --- updated-dependencies: - dependency-name: org.eclipse.edc:api-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:api-observability dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:auth-tokenbased dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:boot dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:configuration-filesystem dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:connector-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-plane-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:control-plane-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-aws-s3 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-azure-storage dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-http dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-selector-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-selector-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-selector-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:data-plane-util dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:dsp dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:http dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:iam-mock dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:jersey-micrometer dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:jetty-micrometer dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:json-ld dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:junit dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:management-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:micrometer-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:monitor-jdk-logger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:provision-aws-s3 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:runtime-metamodel dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:transfer-data-plane dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:transfer-process-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:transfer-pull-http-receiver dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:transfer-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:util dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:vault-azure dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.eclipse.edc:vault-filesystem dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * fix compilation --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ndr_brt --- basic/basic-01-basic-connector/build.gradle.kts | 1 - basic/basic-02-health-endpoint/build.gradle.kts | 1 - basic/basic-03-configuration/build.gradle.kts | 1 - gradle/libs.versions.toml | 3 ++- other/custom-runtime/build.gradle.kts | 1 - .../edc/samples/transfer/streaming/Participant.java | 11 +++-------- .../streaming/Streaming01httpToHttpTest.java | 13 ++++++++++++- .../streaming-01-runtime/build.gradle.kts | 1 + .../file-transfer-consumer/build.gradle.kts | 1 - .../file-transfer-provider/build.gradle.kts | 2 +- .../build.gradle.kts | 1 - .../open-telemetry-consumer/build.gradle.kts | 1 - .../open-telemetry-provider/build.gradle.kts | 1 - .../cloud-transfer-consumer/build.gradle.kts | 1 - .../cloud-transfer-provider/build.gradle.kts | 1 - 15 files changed, 19 insertions(+), 21 deletions(-) diff --git a/basic/basic-01-basic-connector/build.gradle.kts b/basic/basic-01-basic-connector/build.gradle.kts index 6a58db1d..626905fa 100644 --- a/basic/basic-01-basic-connector/build.gradle.kts +++ b/basic/basic-01-basic-connector/build.gradle.kts @@ -29,7 +29,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("basic-connector.jar") } diff --git a/basic/basic-02-health-endpoint/build.gradle.kts b/basic/basic-02-health-endpoint/build.gradle.kts index b00dfe2e..96a0cb11 100644 --- a/basic/basic-02-health-endpoint/build.gradle.kts +++ b/basic/basic-02-health-endpoint/build.gradle.kts @@ -33,7 +33,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("connector-health.jar") } diff --git a/basic/basic-03-configuration/build.gradle.kts b/basic/basic-03-configuration/build.gradle.kts index a281694f..01b56fcc 100644 --- a/basic/basic-03-configuration/build.gradle.kts +++ b/basic/basic-03-configuration/build.gradle.kts @@ -36,7 +36,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("filesystem-config-connector.jar") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2904b7c9..e7b30a3a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ format.version = "1.1" [versions] assertj = "3.24.2" awaitility = "4.2.0" -edc = "0.2.1" +edc = "0.3.0" jakarta-json = "2.0.1" junit-pioneer = "2.1.0" jupiter = "5.10.0" @@ -24,6 +24,7 @@ edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" } edc-build-plugin = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" } edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" } edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" } +edc-control-plane-api-client = { module = "org.eclipse.edc:control-plane-api-client", version.ref = "edc" } edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" } edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" } edc-data-plane-api = { module = "org.eclipse.edc:data-plane-api", version.ref = "edc" } diff --git a/other/custom-runtime/build.gradle.kts b/other/custom-runtime/build.gradle.kts index 9868d2c5..d14c6fbb 100644 --- a/other/custom-runtime/build.gradle.kts +++ b/other/custom-runtime/build.gradle.kts @@ -38,7 +38,6 @@ var distTar = tasks.getByName("distTar") var distZip = tasks.getByName("distZip") tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("custom-runtime.jar") dependsOn(distTar, distZip) diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java index e93e721c..79379b2e 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java @@ -19,7 +19,7 @@ import jakarta.json.Json; import jakarta.json.JsonArray; import jakarta.json.JsonObject; -import org.eclipse.edc.connector.contract.spi.ContractId; +import org.eclipse.edc.connector.contract.spi.ContractOfferId; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.util.JacksonJsonLd; @@ -89,7 +89,7 @@ public void registerDataPlane(List sourceTypes, List destination .when() .post("/v2/dataplanes") .then() - .statusCode(204); + .statusCode(200); } public String createAsset(String requestBody) { @@ -293,7 +293,7 @@ public String initiateTransfer(Participant provider, String contractAgreementId, public String requestAsset(Participant provider, String assetId, JsonObject privateProperties, JsonObject destination) { var dataset = getDatasetForAsset(provider, assetId); var policy = dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).get(0).asJsonObject(); - var contractDefinitionId = ContractId.parseId(policy.getString(ID)) + var contractDefinitionId = ContractOfferId.parseId(policy.getString(ID)) .orElseThrow(failure -> new RuntimeException(failure.getFailureDetail())); var contractAgreementId = negotiateContract(provider, contractDefinitionId.toString(), assetId, policy); var transferProcessId = initiateTransfer(provider, contractAgreementId, assetId, privateProperties, destination); @@ -317,11 +317,6 @@ public String getTransferProcessState(String id) { .extract().body().jsonPath().getString("'edc:state'"); } - private ContractId extractContractDefinitionId(JsonObject dataset) { - var contractId = dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).get(0).asJsonObject().getString(ID); - return ContractId.parseId(contractId).orElseThrow(f -> new RuntimeException(f.getFailureDetail())); - } - private String getContractNegotiationState(String id) { return managementEndpoint.baseRequest() .contentType(JSON) diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Streaming01httpToHttpTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Streaming01httpToHttpTest.java index 070fefcb..0259d0f1 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Streaming01httpToHttpTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Streaming01httpToHttpTest.java @@ -26,11 +26,14 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Files; +import java.nio.file.Path; import java.time.Duration; import java.util.List; import java.util.Map; import java.util.UUID; +import static java.util.concurrent.Executors.newScheduledThreadPool; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.STARTED; @@ -106,7 +109,7 @@ void streamData() throws IOException { }); var eventBody = "message that will be sent".getBytes(); - Files.write(source.resolve("message-" + UUID.randomUUID()), eventBody); + newScheduledThreadPool(1).scheduleAtFixedRate(() -> createMessage(source, eventBody), 0L, 200L, MILLISECONDS); await().atMost(TIMEOUT).untilAsserted(() -> { var request = consumerReceiverServer.takeRequest(); @@ -114,4 +117,12 @@ void streamData() throws IOException { assertThat(request.getBody().readByteArray()).isEqualTo(eventBody); }); } + + private static void createMessage(Path source, byte[] content) { + try { + Files.write(source.resolve("message-" + UUID.randomUUID()), content); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts index 99333cca..4679f6c3 100644 --- a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts @@ -21,6 +21,7 @@ plugins { } dependencies { + implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.core) implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.api.observability) diff --git a/transfer/transfer-01-file-transfer/file-transfer-consumer/build.gradle.kts b/transfer/transfer-01-file-transfer/file-transfer-consumer/build.gradle.kts index 5a54e632..b35e0ec2 100644 --- a/transfer/transfer-01-file-transfer/file-transfer-consumer/build.gradle.kts +++ b/transfer/transfer-01-file-transfer/file-transfer-consumer/build.gradle.kts @@ -43,7 +43,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("consumer.jar") } diff --git a/transfer/transfer-01-file-transfer/file-transfer-provider/build.gradle.kts b/transfer/transfer-01-file-transfer/file-transfer-provider/build.gradle.kts index 1b6a2b45..58aa47d4 100644 --- a/transfer/transfer-01-file-transfer/file-transfer-provider/build.gradle.kts +++ b/transfer/transfer-01-file-transfer/file-transfer-provider/build.gradle.kts @@ -21,6 +21,7 @@ plugins { } dependencies { + implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.core) implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.api.observability) @@ -38,7 +39,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("provider.jar") } diff --git a/transfer/transfer-03-modify-transferprocess/modify-transferprocess-consumer/build.gradle.kts b/transfer/transfer-03-modify-transferprocess/modify-transferprocess-consumer/build.gradle.kts index ec9f22e7..497de949 100644 --- a/transfer/transfer-03-modify-transferprocess/modify-transferprocess-consumer/build.gradle.kts +++ b/transfer/transfer-03-modify-transferprocess/modify-transferprocess-consumer/build.gradle.kts @@ -41,7 +41,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("consumer.jar") } diff --git a/transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts b/transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts index 709166fb..ade9456d 100644 --- a/transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts +++ b/transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts @@ -40,7 +40,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("consumer.jar") } diff --git a/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts b/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts index 7c5dcee7..34930dd8 100644 --- a/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts +++ b/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts @@ -40,7 +40,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("provider.jar") } diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts index a5cf44b2..06ccb6e8 100644 --- a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts @@ -41,7 +41,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("consumer.jar") } diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts index b1a9847b..4c77fc5d 100644 --- a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts @@ -43,7 +43,6 @@ application { } tasks.withType { - exclude("**/pom.properties", "**/pom.xm") mergeServiceFiles() archiveFileName.set("provider.jar") }