From 0627e149eabde4b681bd53572556474fda6f8d8f Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:07:02 +0200 Subject: [PATCH] chore: split token-core into token-lib (#4572) * chore: split token-core into token-lib * fix e2e, comp and pg tests * checkstyle * fix license header --- core/common/lib/token-lib/build.gradle.kts | 31 +++++++++++++++++++ .../edc/token/InMemoryJtiValidationStore.java | 0 .../edc/token/JwtGenerationService.java | 0 .../edc/token/TokenDecoratorRegistryImpl.java | 0 .../TokenValidationRulesRegistryImpl.java | 0 .../edc/token/TokenValidationServiceImpl.java | 0 .../token/rules/AudienceValidationRule.java | 7 ++--- .../ExpirationIssuedAtValidationRule.java | 10 +++--- .../token/rules/NotBeforeValidationRule.java | 7 ++--- core/common/token-core/build.gradle.kts | 10 ++---- .../controlplane-base-bom/build.gradle.kts | 3 +- dist/bom/dataplane-base-bom/build.gradle.kts | 1 + dist/bom/sts-feature-bom/build.gradle.kts | 1 + .../auth/auth-delegated/build.gradle.kts | 3 +- .../build.gradle.kts | 2 +- .../jwt/rules/IssuerEqualsSubjectRule.java | 6 ++-- .../identity-trust-core/build.gradle.kts | 2 +- .../identity-trust-sts-core/build.gradle.kts | 3 +- .../build.gradle.kts | 2 +- .../iam/oauth2/oauth2-core/build.gradle.kts | 3 +- .../iam/oauth2/oauth2-daps/build.gradle.kts | 1 + .../build.gradle.kts | 4 +-- .../data-plane-iam/build.gradle.kts | 2 +- settings.gradle.kts | 1 + .../identity-trust-spi/build.gradle.kts | 1 + .../DcpParticipantAgentServiceExtension.java | 1 + .../runtimes/data-plane/build.gradle.kts | 1 + .../e2e/DataPlaneSelectorEndToEndTest.java | 1 + .../data-plane/build.gradle.kts | 1 + 29 files changed, 69 insertions(+), 35 deletions(-) create mode 100644 core/common/lib/token-lib/build.gradle.kts rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/InMemoryJtiValidationStore.java (100%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/JwtGenerationService.java (100%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/TokenDecoratorRegistryImpl.java (100%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/TokenValidationRulesRegistryImpl.java (100%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java (100%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java (87%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java (88%) rename core/common/{token-core => lib/token-lib}/src/main/java/org/eclipse/edc/token/rules/NotBeforeValidationRule.java (90%) diff --git a/core/common/lib/token-lib/build.gradle.kts b/core/common/lib/token-lib/build.gradle.kts new file mode 100644 index 00000000000..b99c0e25aa4 --- /dev/null +++ b/core/common/lib/token-lib/build.gradle.kts @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + * + * Contributors: + * Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation + * + */ + +plugins { + `java-library` + `maven-publish` +} + +dependencies { + api(project(":spi:common:keys-spi")) + api(project(":spi:common:token-spi")) + api(project(":spi:common:jwt-spi")) + api(project(":spi:common:jwt-signer-spi")) + + implementation(project(":core:common:lib:crypto-common-lib")) // for the CryptoConverter + implementation(libs.nimbus.jwt) + api(libs.bouncyCastle.bcpkixJdk18on) +} + + diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/InMemoryJtiValidationStore.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/InMemoryJtiValidationStore.java similarity index 100% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/InMemoryJtiValidationStore.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/InMemoryJtiValidationStore.java diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/JwtGenerationService.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/JwtGenerationService.java similarity index 100% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/JwtGenerationService.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/JwtGenerationService.java diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/TokenDecoratorRegistryImpl.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/TokenDecoratorRegistryImpl.java similarity index 100% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/TokenDecoratorRegistryImpl.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/TokenDecoratorRegistryImpl.java diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/TokenValidationRulesRegistryImpl.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/TokenValidationRulesRegistryImpl.java similarity index 100% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/TokenValidationRulesRegistryImpl.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/TokenValidationRulesRegistryImpl.java diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java similarity index 100% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java similarity index 87% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java index a87a887e55f..efe7cc2b1b1 100644 --- a/core/common/token-core/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java +++ b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/rules/AudienceValidationRule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 - 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * * This program and the accompanying materials are made available under the * terms of the Apache License, Version 2.0 which is available at @@ -14,6 +14,7 @@ package org.eclipse.edc.token.rules; +import org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.token.spi.TokenValidationRule; @@ -22,8 +23,6 @@ import java.util.Map; -import static com.nimbusds.jwt.JWTClaimNames.AUDIENCE; - public class AudienceValidationRule implements TokenValidationRule { private final String expectedAudience; @@ -34,7 +33,7 @@ public AudienceValidationRule(String expectedAudience) { @Override public Result checkRule(@NotNull ClaimToken toVerify, @Nullable Map additional) { - var audiences = toVerify.getListClaim(AUDIENCE); + var audiences = toVerify.getListClaim(JwtRegisteredClaimNames.AUDIENCE); if (audiences.isEmpty()) { return Result.failure("Required audience (aud) claim is missing in token"); } else if (!audiences.contains(expectedAudience)) { diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java similarity index 88% rename from core/common/token-core/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java rename to core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java index 06128ba5694..18dbad0bf49 100644 --- a/core/common/token-core/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java +++ b/core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/rules/ExpirationIssuedAtValidationRule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 - 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * * This program and the accompanying materials are made available under the * terms of the Apache License, Version 2.0 which is available at @@ -14,6 +14,7 @@ package org.eclipse.edc.token.rules; +import org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.token.spi.TokenValidationRule; @@ -23,9 +24,6 @@ import java.time.Clock; import java.util.Map; -import static com.nimbusds.jwt.JWTClaimNames.EXPIRATION_TIME; -import static com.nimbusds.jwt.JWTClaimNames.ISSUED_AT; - /** * Token validation rule that checks if the token is not expired and if the "issued at" claim is valued correctly @@ -55,7 +53,7 @@ public ExpirationIssuedAtValidationRule(Clock clock, int issuedAtLeeway, boolean @Override public Result checkRule(@NotNull ClaimToken toVerify, @Nullable Map additional) { var now = clock.instant(); - var expires = toVerify.getInstantClaim(EXPIRATION_TIME); + var expires = toVerify.getInstantClaim(JwtRegisteredClaimNames.EXPIRATION_TIME); if (expires == null) { if (!allowNull) { return Result.failure("Required expiration time (exp) claim is missing in token"); @@ -64,7 +62,7 @@ public Result checkRule(@NotNull ClaimToken toVerify, @Nullable Map checkRule(@NotNull ClaimToken toVerify, @Nullable Map additional) { var now = clock.instant(); var leewayNow = now.plusSeconds(notBeforeLeeway); - var notBefore = toVerify.getInstantClaim(NOT_BEFORE); + var notBefore = toVerify.getInstantClaim(JwtRegisteredClaimNames.NOT_BEFORE); if (notBefore == null) { if (!allowNull) { diff --git a/core/common/token-core/build.gradle.kts b/core/common/token-core/build.gradle.kts index 1a64db3b7af..3c4a3f29bbb 100644 --- a/core/common/token-core/build.gradle.kts +++ b/core/common/token-core/build.gradle.kts @@ -18,14 +18,8 @@ plugins { } dependencies { - api(project(":spi:common:keys-spi")) - api(project(":spi:common:token-spi")) - api(project(":spi:common:jwt-spi")) - api(project(":spi:common:jwt-signer-spi")) - - implementation(project(":core:common:lib:crypto-common-lib")) // for the CryptoConverter - implementation(libs.nimbus.jwt) - api(libs.bouncyCastle.bcpkixJdk18on) + implementation(project(":core:common:lib:token-lib")) + implementation(project(":core:common:lib:crypto-common-lib")) } diff --git a/dist/bom/controlplane-base-bom/build.gradle.kts b/dist/bom/controlplane-base-bom/build.gradle.kts index 9c7c099ed39..a92b0d184f0 100644 --- a/dist/bom/controlplane-base-bom/build.gradle.kts +++ b/dist/bom/controlplane-base-bom/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { // core dependencies api(project(":core:common:boot")) api(project(":core:common:connector-core")) + api(project(":core:common:token-core")) api(project(":core:control-plane:control-plane-core")) api(project(":core:common:edr-store-core")) api(project(":data-protocols:dsp")) @@ -49,5 +50,5 @@ dependencies { } edcBuild { - + } \ No newline at end of file diff --git a/dist/bom/dataplane-base-bom/build.gradle.kts b/dist/bom/dataplane-base-bom/build.gradle.kts index 3bfd07bd05e..e5a8485c951 100644 --- a/dist/bom/dataplane-base-bom/build.gradle.kts +++ b/dist/bom/dataplane-base-bom/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { // core dependencies api(project(":core:common:boot")) api(project(":core:common:connector-core")) + api(project(":core:common:token-core")) api(project(":core:data-plane:data-plane-core")) diff --git a/dist/bom/sts-feature-bom/build.gradle.kts b/dist/bom/sts-feature-bom/build.gradle.kts index bb47d8cb1d2..70c2285eb83 100644 --- a/dist/bom/sts-feature-bom/build.gradle.kts +++ b/dist/bom/sts-feature-bom/build.gradle.kts @@ -24,6 +24,7 @@ dependencies { // core dependencies api(project(":core:common:boot")) api(project(":core:common:connector-core")) + api(project(":core:common:token-core")) // extension dependencies diff --git a/extensions/common/auth/auth-delegated/build.gradle.kts b/extensions/common/auth/auth-delegated/build.gradle.kts index 7742e7ce59f..b54e1cbfb26 100644 --- a/extensions/common/auth/auth-delegated/build.gradle.kts +++ b/extensions/common/auth/auth-delegated/build.gradle.kts @@ -19,8 +19,9 @@ plugins { dependencies { api(project(":spi:common:auth-spi")) api(project(":spi:common:token-spi")) - implementation(project(":core:common:token-core")) // for the validation rules implementation(project(":core:common:lib:crypto-common-lib")) + implementation(project(":core:common:lib:token-lib")) + implementation(libs.jakarta.rsApi) implementation(libs.nimbus.jwt) diff --git a/extensions/common/crypto/jwt-verifiable-credentials/build.gradle.kts b/extensions/common/crypto/jwt-verifiable-credentials/build.gradle.kts index 4bec69c6075..0b61f6412c9 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/build.gradle.kts +++ b/extensions/common/crypto/jwt-verifiable-credentials/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { implementation(project(":spi:common:jwt-spi")) implementation(project(":spi:common:identity-trust-spi")) implementation(project(":core:common:lib:util-lib")) - implementation(project(":core:common:token-core")) // for the token rules + implementation(project(":core:common:lib:token-lib")) testImplementation(project(":core:common:lib:json-ld-lib")) diff --git a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/IssuerEqualsSubjectRule.java b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/IssuerEqualsSubjectRule.java index dd99332e090..c1dc426ca12 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/IssuerEqualsSubjectRule.java +++ b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/IssuerEqualsSubjectRule.java @@ -14,7 +14,7 @@ package org.eclipse.edc.verifiablecredentials.jwt.rules; -import com.nimbusds.jwt.JWTClaimNames; +import org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.token.spi.TokenValidationRule; @@ -29,8 +29,8 @@ public class IssuerEqualsSubjectRule implements TokenValidationRule { @Override public Result checkRule(@NotNull ClaimToken toVerify, @Nullable Map additional) { - var iss = toVerify.getStringClaim(JWTClaimNames.ISSUER); - var sub = toVerify.getStringClaim(JWTClaimNames.SUBJECT); + var iss = toVerify.getStringClaim(JwtRegisteredClaimNames.ISSUER); + var sub = toVerify.getStringClaim(JwtRegisteredClaimNames.SUBJECT); return iss != null && Objects.equals(iss, sub) ? Result.success() : diff --git a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts index 9b18214bee3..4209452f1e4 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(project(":spi:common:participant-spi")) implementation(project(":core:common:lib:util-lib")) implementation(project(":core:common:lib:crypto-common-lib")) - implementation(project(":core:common:token-core")) + implementation(project(":core:common:lib:token-lib")) implementation(project(":extensions:common:crypto:lib:jws2020-lib")) implementation(project(":extensions:common:crypto:jwt-verifiable-credentials")) implementation(project(":extensions:common:crypto:ldp-verifiable-credentials")) diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts index 7672f2364ca..ac784d353e4 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts @@ -7,10 +7,11 @@ dependencies { api(project(":spi:common:transaction-spi")) api(project(":spi:common:identity-trust-spi")) api(project(":spi:common:identity-trust-sts-spi")) + api(project(":spi:common:jwt-signer-spi")) implementation(project(":spi:common:keys-spi")) implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded")) - implementation(project(":core:common:token-core")) + implementation(project(":core:common:lib:token-lib")) implementation(project(":core:common:lib:store-lib")) testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi"))) diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/build.gradle.kts index dfcb335f348..952ac877895 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(project(":core:common:lib:util-lib")) testImplementation(testFixtures(project(":spi:common:identity-trust-spi"))) testImplementation(project(":core:common:junit")) - testImplementation(project(":core:common:token-core")) + testImplementation(project(":core:common:lib:token-lib")) testImplementation(libs.nimbus.jwt) } diff --git a/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts b/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts index fbd0773bfe8..5db76b45b7c 100644 --- a/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts +++ b/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts @@ -20,8 +20,9 @@ dependencies { api(project(":spi:common:http-spi")) api(project(":spi:common:oauth2-spi")) implementation(project(":spi:common:keys-spi")) + implementation(project(":spi:common:jwt-signer-spi")) implementation(project(":extensions:common:iam:oauth2:oauth2-client")) - implementation(project(":core:common:token-core")) + implementation(project(":core:common:lib:token-lib")) implementation(libs.nimbus.jwt) diff --git a/extensions/common/iam/oauth2/oauth2-daps/build.gradle.kts b/extensions/common/iam/oauth2/oauth2-daps/build.gradle.kts index 3cad7f9ac35..fc45197b044 100644 --- a/extensions/common/iam/oauth2/oauth2-daps/build.gradle.kts +++ b/extensions/common/iam/oauth2/oauth2-daps/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { api(project(":spi:common:oauth2-spi")) testImplementation(project(":core:common:connector-core")) + testImplementation(project(":core:common:token-core")) testImplementation(project(":extensions:common:iam:oauth2:oauth2-core")) testImplementation(project(":core:common:junit")) testImplementation(libs.testcontainers.junit) diff --git a/extensions/data-plane/data-plane-http-oauth2-core/build.gradle.kts b/extensions/data-plane/data-plane-http-oauth2-core/build.gradle.kts index 702935c9923..9f15487d737 100644 --- a/extensions/data-plane/data-plane-http-oauth2-core/build.gradle.kts +++ b/extensions/data-plane/data-plane-http-oauth2-core/build.gradle.kts @@ -19,8 +19,8 @@ plugins { dependencies { api(project(":spi:data-plane:data-plane-http-spi")) api(project(":spi:common:oauth2-spi")) - api(project(":core:common:token-core")) - + api(project(":spi:common:jwt-signer-spi")) + implementation(project(":core:common:lib:token-lib")) implementation(project(":spi:common:keys-spi")) testImplementation(project(":core:common:junit")) diff --git a/extensions/data-plane/data-plane-iam/build.gradle.kts b/extensions/data-plane/data-plane-iam/build.gradle.kts index 024cd351797..391111d5d3d 100644 --- a/extensions/data-plane/data-plane-iam/build.gradle.kts +++ b/extensions/data-plane/data-plane-iam/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":spi:common:token-spi")) api(project(":spi:data-plane:data-plane-spi")) - implementation(project(":core:common:token-core")) + implementation(project(":core:common:lib:token-lib")) testImplementation(project(":core:common:junit")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 503be31ab3b..ba4a162ca93 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -54,6 +54,7 @@ include(":core:common:lib:http-lib") include(":core:common:lib:keys-lib") include(":core:common:lib:query-lib") include(":core:common:lib:store-lib") +include(":core:common:lib:token-lib") include(":core:common:lib:state-machine-lib") include(":core:common:lib:crypto-common-lib") include(":core:common:lib:json-lib") diff --git a/spi/common/identity-trust-spi/build.gradle.kts b/spi/common/identity-trust-spi/build.gradle.kts index 2c9644a6975..c548c889c54 100644 --- a/spi/common/identity-trust-spi/build.gradle.kts +++ b/spi/common/identity-trust-spi/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":spi:common:core-spi")) + api(project(":spi:common:token-spi")) api(project(":spi:common:participant-spi")) api(project(":spi:common:policy:request-policy-context-spi")) api(project(":spi:common:policy-engine-spi")) diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java index 5bba25a7e68..662db51b6c2 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java @@ -14,6 +14,7 @@ package org.eclipse.edc.iam.identitytrust.spi; + import org.eclipse.edc.participant.spi.ParticipantAgentServiceExtension; /** diff --git a/system-tests/e2e-dataplane-tests/runtimes/data-plane/build.gradle.kts b/system-tests/e2e-dataplane-tests/runtimes/data-plane/build.gradle.kts index 153e4955fab..240bf31b15d 100644 --- a/system-tests/e2e-dataplane-tests/runtimes/data-plane/build.gradle.kts +++ b/system-tests/e2e-dataplane-tests/runtimes/data-plane/build.gradle.kts @@ -17,6 +17,7 @@ plugins { dependencies { implementation(project(":core:common:connector-core")) + implementation(project(":core:common:token-core")) implementation(project(":core:data-plane:data-plane-core")) implementation(project(":extensions:common:api:control-api-configuration")) implementation(project(":extensions:common:http")) diff --git a/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/DataPlaneSelectorEndToEndTest.java b/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/DataPlaneSelectorEndToEndTest.java index 979f0305aa2..f9162e574ae 100644 --- a/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/DataPlaneSelectorEndToEndTest.java +++ b/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/DataPlaneSelectorEndToEndTest.java @@ -55,6 +55,7 @@ public class DataPlaneSelectorEndToEndTest { "edc.core.retry.retries.max", "0" ), ":core:common:connector-core", + ":core:common:token-core", ":core:control-plane:control-plane-core", ":core:data-plane-selector:data-plane-selector-core", ":extensions:control-plane:transfer:transfer-data-plane-signaling", diff --git a/system-tests/e2e-transfer-test/data-plane/build.gradle.kts b/system-tests/e2e-transfer-test/data-plane/build.gradle.kts index 6815345ca90..63dba80ac39 100644 --- a/system-tests/e2e-transfer-test/data-plane/build.gradle.kts +++ b/system-tests/e2e-transfer-test/data-plane/build.gradle.kts @@ -18,6 +18,7 @@ plugins { dependencies { implementation(project(":core:data-plane:data-plane-core")) + implementation(project(":core:common:token-core")) implementation(project(":extensions:common:api:control-api-configuration")) implementation(project(":extensions:common:http")) implementation(project(":extensions:control-plane:api:control-plane-api-client"))