fix: adopt EDC build 1.4.0 (#968)

paullatzelsperger · web-flow · commit fb74a6bd91c8 · 2026-04-14T15:37:10.000+02:00
* fix: adopt EDC build 1.4.0

* trigger ci

* fix tests
diff --git a/core/common-core/build.gradle.kts b/core/common-core/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     implementation(libs.edc.spi.dcp) //SignatureSuiteRegistry
     implementation(libs.edc.spi.http)
     implementation(libs.edc.spi.transaction)
-    implementation(libs.edc.spi.jwt.signer)
+    implementation(libs.edc.spi.jwt)
     implementation(libs.edc.jsonld) // for the JSON-LD mapper
     implementation(libs.edc.lib.util)
     implementation(libs.edc.lib.store)
diff --git a/core/common-core/src/main/java/org/eclipse/edc/identityhub/DefaultServicesExtension.java b/core/common-core/src/main/java/org/eclipse/edc/identityhub/DefaultServicesExtension.java
@@ -29,7 +29,7 @@
 import org.eclipse.edc.identityhub.spi.verifiablecredentials.store.CredentialOfferStore;
 import org.eclipse.edc.identityhub.spi.verifiablecredentials.store.CredentialStore;
 import org.eclipse.edc.jsonld.spi.JsonLd;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.jwt.validation.jti.JtiValidationStore;
 import org.eclipse.edc.keys.spi.PrivateKeyResolver;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
diff --git a/core/identity-hub-core/build.gradle.kts b/core/identity-hub-core/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation(project(":core:lib:common-lib"))
     implementation(libs.edc.spi.dcp) //SignatureSuiteRegistry
     implementation(libs.edc.spi.transaction)
-    implementation(libs.edc.spi.jwt.signer)
+    implementation(libs.edc.spi.jwt)
     implementation(libs.edc.verifiablecredentials)
     implementation(libs.edc.jsonld) // for the JSON-LD mapper
     implementation(libs.edc.lib.util)
diff --git a/core/identity-hub-core/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java b/core/identity-hub-core/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java
@@ -55,7 +55,7 @@
 import org.eclipse.edc.identityhub.spi.verification.SelfIssuedTokenVerifier;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.keys.spi.KeyParserRegistry;
 import org.eclipse.edc.keys.spi.LocalPublicKeyService;
 import org.eclipse.edc.keys.spi.PrivateKeyResolver;
diff --git a/core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verifiablepresentation/generators/JwtEnvelopedPresentationGeneratorTest.java b/core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verifiablepresentation/generators/JwtEnvelopedPresentationGeneratorTest.java
@@ -25,7 +25,7 @@
 import com.nimbusds.jwt.SignedJWT;
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.JwtGenerationService;
diff --git a/core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verifiablepresentation/generators/JwtPresentationGeneratorTest.java b/core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verifiablepresentation/generators/JwtPresentationGeneratorTest.java
@@ -22,7 +22,7 @@
 import com.nimbusds.jwt.SignedJWT;
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.JwtGenerationService;
diff --git a/core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verification/SelfIssuedTokenVerifierImplComponentTest.java b/core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verification/SelfIssuedTokenVerifierImplComponentTest.java
@@ -107,7 +107,7 @@ void selfIssuedTokenNotVerified() {
 
         var selfIssuedIdToken = createSignedJwt(spoofedKey, new JWTClaimsSet.Builder().claim("foo", "bar").jwtID(UUID.randomUUID().toString()).build());
         assertThat(verifier.verify(selfIssuedIdToken, PARTICIPANT_CONTEXT_ID)).isFailed()
-                .detail().isEqualTo("Token verification failed");
+                .detail().isEqualTo("JWT signature not valid");
 
     }
 
@@ -246,7 +246,7 @@ void accessToken_notVerified() {
                 .build());
 
         assertThat(verifier.verify(siToken, PARTICIPANT_CONTEXT_ID)).isFailed()
-                .detail().isEqualTo("Token verification failed");
+                .detail().isEqualTo("JWT signature not valid");
     }
 
     @Test
diff --git a/core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/IssuanceServicesExtension.java b/core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/IssuanceServicesExtension.java
@@ -41,7 +41,7 @@
 import org.eclipse.edc.issuerservice.spi.issuance.rule.CredentialRuleDefinitionEvaluator;
 import org.eclipse.edc.issuerservice.spi.issuance.rule.CredentialRuleDefinitionValidatorRegistry;
 import org.eclipse.edc.issuerservice.spi.issuance.rule.CredentialRuleFactoryRegistry;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
diff --git a/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java b/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java
@@ -28,7 +28,7 @@
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
 import org.eclipse.edc.issuerservice.spi.issuance.model.CredentialDefinition;
 import org.eclipse.edc.issuerservice.spi.issuance.model.MappingDefinition;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.JwtGenerationService;
 import org.eclipse.edc.token.spi.TokenGenerationService;
diff --git a/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java b/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java
@@ -28,7 +28,7 @@
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
 import org.eclipse.edc.issuerservice.spi.issuance.model.CredentialDefinition;
 import org.eclipse.edc.issuerservice.spi.issuance.model.MappingDefinition;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.JwtGenerationService;
 import org.eclipse.edc.token.spi.TokenGenerationService;
diff --git a/e2e-tests/identity-api-tests/src/test/java/org/eclipse/edc/identityhub/tests/CredentialOfferApiEndToEndTest.java b/e2e-tests/identity-api-tests/src/test/java/org/eclipse/edc/identityhub/tests/CredentialOfferApiEndToEndTest.java
@@ -178,7 +178,7 @@ void storeCredentialOffer_tokenSignedWithWrongKey(IdentityHub identityHub) throw
                     .then()
                     .log().ifValidationFails()
                     .statusCode(403)
-                    .body(containsString("Token verification failed"));
+                    .body(containsString("ID token verification failed: JWT signature not valid"));
         }
 
         @DisplayName("CredentialMessage contains an illegal format, expect HTTP 400")
diff --git a/e2e-tests/identity-api-tests/src/test/java/org/eclipse/edc/identityhub/tests/PresentationApiEndToEndTest.java b/e2e-tests/identity-api-tests/src/test/java/org/eclipse/edc/identityhub/tests/PresentationApiEndToEndTest.java
@@ -251,7 +251,7 @@ void query_tokenVerificationFails_shouldReturn401(IdentityHub identityHub) throw
                     .statusCode(401)
                     .log().ifValidationFails()
                     .body("[0].type", equalTo("AuthenticationFailed"))
-                    .body("[0].message", equalTo("ID token verification failed: Token verification failed"));
+                    .body("[0].message", equalTo("ID token verification failed: JWT signature not valid"));
         }
 
         @Test
diff --git a/e2e-tests/identity-api-tests/src/test/java/org/eclipse/edc/identityhub/tests/StorageApiEndToEndTest.java b/e2e-tests/identity-api-tests/src/test/java/org/eclipse/edc/identityhub/tests/StorageApiEndToEndTest.java
@@ -177,7 +177,7 @@ void storeCredential_tokenSignedWithWrongKey(IdentityHub identityHub) throws JOS
                     .then()
                     .log().ifValidationFails()
                     .statusCode(401)
-                    .body(containsString("Token verification failed"));
+                    .body(containsString("ID token verification failed: JWT signature not valid"));
         }
 
         @DisplayName("CredentialMessage contains an illegal format, expect HTTP 400")
diff --git a/extensions/sts/sts-core/build.gradle.kts b/extensions/sts/sts-core/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     api(libs.edc.spi.transaction)
     api(libs.edc.spi.dcp)
     api(project(":spi:sts-spi"))
-    api(libs.edc.spi.jwt.signer)
+    api(libs.edc.spi.jwt)
 
     implementation(libs.edc.spi.keys)
     implementation(project(":extensions:sts:sts-account-service-local"))
diff --git a/extensions/sts/sts-core/src/main/java/org/eclipse/edc/iam/decentralizedclaims/sts/EmbeddedStsServiceExtension.java b/extensions/sts/sts-core/src/main/java/org/eclipse/edc/iam/decentralizedclaims/sts/EmbeddedStsServiceExtension.java
@@ -20,7 +20,7 @@
 import org.eclipse.edc.iam.decentralizedclaims.sts.spi.service.StsClientTokenGeneratorService;
 import org.eclipse.edc.identityhub.spi.authentication.ParticipantSecureTokenService;
 import org.eclipse.edc.identityhub.spi.keypair.KeyPairService;
-import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
+import org.eclipse.edc.jwt.spi.signer.JwsSignerProvider;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,7 +28,6 @@ edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
 edc-config-fs = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }
 edc-spi-jwt = { module = "org.eclipse.edc:jwt-spi", version.ref = "edc" }
-edc-spi-jwt-signer = { module = "org.eclipse.edc:jwt-signer-spi", version.ref = "edc" }
 edc-spi-http = { module = "org.eclipse.edc:http-spi", version.ref = "edc" }
 edc-spi-keys = { module = "org.eclipse.edc:keys-spi", version.ref = "edc" }
 edc-spi-participantcontext-config = { module = "org.eclipse.edc:participant-context-config-spi", version.ref = "edc" }
@@ -139,5 +138,5 @@ connector = [
 ]
 
 [plugins]
-edc-build = { id = "org.eclipse.edc.edc-build", version = "1.3.0" }
+edc-build = { id = "org.eclipse.edc.edc-build", version = "1.4.0" }
 shadow = { id = "com.gradleup.shadow", version = "9.4.1" }

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ void selfIssuedTokenNotVerified() {`
`107`	`107`
`108`	`108`	`var selfIssuedIdToken = createSignedJwt(spoofedKey, new JWTClaimsSet.Builder().claim("foo", "bar").jwtID(UUID.randomUUID().toString()).build());`
`109`	`109`	`assertThat(verifier.verify(selfIssuedIdToken, PARTICIPANT_CONTEXT_ID)).isFailed()`
`110`		`- .detail().isEqualTo("Token verification failed");`
	`110`	`+ .detail().isEqualTo("JWT signature not valid");`
`111`	`111`
`112`	`112`	`}`
`113`	`113`
`@@ -246,7 +246,7 @@ void accessToken_notVerified() {`
`246`	`246`	`.build());`
`247`	`247`
`248`	`248`	`assertThat(verifier.verify(siToken, PARTICIPANT_CONTEXT_ID)).isFailed()`
`249`		`- .detail().isEqualTo("Token verification failed");`
	`249`	`+ .detail().isEqualTo("JWT signature not valid");`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`@Test`