From dc01f22c97f8511b3ffdb0d16a26b323d517cbab Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Fri, 30 Sep 2022 13:24:17 +0200 Subject: [PATCH 1/2] chore: adopt current EDC snapshot (runtime-metamodel) --- .../identityhub/verifier/CredentialsVerifierExtension.java | 4 ++-- .../verifier/JwtCredentialsVerifierExtension.java | 4 ++-- .../identityhub/IdentityHubExtension.java | 6 +++--- gradle.properties | 2 +- .../systemtests/VerifiableCredentialsIntegrationTest.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/CredentialsVerifierExtension.java b/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/CredentialsVerifierExtension.java index 8483f0a16..ef2edfb73 100644 --- a/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/CredentialsVerifierExtension.java +++ b/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/CredentialsVerifierExtension.java @@ -18,9 +18,9 @@ import org.eclipse.dataspaceconnector.iam.did.spi.credentials.CredentialsVerifier; import org.eclipse.dataspaceconnector.identityhub.client.IdentityHubClientImpl; import org.eclipse.dataspaceconnector.identityhub.credentials.VerifiableCredentialsJwtServiceImpl; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Inject; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provider; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; -import org.eclipse.dataspaceconnector.spi.system.Inject; -import org.eclipse.dataspaceconnector.spi.system.Provider; import org.eclipse.dataspaceconnector.spi.system.ServiceExtension; import org.eclipse.dataspaceconnector.spi.types.TypeManager; diff --git a/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/JwtCredentialsVerifierExtension.java b/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/JwtCredentialsVerifierExtension.java index 1a9120404..f1fa21523 100644 --- a/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/JwtCredentialsVerifierExtension.java +++ b/extensions/identity-hub-verifier/src/main/java/org/eclipse/dataspaceconnector/identityhub/verifier/JwtCredentialsVerifierExtension.java @@ -15,9 +15,9 @@ package org.eclipse.dataspaceconnector.identityhub.verifier; import org.eclipse.dataspaceconnector.iam.did.spi.resolution.DidPublicKeyResolver; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Inject; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provider; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; -import org.eclipse.dataspaceconnector.spi.system.Inject; -import org.eclipse.dataspaceconnector.spi.system.Provider; import org.eclipse.dataspaceconnector.spi.system.ServiceExtension; /** diff --git a/extensions/identity-hub/src/main/java/org/eclipse/dataspaceconnector/identityhub/IdentityHubExtension.java b/extensions/identity-hub/src/main/java/org/eclipse/dataspaceconnector/identityhub/IdentityHubExtension.java index 7f4ca8291..b85fc33e3 100644 --- a/extensions/identity-hub/src/main/java/org/eclipse/dataspaceconnector/identityhub/IdentityHubExtension.java +++ b/extensions/identity-hub/src/main/java/org/eclipse/dataspaceconnector/identityhub/IdentityHubExtension.java @@ -22,10 +22,10 @@ import org.eclipse.dataspaceconnector.identityhub.selfdescription.SelfDescriptionLoader; import org.eclipse.dataspaceconnector.identityhub.store.IdentityHubInMemoryStore; import org.eclipse.dataspaceconnector.identityhub.store.IdentityHubStore; -import org.eclipse.dataspaceconnector.spi.EdcSetting; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.EdcSetting; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Inject; +import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provider; import org.eclipse.dataspaceconnector.spi.WebService; -import org.eclipse.dataspaceconnector.spi.system.Inject; -import org.eclipse.dataspaceconnector.spi.system.Provider; import org.eclipse.dataspaceconnector.spi.system.ServiceExtension; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; diff --git a/gradle.properties b/gradle.properties index 9bf91e087..d21c60689 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ projectGroup=org.eclipse.dataspaceconnector.identityhub # defaultVersion is used when "-PidentityHubVersion...." is no supplied. Should always be equal to edcVersion! defaultVersion=0.0.1-SNAPSHOT edcGroup=org.eclipse.dataspaceconnector -edcVersion=0.0.1-milestone-6 +edcVersion=0.0.1-20220930-SNAPSHOT assertj=3.23.1 jupiterVersion=5.9.0 storageBlobVersion=12.11.0 diff --git a/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java b/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java index 0a3e800d2..6cf7276eb 100644 --- a/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java +++ b/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.map; import static org.eclipse.dataspaceconnector.identityhub.credentials.VerifiableCredentialsJwtService.VERIFIABLE_CREDENTIALS_KEY; -@IntegrationTest +//@IntegrationTest @ExtendWith(EdcExtension.class) class VerifiableCredentialsIntegrationTest { From 1c7fcdaeae5e30730b767210e584c76760a01f59 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Fri, 30 Sep 2022 13:36:38 +0200 Subject: [PATCH 2/2] removed commented annotation --- .../systemtests/VerifiableCredentialsIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java b/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java index 6cf7276eb..0a3e800d2 100644 --- a/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java +++ b/system-tests/tests/src/test/java/org/eclipse/dataspaceconnector/identityhub/systemtests/VerifiableCredentialsIntegrationTest.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.map; import static org.eclipse.dataspaceconnector.identityhub.credentials.VerifiableCredentialsJwtService.VERIFIABLE_CREDENTIALS_KEY; -//@IntegrationTest +@IntegrationTest @ExtendWith(EdcExtension.class) class VerifiableCredentialsIntegrationTest {