build: update shadow plugin group id

eclipse-edc · Dec 18, 2024 · 5f395f1 · 5f395f1
1 parent 69ca3f1
commit 5f395f1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/e2e-tests/build.gradle.kts b/e2e-tests/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     testImplementation(libs.testcontainers.junit)
     testImplementation(libs.edc.spi.dataplane)
     testImplementation(testFixtures(project(":extensions:common:obs:obs-core")))
+
     testCompileOnly(project(":extensions:data-plane:data-plane-obs"))
     testCompileOnly(project(":extensions:control-plane:provision-obs"))
     testCompileOnly(project(":launchers:e2e-test"))

diff --git a/e2e-tests/src/test/java/com/huawei/cloud/tests/ObsTransferEndToEndTest.java b/e2e-tests/src/test/java/com/huawei/cloud/tests/ObsTransferEndToEndTest.java
@@ -26,8 +26,9 @@
 import org.eclipse.edc.connector.api.signaling.transform.to.JsonObjectToDataFlowResponseMessageTransformer;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
-import org.eclipse.edc.junit.extensions.EdcClassRuntimesExtension;
-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.RuntimePerClassExtension;
 import org.eclipse.edc.spi.result.Failure;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.transfer.DataFlowStartMessage;
@@ -80,18 +81,18 @@ public class ObsTransferEndToEndTest {
     private static final String PROVIDER_SK = "provider-sk";
 
     @RegisterExtension
-    static EdcClassRuntimesExtension runtimes = new EdcClassRuntimesExtension(
-            new EdcRuntimeExtension(
-                    ":launchers:e2e-test",
-                    "consumer",
-                    CONSUMER.controlPlaneConfiguration()
-            ),
-            new EdcRuntimeExtension(
-                    ":launchers:e2e-test",
-                    "provider",
-                    PROVIDER.controlPlaneConfiguration()
-            )
-    );
+    static RuntimeExtension consumer = new RuntimePerClassExtension(new EmbeddedRuntime(
+            "consumer",
+            CONSUMER.controlPlaneConfiguration(),
+            ":launchers:e2e-test"
+    ));
+
+    @RegisterExtension
+    static RuntimeExtension provider = new RuntimePerClassExtension(new EmbeddedRuntime(
+            "provider",
+            PROVIDER.controlPlaneConfiguration(),
+            ":launchers:e2e-test"
+    ));
 
     @Container
     private final GenericContainer<?> providerContainer = new GenericContainer<>(MINIO_DOCKER_IMAGE)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -47,6 +47,7 @@ edc-spi-dataplane = { module = "org.eclipse.edc:data-plane-spi", version.ref = "
 edc-spi-dataplane-selector = { module = "org.eclipse.edc:data-plane-selector-spi", version.ref = "edc" }
 edc-spi-datasource-transaction = { module = "org.eclipse.edc:transaction-datasource-spi", version.ref = "edc" }
 edc-spi-policymonitor = { module = "org.eclipse.edc:policy-monitor-spi", version.ref = "edc" }
+edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" }
 edc-sql-assetindex = { module = "org.eclipse.edc:asset-index-sql", version.ref = "edc" }
 edc-sql-contract-definition = { module = "org.eclipse.edc:contract-definition-store-sql", version.ref = "edc" }
 edc-sql-contract-negotiation = { module = "org.eclipse.edc:contract-negotiation-store-sql", version.ref = "edc" }
@@ -91,3 +92,6 @@ huawei-dws-jdbc = { module = "com.huaweicloud.dws:huaweicloud-dws-jdbc", version
 
 [bundles]
 edc-dpf = ["edc-dpf-signaling","edc-dpf-signaling-api","edc-dpf-public-api", "edc-dpf-selector-core", "edc-spi-dataplane-selector"]
+
+[plugins]
+shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
diff --git a/launchers/e2e-test/build.gradle.kts b/launchers/e2e-test/build.gradle.kts
@@ -16,13 +16,12 @@ plugins {
     // Apply the java-library plugin for API and implementation separation.
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }
 
 
 dependencies {
 
-
     runtimeOnly(project(":extensions:control-plane:provision-obs"))
     runtimeOnly(project(":extensions:data-plane:data-plane-obs"))
 
@@ -32,6 +31,7 @@ dependencies {
     runtimeOnly(libs.edc.core.controlplane.apiclient)
     runtimeOnly(libs.edc.dpf.iam)
     runtimeOnly(libs.edc.dpf.public.api)
+    runtimeOnly(libs.edc.spi.web)
     runtimeOnly(libs.edc.ext.http)
     runtimeOnly(libs.edc.jsonld)
     runtimeOnly(libs.edc.core.token)
@@ -46,7 +46,6 @@ dependencies {
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
-    exclude("**/pom.properties", "**/pom.xm")
     mergeServiceFiles()
     archiveFileName.set("hds-connector.jar")
 }

diff --git a/launchers/huawei-cloud-runtime/build.gradle.kts b/launchers/huawei-cloud-runtime/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
     // Apply the java-library plugin for API and implementation separation.
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }