Skip to content
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

fix: compile errors after upstream refactor #1166

Merged
merged 6 commits into from
Mar 27, 2024
Merged

fix: compile errors after upstream refactor #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9d0883
fix: compile errors after upstream refactor
paullatzelsperger Mar 26, 2024
cc4e567
trigger CI
paullatzelsperger Mar 26, 2024
6ddce01
DEPENDENCIES
paullatzelsperger Mar 26, 2024
cbe44b6
trigger CI
paullatzelsperger Mar 27, 2024
8a9434c
refresh deps
paullatzelsperger Mar 27, 2024
8087a3e
fix test, cleanup
paullatzelsperger Mar 27, 2024
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
23 changes: 16 additions & 7 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15
maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.2, Apache-2.0, approved, #8802
maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.16.2, Apache-2.0, approved, #11854
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.0, , restricted, clearlydefined
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.0, Apache-2.0, approved, #14161
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.0, Apache-2.0, approved, #4699
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.1, Apache-2.0, approved, #7930
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.2, Apache-2.0, approved, #7930
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.2, Apache-2.0, approved, #11853
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.0, , restricted, clearlydefined
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.0, Apache-2.0, approved, #14160
maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.16.2, Apache-2.0, approved, #11851
maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.15.1, Apache-2.0, approved, #9236
maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.15.2, Apache-2.0, approved, #9236
Expand All @@ -68,7 +68,7 @@ maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-a
maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.16.2, Apache-2.0, approved, #11856
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.1, Apache-2.0, approved, #7929
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.0, , restricted, clearlydefined
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.0, Apache-2.0, approved, #14162
maven/mavencentral/com.fasterxml.uuid/java-uuid-generator/4.1.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.1, Apache-2.0, approved, #7950
maven/mavencentral/com.github.cliftonlabs/json-simple/3.0.2, Apache-2.0, approved, clearlydefined
Expand Down Expand Up @@ -106,8 +106,8 @@ maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, cl
maven/mavencentral/com.jcraft/jzlib/1.1.3, BSD-2-Clause, approved, CQ6218
maven/mavencentral/com.lmax/disruptor/3.4.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.microsoft.azure/msal4j-persistence-extension/1.2.0, MIT, approved, clearlydefined
maven/mavencentral/com.microsoft.azure/msal4j/1.14.0, MIT, approved, clearlydefined
maven/mavencentral/com.microsoft.azure/msal4j/1.14.3, , restricted, clearlydefined
maven/mavencentral/com.microsoft.azure/msal4j/1.14.0, MIT, approved, #14159
maven/mavencentral/com.microsoft.azure/msal4j/1.14.3, MIT, approved, #14159
maven/mavencentral/com.microsoft.azure/msal4j/1.4.0, MIT, approved, clearlydefined
maven/mavencentral/com.networknt/json-schema-validator/1.0.76, Apache-2.0, approved, CQ22638
maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined
Expand Down Expand Up @@ -374,8 +374,10 @@ maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.5.2-SNAPSHOT,
maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/control-plane-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/control-plane-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/control-plane-policies-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/control-plane-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/core-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/crypto-common/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
Expand Down Expand Up @@ -446,9 +448,11 @@ maven/mavencentral/org.eclipse.edc/identity-trust-sts-spi/0.5.2-SNAPSHOT, Apache
maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jersey-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jersey-providers/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jetty-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/json-ld-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/json-ld-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/json-ld/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/junit-base/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
Expand All @@ -467,20 +471,25 @@ maven/mavencentral/org.eclipse.edc/oauth2-client/0.5.2-SNAPSHOT, Apache-2.0, app
maven/mavencentral/org.eclipse.edc/oauth2-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-definition-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-engine/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-evaluator/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-model/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/policy-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/query-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/security/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/sql-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/sql-lease/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/state-machine-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/state-machine/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/store-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/token-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/token-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
Expand Down Expand Up @@ -524,8 +533,8 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.20, EPL-2.0 OR Apache-2.
maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.flywaydb/flyway-core/10.10.0, , restricted, clearlydefined
maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.10.0, , restricted, clearlydefined
maven/mavencentral/org.flywaydb/flyway-core/10.10.0, Apache-2.0, approved, #14163
maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.10.0, Apache-2.0, approved, #14158
maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
Expand Down
24 changes: 15 additions & 9 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ project.subprojects.forEach {

}

configurations.all {
resolutionStrategy.cacheChangingModulesFor(10, "minutes")
resolutionStrategy.cacheDynamicVersionsFor(10, "minutes")
}

allprojects {
apply(plugin = "org.eclipse.edc.edc-build")

Expand Down Expand Up @@ -98,8 +103,8 @@ allprojects {
swagger {
title.set((project.findProperty("apiTitle") ?: "Tractus-X REST API") as String)
description =
(project.findProperty("apiDescription")
?: "Tractus-X REST APIs - merged by OpenApiMerger") as String
(project.findProperty("apiDescription")
?: "Tractus-X REST APIs - merged by OpenApiMerger") as String
outputFilename.set(project.name)
outputDirectory.set(file("${rootProject.projectDir.path}/resources/openapi/yaml"))
resourcePackages = setOf("org.eclipse.tractusx.edc")
Expand Down Expand Up @@ -151,13 +156,14 @@ allprojects {
subprojects {
afterEvaluate {
if (project.plugins.hasPlugin("com.github.johnrengelman.shadow") &&
file("${project.projectDir}/src/main/docker/Dockerfile").exists()
file("${project.projectDir}/src/main/docker/Dockerfile").exists()
) {
val buildDir = project.layout.buildDirectory.get().asFile

val agentFile = buildDir.resolve("opentelemetry-javaagent.jar")
// create task to download the opentelemetry agent
val openTelemetryAgentUrl = "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.32.0/opentelemetry-javaagent.jar"
val openTelemetryAgentUrl =
"https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.32.0/opentelemetry-javaagent.jar"
val downloadOtel = tasks.create("downloadOtel") {
// only execute task if the opentelemetry agent does not exist. invoke the "clean" task to force
onlyIf {
Expand All @@ -171,8 +177,8 @@ subprojects {
doLast {
val download = { url: String, destFile: File ->
ant.invokeMethod(
"get",
mapOf("src" to url, "dest" to destFile)
"get",
mapOf("src" to url, "dest" to destFile)
)
}
logger.lifecycle("Downloading OpenTelemetry Agent")
Expand Down Expand Up @@ -206,9 +212,9 @@ subprojects {
}
// make sure always runs after "dockerize" and after "copyOtel"
dockerTask
.dependsOn(tasks.named(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME))
.dependsOn(downloadOtel)
.dependsOn(copyLegalDocs)
.dependsOn(tasks.named(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME))
.dependsOn(downloadOtel)
.dependsOn(copyLegalDocs)
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,16 +337,6 @@ spec:
value: {{ .Values.vault.azure.certificate | quote }}
{{- end }}

#####################
## DATA ENCRYPTION ##
#####################

# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
- name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
- name: "EDC_DATA_ENCRYPTION_ALGORITHM"
value: "AES"

###########################
## AAS WRAPPER EXTENSION ##
###########################
Expand Down
10 changes: 0 additions & 10 deletions charts/tractusx-connector-memory/templates/deployment-runtime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,6 @@ spec:
- name: "EDC_VAULT_SECRETS"
value: {{ .Values.vault.secrets | quote}}

#####################
## DATA ENCRYPTION ##
#####################

# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
- name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
- name: "EDC_DATA_ENCRYPTION_ALGORITHM"
value: "AES"

###########################
## AAS WRAPPER EXTENSION ##
###########################
Expand Down
10 changes: 0 additions & 10 deletions charts/tractusx-connector/templates/deployment-controlplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,6 @@ spec:
- name: "EDC_VAULT_HASHICORP_API_HEALTH_CHECK_PATH"
value: {{ .Values.vault.hashicorp.paths.health | quote }}

#####################
## DATA ENCRYPTION ##
#####################

# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
- name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
- name: "EDC_DATA_ENCRYPTION_ALGORITHM"
value: "AES"

###########################
## AAS WRAPPER EXTENSION ##
###########################
Expand Down
1 change: 1 addition & 0 deletions core/edr-cache-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {

implementation(project(":spi:edr-spi"))

testImplementation(libs.edc.lib.query)
testImplementation(testFixtures(project(":spi:edr-spi")))
testImplementation(libs.edc.core.connector)

Expand Down
2 changes: 1 addition & 1 deletion ...va/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.eclipse.tractusx.edc.edr.core.defaults;

import org.eclipse.edc.connector.core.store.CriterionOperatorRegistryImpl;
import org.eclipse.edc.query.CriterionOperatorRegistryImpl;
import org.eclipse.edc.spi.persistence.Lease;
import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCacheTestBase;
import org.eclipse.tractusx.edc.edr.spi.store.EndpointDataReferenceCache;
Expand Down
1 change: 1 addition & 0 deletions edc-controlplane/edc-controlplane-base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ dependencies {
runtimeOnly(project(":edc-extensions:ssi:ssi-identity-extractor"))
runtimeOnly(project(":edc-extensions:cx-policy-legacy"))

runtimeOnly(libs.edc.core.connector)
runtimeOnly(libs.edc.core.controlplane)
runtimeOnly(libs.edc.core.policy.monitor)
runtimeOnly(libs.edc.config.filesystem)
Expand Down
4 changes: 1 addition & 3 deletions edc-controlplane/edc-runtime-memory/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ plugins {

dependencies {
implementation(libs.edc.spi.core)
runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
exclude(module = "data-encryption")
}
runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
runtimeOnly(project(":edc-dataplane:edc-dataplane-base"))
runtimeOnly(libs.edc.core.controlplane)
testImplementation(libs.edc.junit)
Expand Down
1 change: 1 addition & 0 deletions edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies {
implementation(libs.edc.spi.identity.did)
implementation(libs.edc.spi.dataplane.dataplane)
implementation(libs.edc.core.token)
implementation(libs.edc.lib.query)

testImplementation(libs.edc.junit)
testImplementation(libs.edc.dpf.core)
Expand Down
2 changes: 1 addition & 1 deletion ...actusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceImplComponentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.SignedJWT;
import org.eclipse.edc.boot.vault.InMemoryVault;
import org.eclipse.edc.connector.core.store.CriterionOperatorRegistryImpl;
import org.eclipse.edc.connector.dataplane.framework.store.InMemoryAccessTokenDataStore;
import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver;
import org.eclipse.edc.junit.annotations.ComponentTest;
import org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames;
import org.eclipse.edc.query.CriterionOperatorRegistryImpl;
import org.eclipse.edc.security.token.jwt.CryptoConverter;
import org.eclipse.edc.spi.iam.TokenParameters;
import org.eclipse.edc.spi.result.Result;
Expand Down
1 change: 1 addition & 0 deletions edc-tests/miw-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencies {
testImplementation(libs.edc.ext.jsonld)
testImplementation(libs.edc.dsp)
testImplementation(libs.edc.lib.http)
testImplementation(libs.edc.lib.jsonld)
testImplementation(testFixtures(libs.edc.sql.core))


Expand Down
4 changes: 3 additions & 1 deletion edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {

// use basic (all in-mem) control plane
implementation(project(":edc-controlplane:edc-controlplane-base")) {
exclude(module = "data-encryption")
exclude(module = "ssi-identity-core")
exclude(module = "ssi-miw-credential-client")
exclude(module = "ssi-identity-extractor")
Expand Down Expand Up @@ -58,6 +57,9 @@ dependencies {

// for the controller
implementation(libs.jakarta.rsApi)

runtimeOnly(libs.edc.lib.store)

}

application {
Expand Down
1 change: 0 additions & 1 deletion edc-tests/runtime/iatp/runtime-memory-iatp-dim/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {

// use basic (all in-mem) control plane
implementation(project(":edc-controlplane:edc-controlplane-base")) {
exclude(module = "data-encryption")
exclude(module = "ssi-identity-core")
exclude(module = "ssi-miw-credential-client")
exclude(module = "ssi-identity-extractor")
Expand Down
1 change: 0 additions & 1 deletion edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {

// use basic (all in-mem) control plane
implementation(project(":edc-controlplane:edc-controlplane-base")) {
exclude(module = "data-encryption")
exclude(module = "ssi-identity-core")
exclude(module = "ssi-miw-credential-client")
exclude(module = "ssi-identity-extractor")
Expand Down
1 change: 0 additions & 1 deletion edc-tests/runtime/iatp/runtime-memory-sts/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {

// use basic (all in-mem) control plane
implementation(project(":edc-controlplane:edc-controlplane-base")) {
exclude(module = "data-encryption")
exclude(module = "ssi-identity-core")
exclude(module = "ssi-miw-credential-client")
exclude(module = "ssi-identity-extractor")
Expand Down
4 changes: 1 addition & 3 deletions edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ plugins {
dependencies {

// use basic (all in-mem) control plane
implementation(project(":edc-controlplane:edc-controlplane-base")) {
exclude(module = "data-encryption")
}
implementation(project(":edc-controlplane:edc-controlplane-base"))
implementation(project(":core:json-ld-core"))


Expand Down
1 change: 0 additions & 1 deletion edc-tests/runtime/runtime-postgresql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dependencies {

// use basic (all in-mem) control plane
implementation(project(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")) {
exclude(module = "data-encryption")
exclude(module = "json-ld-core")
exclude(module = "ssi-identity-core")
exclude(module = "ssi-miw-credential-client")
Expand Down
Loading
Loading