Skip to content

build: fix compilation and deprecations #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndr-brt merged 1 commit into from
Jul 27, 2026
Merged

build: fix compilation and deprecations #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,17 @@ import org.eclipse.edc.plugins.edcbuild.plugins.MergeOpenApiSpecTask
plugins {
`java-library`
alias(libs.plugins.edc.build)
alias(libs.plugins.autodoc) apply false
}

val edcScmConnection: String by project
val edcScmUrl: String by project

buildscript {
dependencies {
val version: String by project
classpath("org.eclipse.edc.autodoc:org.eclipse.edc.autodoc.gradle.plugin:$version")
}
}

val edcBuildId = libs.plugins.edc.build.get().pluginId

allprojects {
apply(plugin = edcBuildId)
apply(plugin = "org.eclipse.edc.autodoc")
apply(plugin = rootProject.libs.plugins.edc.build.get().pluginId)
apply(plugin = rootProject.libs.plugins.autodoc.get().pluginId)

configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
pom {
scmConnection.set(edcScmConnection)
scmUrl.set(edcScmUrl)
scmConnection.set(rootProject.property("edcScmConnection") as String)
scmUrl.set(rootProject.property("edcScmUrl") as String)
}
}

Expand Down
5 changes: 0 additions & 5 deletions ...-keypairs-transit/src/main/java/org/eclipse/edc/identityhub/TransitJwsSignerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ public TransitJwsSignerProvider(TransitEngine transitEngine) {
this.transitEngine = transitEngine;
}

@Override
public Result<JWSSigner> createJwsSigner(String privateKeyId) {
return createJwsSigner(null, privateKeyId);
}

@Override
public Result<JWSSigner> createJwsSigner(String participantContextId, String privateKeyName) {
return Result.success(new TransitSigner(transitEngine, privateKeyName));
Expand Down
1 change: 0 additions & 1 deletion ...pairs-transit/src/test/java/org/eclipse/edc/identityhub/TransitJwsSignerProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TransitJwsSignerProviderTest {

@Test
void createJwsSigner() {
assertThat(provider.createJwsSigner("test-key")).isSucceeded().isInstanceOf(TransitSigner.class);
assertThat(provider.createJwsSigner("test-participant", "test-key")).isSucceeded().isInstanceOf(TransitSigner.class);
}
}
2 changes: 0 additions & 2 deletions ...a/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ void setup() throws JOSEException {
var vpSigningKey = createKey(Curve.P_384, "vc-key");
when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), anyString())).thenReturn(Result.failure("not found"));
when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), eq(PRIVATE_KEY_ALIAS))).thenReturn(Result.success(new ECDSASigner(vpSigningKey)));

when(signerProvider.createJwsSigner(anyString())).thenThrow(new AssertionError("This method is deprecated and not to be used anymore"));
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions ...est/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ void setup() throws JOSEException {
var vpSigningKey = createKey(Curve.P_384, "vc-key");
when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), anyString())).thenReturn(Result.failure("not found"));
when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), eq(PRIVATE_KEY_ALIAS))).thenReturn(Result.success(new ECDSASigner(vpSigningKey)));

when(signerProvider.createJwsSigner(anyString())).thenThrow(new AssertionError("This method is deprecated and not to be used anymore"));
}

@SuppressWarnings({ "unchecked", "rawtypes" })
Expand Down
2 changes: 1 addition & 1 deletion extensions/api/identity-api/did-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("identity-api")
apiGroup("identity-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/identity-api/keypair-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("identity-api")
apiGroup("identity-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/identity-api/participant-context-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("identity-api")
apiGroup("identity-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/identity-api/verifiable-credentials-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("identity-api")
apiGroup("identity-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/issuer-admin-api/attestation-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("issuer-admin-api")
apiGroup("issuer-admin-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/issuer-admin-api/credential-definition-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("issuer-admin-api")
apiGroup("issuer-admin-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/issuer-admin-api/credentials-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("issuer-admin-api")
apiGroup("issuer-admin-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/issuer-admin-api/holder-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("issuer-admin-api")
apiGroup("issuer-admin-api")
}
}
2 changes: 1 addition & 1 deletion extensions/api/issuer-admin-api/issuance-process-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("issuer-admin-api")
apiGroup("issuer-admin-api")
}
}
2 changes: 1 addition & 1 deletion extensions/sts/sts-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("sts-api")
apiGroup("sts-api")
}
}
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,5 @@ connector = [

[plugins]
edc-build = { id = "org.eclipse.edc.edc-build", version = "1.5.2" }
autodoc = { id = "org.eclipse.edc.autodoc", version.ref = "edc" }
shadow = { id = "com.gradleup.shadow", version = "9.5.1" }
2 changes: 1 addition & 1 deletion protocols/dcp/dcp-identityhub/credential-offer-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("credentials-api")
apiGroup("credentials-api")
}
}
2 changes: 1 addition & 1 deletion protocols/dcp/dcp-identityhub/credentials-api-configuration/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("credentials-api")
apiGroup("credentials-api")
}
}
2 changes: 1 addition & 1 deletion protocols/dcp/dcp-identityhub/presentation-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("credentials-api")
apiGroup("credentials-api")
}
}
2 changes: 1 addition & 1 deletion protocols/dcp/dcp-identityhub/storage-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("credentials-api")
apiGroup("credentials-api")
}
}
2 changes: 1 addition & 1 deletion protocols/dcp/dcp-issuer/dcp-issuer-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ dependencies {

edcBuild {
swagger {
apiGroup.set("issuer-api")
apiGroup("issuer-api")
}
}
3 changes: 0 additions & 3 deletions spi/participant-context-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ plugins {
`maven-publish`
}

val swagger: String by project

dependencies {
api(libs.edc.spi.core)
implementation(libs.edc.spi.core) // ParticipantManifest#serviceEndpoint
implementation(libs.opentelemetry.api)
testImplementation(libs.edc.lib.jsonld)
}
Loading