ci: fix tests

* Prepare release 0.9.0 * ci: fix tests --------- Co-authored-by: eclipse-edc-bot <[email protected]> Co-authored-by: ndr_brt <[email protected]>
eclipse-edc · Sep 5, 2024 · f9a4751 · f9a4751
1 parent d5ce75e
commit f9a4751
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 25 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -74,7 +74,7 @@ maven/mavencentral/com.google.cloud/libraries-bom/26.38.0, , restricted, clearly
 maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, CC-BY-2.5, approved, #15220
 maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159
 maven/mavencentral/com.google.code.gson/gson/2.8.9, Apache-2.0, approved, CQ23496
-maven/mavencentral/com.google.crypto.tink/tink/1.14.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.crypto.tink/tink/1.15.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.22.0, Apache-2.0, approved, #10661
 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.23.0, Apache-2.0, approved, #11083
@@ -105,7 +105,7 @@ maven/mavencentral/com.google.protobuf/protobuf-java-util/3.25.3, BSD-3-Clause,
 maven/mavencentral/com.google.protobuf/protobuf-java/3.25.3, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/com.google.re2j/re2j/1.7, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.40, Apache-2.0, approved, #15156
-maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.0, LGPL-2.1-or-later, restricted, clearlydefined
+maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.1, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #16060
 maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.9.3, Apache-2.0 AND MPL-2.0, approved, #3225
@@ -181,7 +181,7 @@ maven/mavencentral/net.bytebuddy/byte-buddy/1.14.18, Apache-2.0 AND BSD-3-Clause
 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.9, Apache-2.0 AND BSD-3-Clause, approved, #7163
 maven/mavencentral/net.bytebuddy/byte-buddy/1.15.0, Apache-2.0 AND BSD-3-Clause, approved, #16008
 maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #15196
-maven/mavencentral/net.sf.saxon/Saxon-HE/12.5, NOASSERTION, restricted, clearlydefined
+maven/mavencentral/net.sf.saxon/Saxon-HE/12.5, MPL-2.0-no-copyleft-exception AND (LicenseRef-scancode-proprietary-license AND MPL-2.0-no-copyleft-exception) AND (MPL-2.0-no-copyleft-exception AND X11) AND (MIT AND MPL-2.0-no-copyleft-exception) AND (MPL-1.0 AND MPL-2.0-no-copyleft-exception) AND (Apache-2.0 AND MPL-2.0-no-copyleft-exception) AND MPL-1.0, restricted, #16061
 maven/mavencentral/org.antlr/antlr4-runtime/4.13.2, BSD-3-Clause, approved, #10767
 maven/mavencentral/org.apache.arrow/arrow-format/15.0.2, Apache-2.0, approved, #12854
 maven/mavencentral/org.apache.arrow/arrow-memory-core/15.0.2, Apache-2.0, approved, #12855
@@ -261,12 +261,9 @@ maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.10.0-SNAPSHOT, Apach
 maven/mavencentral/org.eclipse.edc/control-plane-transform/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/core-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-control-api/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-http/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-public-api-v2/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-selector-api/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -393,7 +390,7 @@ maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.11.0, EPL-2.0, appro
 maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.11.0, EPL-2.0, approved, #15940
 maven/mavencentral/org.junit.platform/junit-platform-commons/1.11.0, EPL-2.0, approved, #15936
 maven/mavencentral/org.junit.platform/junit-platform-engine/1.11.0, EPL-2.0, approved, #15932
-maven/mavencentral/org.junit/junit-bom/5.11.0, , restricted, clearlydefined
+maven/mavencentral/org.junit/junit-bom/5.11.0, EPL-2.0, approved, #16062
 maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.15, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484
 maven/mavencentral/org.mockito/mockito-core/5.13.0, MIT, approved, clearlydefined
 maven/mavencentral/org.mockito/mockito-core/5.2.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #7401

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,10 +32,8 @@ edc-core-controlplane-api = { module = "org.eclipse.edc:control-plane-api", vers
 edc-core-controlplane-apiclient = { module = "org.eclipse.edc:control-plane-api-client", version.ref = "edc" }
 edc-core-dataplane = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" }
 edc-core-dataplane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" }
-edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "edc" }
 edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" }
 edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" }
-edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api-v2", version.ref = "edc" }
 edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
 edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
 edc-data-plane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" }

diff --git a/...s/src/test/java/org/eclipse/edc/test/system/bigquery/BigQueryTransferIntegrationTest.java b/...s/src/test/java/org/eclipse/edc/test/system/bigquery/BigQueryTransferIntegrationTest.java
@@ -26,7 +26,9 @@
 import org.eclipse.edc.connector.controlplane.test.system.utils.Participant;
 import org.eclipse.edc.connector.controlplane.test.system.utils.PolicyFixtures;
 import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates;
-import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
+import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
+import org.eclipse.edc.junit.extensions.RuntimeExtension;
+import org.eclipse.edc.junit.extensions.RuntimePerMethodExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.BigQueryEmulatorContainer;
@@ -132,8 +134,7 @@ public class BigQueryTransferIntegrationTest  {
                     "--data-from-yaml", "/data/data.yaml");
 
     @RegisterExtension
-    private final EdcRuntimeExtension bqProvider = new EdcRuntimeExtension(
-            ":system-tests:runtimes:gcp-bigquery-transfer-provider",
+    private final RuntimeExtension bqProvider = new RuntimePerMethodExtension(new EmbeddedRuntime(
             "provider",
             Map.ofEntries(
                 Map.entry("edc.participant.id", "provider"),
@@ -156,12 +157,12 @@ public class BigQueryTransferIntegrationTest  {
                 Map.entry("web.http.control.path", "/control"),
                 Map.entry("edc.dataplane.token.validation.endpoint", "http://localhost:19192/control/token"),
                 Map.entry("edc.gcp.project.id", "edc-test-project")
-            )
-    );
+            ),
+            ":system-tests:runtimes:gcp-bigquery-transfer-provider"
+    ));
 
     @RegisterExtension
-    private final EdcRuntimeExtension bqConsumer = new EdcRuntimeExtension(
-            ":system-tests:runtimes:gcp-bigquery-transfer-consumer",
+    private final RuntimeExtension bqConsumer = new RuntimePerMethodExtension(new EmbeddedRuntime(
             "consumer",
             Map.ofEntries(
                 Map.entry("edc.participant.id", "consumer"),
@@ -184,8 +185,9 @@ public class BigQueryTransferIntegrationTest  {
                 Map.entry("web.http.control.path", "/control"),
                 Map.entry("edc.dataplane.token.validation.endpoint", "http://localhost:29192/control/token"),
                 Map.entry("edc.gcp.project.id", "edc-test-project")
-            )
-    );
+            ),
+            ":system-tests:runtimes:gcp-bigquery-transfer-consumer"
+    ));
 
     private final BigQueryTransferParticipant consumerClient = BigQueryTransferParticipant.Builder.newInstance()
             .id("consumer")
@@ -203,7 +205,7 @@ public class BigQueryTransferIntegrationTest  {
 
 
     @Test
-    void transferTable_success() throws InterruptedException {
+    void transferTable_success() {
         assertTrue(BQ_CONTAINER.isRunning());
 
         var ports = BQ_CONTAINER.getExposedPorts();
@@ -263,7 +265,7 @@ void transferTable_success() throws InterruptedException {
     }
 
     @Test
-    void transferTable_sinkFail() throws InterruptedException {
+    void transferTable_sinkFail() {
         assertTrue(BQ_CONTAINER.isRunning());
 
         var ports = BQ_CONTAINER.getExposedPorts();
@@ -298,7 +300,7 @@ void transferTable_sinkFail() throws InterruptedException {
     }
 
     @Test
-    void transferTable_sourceFail() throws InterruptedException {
+    void transferTable_sourceFail() {
         assertTrue(BQ_CONTAINER.isRunning());
 
         var ports = BQ_CONTAINER.getExposedPorts();

diff --git a/system-tests/runtimes/gcp-bigquery-transfer-consumer/build.gradle.kts b/system-tests/runtimes/gcp-bigquery-transfer-consumer/build.gradle.kts
@@ -35,8 +35,6 @@ dependencies {
   implementation(libs.edc.data.plane.selector.api)
   implementation(libs.edc.data.plane.selector.core)
 
-  implementation(libs.edc.data.plane.control.api)
-  implementation(libs.edc.data.plane.public.api)
   implementation(libs.edc.data.plane.core)
   implementation(libs.edc.data.plane.http)
   implementation(libs.edc.data.plane.util)

diff --git a/system-tests/runtimes/gcp-bigquery-transfer-provider/build.gradle.kts b/system-tests/runtimes/gcp-bigquery-transfer-provider/build.gradle.kts
@@ -34,8 +34,6 @@ dependencies {
   implementation(libs.edc.data.plane.selector.api)
   implementation(libs.edc.data.plane.selector.core)
 
-  implementation(libs.edc.data.plane.control.api)
-  implementation(libs.edc.data.plane.public.api)
   implementation(libs.edc.data.plane.core)
   implementation(libs.edc.data.plane.http)
   implementation(libs.edc.data.plane.util)