build(deps): bump tx-edc version to current 0.9.0-SNAPSHOT

eclipse-tractusx · Jan 7, 2025 · 06ad06b · 06ad06b
1 parent 1feb5c5
commit 06ad06b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 37 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -50,4 +50,4 @@ allprojects {
         }
     }
 
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@
 ################################################################################
 group=org.eclipse.tractusx.edc
 edcGroup=org.eclipse.edc
-version=0.8.0-SNAPSHOT
-edcVersion=0.10.1
+version=0.9.0-SNAPSHOT
+edcVersion=0.11.0-20241230-SNAPSHOT
 edcScmUrl=https://github.com/eclipse-tractusx/tractusx-edc-compatibility-tests.git
-edcScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc-compatibility-tests.git
+edcScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc-compatibility-tests.git
diff --git a/gradle/libs.stable.versions.toml b/gradle/libs.stable.versions.toml
@@ -2,8 +2,8 @@
 format.version = "1.1"
 
 [versions]
-tractusx = "0.7.7"
-edc = "0.7.2"
+tractusx = "0.8.0"
+edc = "0.10.1"
 
 [libraries]
 tx-edc-controlplane-postgresql-hashicorp-vault = { module = "org.eclipse.tractusx.edc:edc-controlplane-postgresql-hashicorp-vault", version.ref = "tractusx" }
@@ -16,5 +16,5 @@ edc-auth-oauth2-client = { module = "org.eclipse.edc:oauth2-client", version.ref
 edc-api-management-dataplaneselector = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
 
 [plugins]
-shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
 docker = { id = "com.bmuschko.docker-remote-api", version = "9.4.0" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,24 +2,22 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.10.1"
-tractusx = "0.8.0-SNAPSHOT"
+edc = "0.11.0-20241230-SNAPSHOT"
+tractusx = "0.9.0-SNAPSHOT"
 jakarta-json = "2.1.3"
 jackson = "2.18.0"
 restAssured = "5.5.0"
 awaitility = "4.2.2"
 httpMockServer = "5.15.0"
 testcontainers = "1.20.2"
 
-# add here
-
 [libraries]
 tx-edc-controlplane-postgresql-hashicorp-vault = { module = "org.eclipse.tractusx.edc:edc-controlplane-postgresql-hashicorp-vault", version.ref = "tractusx" }
 tx-edc-dataplane-postgresql-hashicorp-vault = { module = "org.eclipse.tractusx.edc:edc-dataplane-hashicorp-vault", version.ref = "tractusx" }
 tx-bdrs-client-spi = { module = "org.eclipse.tractusx.edc:bdrs-client-spi", version.ref = "tractusx" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-api-management-test-fixtures = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" }
-edc-sql-core = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
+edc-sql-test-fixtures = { module = "org.eclipse.edc:sql-test-fixtures", version.ref = "edc" }
 edc-api-management-dataplaneselector = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
 edc-sql-transactionlocal = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
 edc-lib-cryptocommon = { module = "org.eclipse.edc:crypto-common-lib", version.ref = "edc" }
@@ -52,5 +50,5 @@ edc-bom-identithub-sts = { module = "org.eclipse.edc:identityhub-with-sts-bom",
 
 
 [plugins]
-shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
 docker = { id = "com.bmuschko.docker-remote-api", version = "9.4.0" }
diff --git a/tests/compatibility-tests/build.gradle.kts b/tests/compatibility-tests/build.gradle.kts
@@ -23,6 +23,14 @@ plugins {
 
 dependencies {
     testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.lib.cryptocommon)
+    testImplementation(libs.edc.lib.jws2020)
+    testImplementation(libs.edc.sql.transactionlocal)
+    testImplementation(libs.edc.sts.spi)
+    testImplementation(libs.edc.ih.spi.did)
+    testImplementation(libs.edc.ih.spi.credentials)
+    testImplementation(libs.edc.ih.spi.participant.context)
+    testImplementation(libs.edc.ih.spi.store)
     testImplementation(libs.tx.bdrs.client.spi)
     testImplementation(libs.jakarta.json.api)
     testImplementation(libs.jackson.datatype.jakarta.jsonp)
@@ -33,14 +41,5 @@ dependencies {
     testImplementation(libs.testcontainers.junit)
     testImplementation(libs.testcontainers.postgres)
     testImplementation(testFixtures(libs.edc.api.management.test.fixtures))
-    testImplementation(testFixtures(libs.edc.sql.core))
-    testImplementation(libs.edc.ih.spi.participant.context)
-    testImplementation(libs.edc.lib.cryptocommon)
-    testImplementation(libs.edc.sts.spi)
-    testImplementation(libs.edc.ih.spi.did)
-    testImplementation(libs.edc.ih.spi.credentials)
-    testImplementation(libs.edc.lib.jws2020)
-    testImplementation(libs.edc.ih.spi.store)
-    testImplementation(libs.edc.sql.transactionlocal)
-
-}
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
+}
diff --git a/...rc/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/EdcDockerRuntimes.java b/...rc/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/EdcDockerRuntimes.java
@@ -43,7 +43,9 @@ public GenericContainer<?> create(String name, Map<String, String> env) {
         return new GenericContainer<>(image)
                 .withCreateContainerCmdModifier(cmd -> cmd.withName(name))
                 .withNetworkMode("host")
+                .withLogConsumer(it -> System.out.println("[%s] %s".formatted(name, it.getUtf8StringWithoutLineEnding())))
                 .waitingFor(Wait.forLogMessage(".*Runtime .* ready.*", 1))
                 .withEnv(env);
     }
+
 }
diff --git a/...rc/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/RemoteParticipant.java b/...rc/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/RemoteParticipant.java
@@ -21,7 +21,6 @@
 
 import java.net.URI;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import static org.eclipse.edc.util.io.Ports.getFreePort;
@@ -30,10 +29,6 @@ public class RemoteParticipant extends BaseParticipant {
 
     private static final String API_KEY = "password";
 
-    private final List<String> datasources = List.of("asset", "contractdefinition",
-            "contractnegotiation", "policy", "transferprocess", "bpn",
-            "policy-monitor", "edr", "dataplane", "accesstokendata", "dataplaneinstance");
-
     public Map<String, String> controlPlaneEnv(BaseParticipant participant) {
         return new HashMap<>() {
             {
@@ -49,6 +44,8 @@ public Map<String, String> controlPlaneEnv(BaseParticipant participant) {
                 put("WEB_HTTP_VERSION_PATH", controlPlaneVersion.getPath());
                 put("WEB_HTTP_CONTROL_PORT", String.valueOf(controlPlaneControl.getPort()));
                 put("WEB_HTTP_CONTROL_PATH", controlPlaneControl.getPath());
+                put("WEB_HTTP_CATALOG_PORT", String.valueOf(getFreePort()));
+                put("WEB_HTTP_CATALOG_PATH", "/catalog");
                 put("EDC_DSP_CALLBACK_ADDRESS", protocolEndpoint.getUrl().toString());
                 put("EDC_DATASOURCE_DEFAULT_URL", "jdbc:postgresql://localhost:5432/%s".formatted(getId()));
                 put("EDC_DATASOURCE_DEFAULT_USER", "postgres");
@@ -111,14 +108,12 @@ public Map<String, String> dataPlaneEnv(BaseParticipant participant) {
     }
 
     private Map<String, String> datasourceConfig() {
-
         var config = new HashMap<String, String>();
-        datasources.forEach(ds -> {
-            config.put("EDC_DATASOURCE_" + ds.toUpperCase() + "_URL", "jdbc:postgresql://localhost:5432/" + getName());
-            config.put("EDC_DATASOURCE_" + ds.toUpperCase() + "_NAME", ds);
-            config.put("EDC_DATASOURCE_" + ds.toUpperCase() + "_USER", "postgres");
-            config.put("EDC_DATASOURCE_" + ds.toUpperCase() + "_PASSWORD", "password");
-        });
+
+        config.put("EDC_DATASOURCE_DEFAULT_URL", "jdbc:postgresql://localhost:5432/" + getName());
+        config.put("EDC_DATASOURCE_DEFAULT_USER", "postgres");
+        config.put("EDC_DATASOURCE_DEFAULT_PASSWORD", "password");
+
         return config;
     }
 

diff --git a/...test/java/org/eclipse/tractusx/edc/compatibility/tests/transfer/TransferEndToEndTest.java b/...test/java/org/eclipse/tractusx/edc/compatibility/tests/transfer/TransferEndToEndTest.java
@@ -253,7 +253,7 @@ protected void createResourcesOnProvider(BaseParticipant provider, String assetI
 
     private static class ParticipantsArgProvider implements ArgumentsProvider {
         @Override
-        public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
             return Stream.of(
                     Arguments.of(REMOTE_PARTICIPANT, LOCAL_PARTICIPANT, "dataspace-protocol-http"),
                     Arguments.of(LOCAL_PARTICIPANT, REMOTE_PARTICIPANT, "dataspace-protocol-http")
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,4 +50,4 @@ allprojects { @@
             }
         }
-    }
+    }