fix: load IdsTokenValidationServiceExtension properly (eclipse-edc#1352)

* fix: move ServiceExtension file of ids-token-validation to be loaded properly * samples: exclude :extensions:ids:ids-token-validation where :extensions:iam:iam-mock is used
chenliang613 · May 25, 2022 · b6efd8d · b6efd8d
1 parent ce6d67c
commit b6efd8d
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 20 deletions.
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/launchers/basic/build.gradle.kts b/launchers/basic/build.gradle.kts
@@ -22,7 +22,9 @@ val jupiterVersion: String by project
 
 dependencies {
     implementation(project(":core"))
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
     implementation(project(":extensions:api:data-management"))
     implementation(project(":extensions:api:observability"))
     implementation(project(":extensions:api:data-management"))

diff --git a/samples/04.0-file-transfer/consumer/build.gradle.kts b/samples/04.0-file-transfer/consumer/build.gradle.kts
@@ -34,7 +34,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 }
 
 application {

diff --git a/samples/04.0-file-transfer/provider/build.gradle.kts b/samples/04.0-file-transfer/provider/build.gradle.kts
@@ -34,7 +34,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":samples:04.0-file-transfer:transfer-file"))
 }

diff --git a/samples/04.1-file-transfer-listener/consumer/build.gradle.kts b/samples/04.1-file-transfer-listener/consumer/build.gradle.kts
@@ -34,7 +34,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":samples:04.1-file-transfer-listener:listener"))
 }

diff --git a/samples/04.2-modify-transferprocess/consumer/build.gradle.kts b/samples/04.2-modify-transferprocess/consumer/build.gradle.kts
@@ -36,9 +36,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
-
-
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 }
 
 application {

diff --git a/samples/04.3-open-telemetry/consumer/build.gradle.kts b/samples/04.3-open-telemetry/consumer/build.gradle.kts
@@ -32,7 +32,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
     runtimeOnly(project(":extensions:http:jersey-micrometer"))
     runtimeOnly(project(":extensions:http:jetty-micrometer"))
     runtimeOnly(project(":extensions:jdk-logger-monitor"))

diff --git a/samples/04.3-open-telemetry/provider/build.gradle.kts b/samples/04.3-open-telemetry/provider/build.gradle.kts
@@ -32,7 +32,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":samples:04.0-file-transfer:transfer-file"))
     runtimeOnly(project(":extensions:jdk-logger-monitor"))

diff --git a/samples/05-file-transfer-cloud/consumer/build.gradle.kts b/samples/05-file-transfer-cloud/consumer/build.gradle.kts
@@ -41,7 +41,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":samples:05-file-transfer-cloud:api"))
 

diff --git a/samples/05-file-transfer-cloud/provider/build.gradle.kts b/samples/05-file-transfer-cloud/provider/build.gradle.kts
@@ -37,7 +37,9 @@ dependencies {
     implementation(project(":extensions:api:auth-tokenbased"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":samples:05-file-transfer-cloud:transfer-file"))
     implementation(project(":samples:05-file-transfer-cloud:data-seeder"))

diff --git a/samples/other/custom-runtime/build.gradle.kts b/samples/other/custom-runtime/build.gradle.kts
@@ -22,8 +22,9 @@ val jupiterVersion: String by project
 
 dependencies {
     api(project(":core:boot"))
-    implementation(project(":data-protocols:ids"))
-
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":extensions:iam:iam-mock"))
     implementation(project(":extensions:filesystem:configuration-fs"))

diff --git a/system-tests/e2e-transfer-test/control-plane/build.gradle.kts b/system-tests/e2e-transfer-test/control-plane/build.gradle.kts
@@ -19,7 +19,9 @@ plugins {
 dependencies {
     implementation(project(":common:token-generation-lib"))
     implementation(project(":core"))
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
     implementation(project(":extensions:filesystem:vault-fs"))
     implementation(project(":extensions:http"))
     implementation(project(":extensions:iam:iam-mock"))

diff --git a/system-tests/runtimes/azure-data-factory-transfer-consumer/build.gradle.kts b/system-tests/runtimes/azure-data-factory-transfer-consumer/build.gradle.kts
@@ -30,7 +30,9 @@ dependencies {
 
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":extensions:azure:blobstorage"))
     implementation(project(":extensions:azure:vault"))

diff --git a/system-tests/runtimes/azure-data-factory-transfer-provider/build.gradle.kts b/system-tests/runtimes/azure-data-factory-transfer-provider/build.gradle.kts
@@ -58,7 +58,9 @@ dependencies {
     implementation(project(":extensions:azure:blobstorage"))
     implementation(project(":extensions:azure:vault"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 }
 
 application {

diff --git a/system-tests/runtimes/azure-storage-transfer-consumer/build.gradle.kts b/system-tests/runtimes/azure-storage-transfer-consumer/build.gradle.kts
@@ -31,7 +31,9 @@ dependencies {
 
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     implementation(project(":extensions:azure:blobstorage"))
 

diff --git a/system-tests/runtimes/azure-storage-transfer-provider/build.gradle.kts b/system-tests/runtimes/azure-storage-transfer-provider/build.gradle.kts
@@ -45,7 +45,9 @@ dependencies {
     implementation(project(":extensions:iam:iam-mock"))
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 }
 
 application {

diff --git a/system-tests/runtimes/file-transfer-consumer/build.gradle.kts b/system-tests/runtimes/file-transfer-consumer/build.gradle.kts
@@ -35,7 +35,9 @@ dependencies {
 
     implementation(project(":extensions:api:data-management"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 
     api(project(":spi"))
     implementation(project(":common:util"))

diff --git a/system-tests/runtimes/file-transfer-provider/build.gradle.kts b/system-tests/runtimes/file-transfer-provider/build.gradle.kts
@@ -53,7 +53,9 @@ dependencies {
     implementation(project(":extensions:filesystem:configuration-fs"))
     implementation(project(":extensions:iam:iam-mock"))
 
-    implementation(project(":data-protocols:ids"))
+    implementation(project(":data-protocols:ids")) {
+        exclude("org.eclipse.dataspaceconnector","ids-token-validation")
+    }
 }
 
 application {