From 41e8c195c7e3848fc925a07dbbe3e8a3329b3ef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 07:48:26 +0000 Subject: [PATCH 01/37] chore(deps): bump jackson from 2.17.0 to 2.17.1 Bumps `jackson` from 2.17.0 to 2.17.1. Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.17.0 to 2.17.1 Updates `com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp` from 2.17.0 to 2.17.1 - [Commits](https://github.com/FasterXML/jackson-datatypes-misc/compare/jackson-datatypes-misc-parent-2.17.0...jackson-datatypes-misc-parent-2.17.1) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6bddd9f1f..e897e3502 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ aws = "2.25.40" azure-identity = "1.12.0" bouncyCastle-jdk18on = "1.78.1" flyway = "10.11.1" -jackson = "2.17.0" +jackson = "2.17.1" jakarta-json = "2.0.1" jupiter = "5.10.2" nimbus = "9.37.3" From caf79a2358690d7b5cb4fc2717bfa02a6bf498ee Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 6 May 2024 09:59:39 +0200 Subject: [PATCH 02/37] chore: deps file --- DEPENDENCIES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DEPENDENCIES b/DEPENDENCIES index ec40da37f..67c875154 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -28,10 +28,12 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.1, Apache maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.1, Apache-2.0, approved, #7947 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.0, Apache-2.0, approved, #13672 +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.1, Apache-2.0, approved, #13672 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.1, Apache-2.0 AND MIT, approved, #4303 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.1, MIT AND Apache-2.0, approved, #7932 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.0, , approved, #13665 +maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.1, , approved, #13665 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.11.0, Apache-2.0, approved, CQ23093 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.0, approved, #2134 @@ -41,6 +43,7 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2. maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.1, Apache-2.0, approved, #7934 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.2, Apache-2.0, approved, #11605 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.0, Apache-2.0, approved, #13671 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.15.2, Apache-2.0, approved, #9160 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.17.0, Apache-2.0, approved, #14192 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.13.5, Apache-2.0, approved, #3768 @@ -50,6 +53,7 @@ maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.0, Apache-2.0, approved, #13669 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-jakarta-jsonp/2.17.1, 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 @@ -62,6 +66,7 @@ maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-prov maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.0, Apache-2.0, approved, #13668 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.1, Apache-2.0, approved, #7929 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.0, Apache-2.0, approved, #14162 +maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.1, 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.6.1, Apache-2.0, approved, #12789 maven/mavencentral/com.github.cliftonlabs/json-simple/3.0.2, Apache-2.0, approved, clearlydefined From 913b4b3684c1f5fd2a4089a6fef121993c4be34f Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Mon, 6 May 2024 13:35:02 +0200 Subject: [PATCH 03/37] fix: add notice.md to docker build for Mock Connector (#1287) --- edc-tests/runtime/mock-connector/notice.md | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 edc-tests/runtime/mock-connector/notice.md diff --git a/edc-tests/runtime/mock-connector/notice.md b/edc-tests/runtime/mock-connector/notice.md new file mode 100644 index 000000000..69d617e33 --- /dev/null +++ b/edc-tests/runtime/mock-connector/notice.md @@ -0,0 +1,28 @@ +# Notice for Docker image + +A mocked EDC Management API providing an instrumentation API for configuration. + +DockerHub: + +Eclipse Tractus-X product(s) installed within the image: + +## Tractus-X EDC Control Plane + +- GitHub: +- Project home: +- Dockerfile: +- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) + +## Used base image + +- [eclipse-temurin:22_36-jre-alpine](https://github.com/adoptium/containers) +- Official Eclipse Temurin DockerHub page: +- Eclipse Temurin Project: +- Additional information about the Eclipse Temurin + images: + +As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc +from the base distribution, along with any direct or indirect dependencies of the primary software being contained). + +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies +with any relevant licenses for all software contained within. From 5bca63b10b1c4a5e402b3a9559a1c758a88cd8d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:33:45 +0000 Subject: [PATCH 04/37] chore(deps): bump flyway from 10.11.1 to 10.12.0 Bumps `flyway` from 10.11.1 to 10.12.0. Updates `org.flywaydb:flyway-core` from 10.11.1 to 10.12.0 - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-10.11.1...flyway-10.12.0) Updates `org.flywaydb:flyway-database-postgresql` from 10.11.1 to 10.12.0 --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4ca549b4..a227e3620 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ awaitility = "4.2.1" aws = "2.25.40" azure-identity = "1.12.0" bouncyCastle-jdk18on = "1.78.1" -flyway = "10.11.1" +flyway = "10.12.0" jackson = "2.17.1" jakarta-json = "2.0.1" jupiter = "5.10.2" From 5fa5da489b5ad3a8656304f4a85d26eec6a6022c Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Tue, 7 May 2024 10:14:25 +0200 Subject: [PATCH 05/37] chore: deps file --- DEPENDENCIES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index e8d25d895..8240b1ef3 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -560,8 +560,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.11.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.11.1, Apache-2.0, approved, #14239 +maven/mavencentral/org.flywaydb/flyway-core/10.12.0, , restricted, clearlydefined +maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.12.0, , restricted, clearlydefined maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, 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.6, 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.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish From ae770d81a0d30ec37a75b288753d5a8fcfaf5d48 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Tue, 7 May 2024 10:18:30 +0200 Subject: [PATCH 06/37] chore: deps file --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 8240b1ef3..f26feb703 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -560,7 +560,7 @@ 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.12.0, , restricted, clearlydefined +maven/mavencentral/org.flywaydb/flyway-core/10.12.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.12.0, , restricted, clearlydefined maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, 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.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish From e6363108a4028b198b99a68dbe32bb3368bf9eb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 08:42:21 +0000 Subject: [PATCH 07/37] chore(deps): bump aws from 2.25.40 to 2.25.46 Bumps `aws` from 2.25.40 to 2.25.46. Updates `software.amazon.awssdk:s3` from 2.25.40 to 2.25.46 Updates `software.amazon.awssdk:s3-transfer-manager` from 2.25.40 to 2.25.46 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3-transfer-manager dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a227e3620..b01578407 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ edc = "0.6.3" apache-sshd = "2.12.1" assertj = "3.25.3" awaitility = "4.2.1" -aws = "2.25.40" +aws = "2.25.46" azure-identity = "1.12.0" bouncyCastle-jdk18on = "1.78.1" flyway = "10.12.0" From bfe30be1d5ecf9b6aa0a9d4a5d6d1d630aa467d4 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Tue, 7 May 2024 10:55:57 +0200 Subject: [PATCH 08/37] chore: deps file --- DEPENDENCIES | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index f26feb703..826768727 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -654,58 +654,58 @@ maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 maven/mavencentral/software.amazon.awssdk/annotations/2.24.10, Apache-2.0, approved, #13251 -maven/mavencentral/software.amazon.awssdk/annotations/2.25.40, Apache-2.0, approved, #13691 +maven/mavencentral/software.amazon.awssdk/annotations/2.25.46, Apache-2.0, approved, #13691 maven/mavencentral/software.amazon.awssdk/apache-client/2.24.10, Apache-2.0, approved, #13257 -maven/mavencentral/software.amazon.awssdk/apache-client/2.25.40, Apache-2.0, approved, #13687 +maven/mavencentral/software.amazon.awssdk/apache-client/2.25.46, Apache-2.0, approved, #13687 maven/mavencentral/software.amazon.awssdk/arns/2.24.10, Apache-2.0, approved, #13243 -maven/mavencentral/software.amazon.awssdk/arns/2.25.40, Apache-2.0, approved, #13695 +maven/mavencentral/software.amazon.awssdk/arns/2.25.46, Apache-2.0, approved, #13695 maven/mavencentral/software.amazon.awssdk/auth/2.24.10, Apache-2.0, approved, #13256 -maven/mavencentral/software.amazon.awssdk/auth/2.25.40, Apache-2.0, approved, #13692 +maven/mavencentral/software.amazon.awssdk/auth/2.25.46, Apache-2.0, approved, #13692 maven/mavencentral/software.amazon.awssdk/aws-core/2.24.10, Apache-2.0, approved, #13240 -maven/mavencentral/software.amazon.awssdk/aws-core/2.25.40, Apache-2.0, approved, #13702 +maven/mavencentral/software.amazon.awssdk/aws-core/2.25.46, Apache-2.0, approved, #13702 maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.24.10, Apache-2.0, approved, #13262 -maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.40, Apache-2.0, approved, #13701 +maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.46, Apache-2.0, approved, #13701 maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.24.10, Apache-2.0, approved, #13247 -maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.40, Apache-2.0, approved, #13684 +maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.46, Apache-2.0, approved, #13684 maven/mavencentral/software.amazon.awssdk/checksums-spi/2.24.10, Apache-2.0, approved, #13245 -maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.40, Apache-2.0, approved, #13686 +maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.46, Apache-2.0, approved, #13686 maven/mavencentral/software.amazon.awssdk/checksums/2.24.10, Apache-2.0, approved, #13242 -maven/mavencentral/software.amazon.awssdk/checksums/2.25.40, Apache-2.0, approved, #13677 +maven/mavencentral/software.amazon.awssdk/checksums/2.25.46, Apache-2.0, approved, #13677 maven/mavencentral/software.amazon.awssdk/crt-core/2.24.10, Apache-2.0, approved, #13252 -maven/mavencentral/software.amazon.awssdk/crt-core/2.25.40, Apache-2.0, approved, #13705 +maven/mavencentral/software.amazon.awssdk/crt-core/2.25.46, Apache-2.0, approved, #13705 maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.24.10, Apache-2.0, approved, #13246 -maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.40, Apache-2.0, approved, #13681 +maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.46, Apache-2.0, approved, #13681 maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.24.10, Apache-2.0, approved, #13253 -maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.40, Apache-2.0, approved, #13696 +maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.46, Apache-2.0, approved, #13696 maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.24.10, Apache-2.0, approved, #13264 -maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.40, Apache-2.0, approved, #13704 +maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.46, Apache-2.0, approved, #13704 maven/mavencentral/software.amazon.awssdk/http-auth/2.24.10, Apache-2.0, approved, #13248 -maven/mavencentral/software.amazon.awssdk/http-auth/2.25.40, Apache-2.0, approved, #13682 +maven/mavencentral/software.amazon.awssdk/http-auth/2.25.46, Apache-2.0, approved, #13682 maven/mavencentral/software.amazon.awssdk/http-client-spi/2.24.10, Apache-2.0, approved, #13259 -maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.40, Apache-2.0, approved, #13706 +maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.46, Apache-2.0, approved, #13706 maven/mavencentral/software.amazon.awssdk/iam/2.24.10, Apache-2.0, approved, #13444 maven/mavencentral/software.amazon.awssdk/identity-spi/2.24.10, Apache-2.0, approved, #13244 -maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.40, Apache-2.0, approved, #13685 +maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.46, Apache-2.0, approved, #13685 maven/mavencentral/software.amazon.awssdk/json-utils/2.24.10, Apache-2.0, approved, #13261 -maven/mavencentral/software.amazon.awssdk/json-utils/2.25.40, Apache-2.0, approved, #13698 +maven/mavencentral/software.amazon.awssdk/json-utils/2.25.46, Apache-2.0, approved, #13698 maven/mavencentral/software.amazon.awssdk/metrics-spi/2.24.10, Apache-2.0, approved, #13239 -maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.40, Apache-2.0, approved, #13680 +maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.46, Apache-2.0, approved, #13680 maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.24.10, Apache-2.0, approved, #13260 -maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.40, Apache-2.0, approved, #13693 +maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.46, Apache-2.0, approved, #13693 maven/mavencentral/software.amazon.awssdk/profiles/2.24.10, Apache-2.0, approved, #13258 -maven/mavencentral/software.amazon.awssdk/profiles/2.25.40, Apache-2.0, approved, #13697 +maven/mavencentral/software.amazon.awssdk/profiles/2.25.46, Apache-2.0, approved, #13697 maven/mavencentral/software.amazon.awssdk/protocol-core/2.24.10, Apache-2.0, approved, #13241 -maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.40, Apache-2.0, approved, #13679 +maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.46, Apache-2.0, approved, #13679 maven/mavencentral/software.amazon.awssdk/regions/2.24.10, Apache-2.0, approved, #13255 -maven/mavencentral/software.amazon.awssdk/regions/2.25.40, Apache-2.0, approved, #13694 -maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.40, Apache-2.0, approved, #13699 +maven/mavencentral/software.amazon.awssdk/regions/2.25.46, Apache-2.0, approved, #13694 +maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.46, Apache-2.0, approved, #13699 maven/mavencentral/software.amazon.awssdk/s3/2.24.10, Apache-2.0, approved, #13254 -maven/mavencentral/software.amazon.awssdk/s3/2.25.40, Apache-2.0, approved, #13688 +maven/mavencentral/software.amazon.awssdk/s3/2.25.46, Apache-2.0, approved, #13688 maven/mavencentral/software.amazon.awssdk/sdk-core/2.24.10, Apache-2.0, approved, #13265 -maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.40, Apache-2.0, approved, #13700 +maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.46, Apache-2.0, approved, #13700 maven/mavencentral/software.amazon.awssdk/sts/2.24.10, Apache-2.0, approved, #13442 maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.24.10, Apache-2.0, approved, #13249 -maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.40, Apache-2.0, approved, #13703 +maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.46, Apache-2.0, approved, #13703 maven/mavencentral/software.amazon.awssdk/utils/2.24.10, Apache-2.0, approved, #13250 -maven/mavencentral/software.amazon.awssdk/utils/2.25.40, Apache-2.0, approved, #13689 +maven/mavencentral/software.amazon.awssdk/utils/2.25.46, Apache-2.0, approved, #13689 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined From ae43c7fb41475b2771a19914c1be602d2869aab3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 09:19:37 +0000 Subject: [PATCH 09/37] chore(deps): bump com.azure:azure-identity from 1.12.0 to 1.12.1 Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.12.0...azure-identity_1.12.1) --- updated-dependencies: - dependency-name: com.azure:azure-identity dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b01578407..c35f7932f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ apache-sshd = "2.12.1" assertj = "3.25.3" awaitility = "4.2.1" aws = "2.25.46" -azure-identity = "1.12.0" +azure-identity = "1.12.1" bouncyCastle-jdk18on = "1.78.1" flyway = "10.12.0" jackson = "2.17.1" From 7e16ca4dc7295c89120af05667f9719d2c17edde Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Tue, 7 May 2024 11:25:17 +0200 Subject: [PATCH 10/37] chore: deps file --- DEPENDENCIES | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 826768727..c15b9e15f 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,11 +8,13 @@ maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, maven/mavencentral/com.azure/azure-core-http-netty/1.13.11, MIT AND Apache-2.0, approved, #7948 maven/mavencentral/com.azure/azure-core-http-netty/1.14.0, MIT AND Apache-2.0, approved, #13238 maven/mavencentral/com.azure/azure-core-http-netty/1.14.2, MIT AND Apache-2.0, approved, #13238 +maven/mavencentral/com.azure/azure-core-http-netty/1.15.0, , restricted, clearlydefined maven/mavencentral/com.azure/azure-core/1.45.1, MIT AND Apache-2.0, approved, #11845 maven/mavencentral/com.azure/azure-core/1.46.0, MIT AND Apache-2.0, approved, #13234 maven/mavencentral/com.azure/azure-core/1.48.0, MIT AND Apache-2.0, approved, #14409 +maven/mavencentral/com.azure/azure-core/1.49.0, , restricted, clearlydefined maven/mavencentral/com.azure/azure-identity/1.11.2, MIT AND Apache-2.0, approved, #13237 -maven/mavencentral/com.azure/azure-identity/1.12.0, MIT AND Apache-2.0, approved, #14412 +maven/mavencentral/com.azure/azure-identity/1.12.1, MIT AND Apache-2.0, approved, #14412 maven/mavencentral/com.azure/azure-json/1.1.0, MIT AND Apache-2.0, approved, #10547 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.7.3, MIT, approved, #10868 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.8.2, MIT, approved, #13690 From 545917ea99718ae70316bbddd9f0207b3eec6bc9 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Wed, 8 May 2024 12:17:43 +0200 Subject: [PATCH 11/37] chore: rename sokrates/plato => consumer/provider --- .../tractusx/edc/lifecycle/DataWiper.java | 8 +- .../catalog/DimCatalogIntegrationTest.java | 34 ++--- .../DimHttpPullTransferIntegrationTest.java | 24 +-- .../edc/tests/catalog/CatalogTest.java | 142 +++++++++--------- .../tests/edrv2/EdrCacheApiEndToEndTest.java | 34 +++-- .../edc/tests/edrv2/NegotiateEdrTest.java | 50 +++--- .../edc/tests/ParticipantAwareTest.java | 4 +- .../edc/tests/TestRuntimeConfiguration.java | 8 +- .../edc/tests/runtimes/DataWiper.java | 8 +- .../transfer/HttpConsumerPullBaseTest.java | 38 ++--- .../tests/transfer/ProviderPushBaseTest.java | 10 +- .../AbstractIatpConsumerPullTest.java | 90 +++++------ .../transfer/DimHttpConsumerPullTest.java | 24 +-- .../transfer/StsHttpConsumerPullTest.java | 22 +-- .../policy/PolicyMonitorEndToEndTest.java | 40 ++--- .../transfer/TransferPullEndToEndTest.java | 90 +++++------ .../transfer/TransferPushEndToEndTest.java | 36 ++--- .../TransferWithTokenRefreshTest.java | 64 ++++---- 18 files changed, 364 insertions(+), 362 deletions(-) diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java index 904b97626..74ba5535d 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java @@ -27,8 +27,8 @@ import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.tractusx.edc.validation.businesspartner.spi.BusinessPartnerStore; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; /** * Helper class to delete all objects from a runtime's data stores. @@ -51,8 +51,8 @@ public void clearPersistence() { public void clearBusinessPartnerStore() { var bps = context.getService(BusinessPartnerStore.class); - bps.delete(SOKRATES_BPN); - bps.delete(PLATO_BPN); + bps.delete(CONSUMER_BPN); + bps.delete(PROVIDER_BPN); } public void clearContractDefinitions() { diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java index e7ecf3735..39b558b00 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java @@ -43,8 +43,8 @@ import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.CX_POLICY_NS; import static org.eclipse.tractusx.edc.helpers.DimHelper.configureParticipant; import static org.eclipse.tractusx.edc.lifecycle.Runtimes.dimRuntime; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.CatalogHelperFunctions.getDatasetAssetId; import static org.eclipse.tractusx.edc.tests.helpers.PolicyHelperFunctions.frameworkPolicy; import static org.mockserver.model.HttpRequest.request; @@ -57,14 +57,14 @@ public class DimCatalogIntegrationTest { private static final Integer BDRS_PORT = getFreePort(); private static final String BDRS_URL = "http://localhost:%s/api".formatted(BDRS_PORT); - protected static final DimParticipant SOKRATES = configureParticipant(SOKRATES_NAME, BDRS_URL); - protected static final DimParticipant PLATO = configureParticipant(PLATO_NAME, BDRS_URL); + protected static final DimParticipant CONSUMER = configureParticipant(CONSUMER_NAME, BDRS_URL); + protected static final DimParticipant PROVIDER = configureParticipant(PROVIDER_NAME, BDRS_URL); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = dimRuntime(PLATO.getName(), PLATO.iatpConfiguration(SOKRATES)); + protected static final ParticipantRuntime PROVIDER_RUNTIME = dimRuntime(PROVIDER.getName(), PROVIDER.iatpConfiguration(CONSUMER)); @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = dimRuntime(SOKRATES.getName(), SOKRATES.iatpConfiguration(PLATO)); + protected static final ParticipantRuntime CONSUMER_RUNTIME = dimRuntime(CONSUMER.getName(), CONSUMER.iatpConfiguration(PROVIDER)); private static ClientAndServer bdrsServer; @BeforeAll @@ -81,8 +81,8 @@ static void beforeAll() { } private static byte[] createGzipStream() { - var data = Map.of(SOKRATES.getBpn(), SOKRATES.getDid(), - PLATO.getBpn(), PLATO.getDid()); + var data = Map.of(CONSUMER.getBpn(), CONSUMER.getDid(), + PROVIDER.getBpn(), PROVIDER.getDid()); var bas = new ByteArrayOutputStream(); try (var gzip = new GZIPOutputStream(bas)) { @@ -99,24 +99,24 @@ static void afterAll() { } @Test - @DisplayName("Verify that Sokrates receives only the offers he is permitted to") + @DisplayName("Verify that the consumer receives only the offers he is permitted to") void requestCatalog_filteredByDismantler_shouldReturnOffer() { // arrange - PLATO.createAsset("test-asset"); - PLATO.createAsset("test-asset-1"); + PROVIDER.createAsset("test-asset"); + PROVIDER.createAsset("test-asset-1"); var bpnAccessPolicy = frameworkPolicy(Map.of(CX_POLICY_NS + "Membership", "active")); var dismantlerAccessPolicy = frameworkPolicy(Map.of(CX_POLICY_NS + "Dismantler", "active")); - var bpnAccessId = PLATO.createPolicyDefinition(bpnAccessPolicy); - var contractPolicyId = PLATO.createPolicyDefinition(noConstraintPolicy()); - var dismantlerAccessPolicyId = PLATO.createPolicyDefinition(dismantlerAccessPolicy); + var bpnAccessId = PROVIDER.createPolicyDefinition(bpnAccessPolicy); + var contractPolicyId = PROVIDER.createPolicyDefinition(noConstraintPolicy()); + var dismantlerAccessPolicyId = PROVIDER.createPolicyDefinition(dismantlerAccessPolicy); - PLATO.createContractDefinition("test-asset", "test-def", bpnAccessId, contractPolicyId); - PLATO.createContractDefinition("test-asset-1", "test-def-2", dismantlerAccessPolicyId, contractPolicyId); + PROVIDER.createContractDefinition("test-asset", "test-def", bpnAccessId, contractPolicyId); + PROVIDER.createContractDefinition("test-asset-1", "test-def-2", dismantlerAccessPolicyId, contractPolicyId); // act - var catalog = SOKRATES.getCatalogDatasets(PLATO); + var catalog = CONSUMER.getCatalogDatasets(PROVIDER); // assert assertThat(catalog).isNotEmpty() diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpPullTransferIntegrationTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpPullTransferIntegrationTest.java index 1b8d48be9..5b7ea0587 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpPullTransferIntegrationTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpPullTransferIntegrationTest.java @@ -39,8 +39,8 @@ import static org.eclipse.edc.util.io.Ports.getFreePort; import static org.eclipse.tractusx.edc.helpers.DimHelper.configureParticipant; import static org.eclipse.tractusx.edc.lifecycle.Runtimes.dimRuntime; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.mockserver.model.HttpRequest.request; @DimIntegrationTest @@ -50,12 +50,12 @@ public class DimHttpPullTransferIntegrationTest extends HttpConsumerPullBaseTest private static final ObjectMapper MAPPER = new ObjectMapper(); private static final Integer BDRS_PORT = getFreePort(); private static final String BDRS_URL = "http://localhost:%s/api".formatted(BDRS_PORT); - protected static final DimParticipant SOKRATES = configureParticipant(SOKRATES_NAME, BDRS_URL); - protected static final DimParticipant PLATO = configureParticipant(PLATO_NAME, BDRS_URL); + protected static final DimParticipant CONSUMER = configureParticipant(CONSUMER_NAME, BDRS_URL); + protected static final DimParticipant PROVIDER = configureParticipant(PROVIDER_NAME, BDRS_URL); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = dimRuntime(PLATO.getName(), PLATO.iatpConfiguration(SOKRATES)); + protected static final ParticipantRuntime PROVIDER_RUNTIME = dimRuntime(PROVIDER.getName(), PROVIDER.iatpConfiguration(CONSUMER)); @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = dimRuntime(SOKRATES.getName(), SOKRATES.iatpConfiguration(PLATO)); + protected static final ParticipantRuntime CONSUMER_RUNTIME = dimRuntime(CONSUMER.getName(), CONSUMER.iatpConfiguration(PROVIDER)); private static ClientAndServer bdrsServer; @BeforeAll @@ -72,8 +72,8 @@ static void beforeAll() { } private static byte[] createGzipStream() { - var data = Map.of(SOKRATES.getBpn(), SOKRATES.getDid(), - PLATO.getBpn(), PLATO.getDid()); + var data = Map.of(CONSUMER.getBpn(), CONSUMER.getDid(), + PROVIDER.getBpn(), PROVIDER.getDid()); var bas = new ByteArrayOutputStream(); try (var gzip = new GZIPOutputStream(bas)) { @@ -90,12 +90,12 @@ static void afterAll() { } @Override - public TractusxParticipantBase plato() { - return PLATO; + public TractusxParticipantBase provider() { + return PROVIDER; } @Override - public TractusxParticipantBase sokrates() { - return SOKRATES; + public TractusxParticipantBase consumer() { + return CONSUMER; } } diff --git a/edc-tests/edc-controlplane/catalog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogTest.java b/edc-tests/edc-controlplane/catalog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogTest.java index b57271492..da802cb99 100644 --- a/edc-tests/edc-controlplane/catalog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogTest.java +++ b/edc-tests/edc-controlplane/catalog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogTest.java @@ -35,10 +35,10 @@ import static java.util.stream.IntStream.range; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.connector.controlplane.test.system.utils.PolicyFixtures.noConstraintPolicy; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.CatalogHelperFunctions.getDatasetAssetId; import static org.eclipse.tractusx.edc.tests.helpers.CatalogHelperFunctions.getDatasetPolicies; import static org.eclipse.tractusx.edc.tests.helpers.PolicyHelperFunctions.BUSINESS_PARTNER_LEGACY_EVALUATION_KEY; @@ -51,30 +51,30 @@ public class CatalogTest { - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); - protected static final TransferParticipant PLATO = TransferParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final TransferParticipant PROVIDER = TransferParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .build(); abstract static class Tests { @Test - @DisplayName("Plato gets catalog from Sokrates. No constraints.") + @DisplayName("Consumer gets catalog from the provider. No constraints.") void requestCatalog_fulfillsPolicy_shouldReturnOffer() { // arrange - SOKRATES.createAsset("test-asset"); - var ap = SOKRATES.createPolicyDefinition(noConstraintPolicy()); - var cp = SOKRATES.createPolicyDefinition(noConstraintPolicy()); - SOKRATES.createContractDefinition("test-asset", "test-def", ap, cp); + PROVIDER.createAsset("test-asset"); + var ap = PROVIDER.createPolicyDefinition(noConstraintPolicy()); + var cp = PROVIDER.createPolicyDefinition(noConstraintPolicy()); + PROVIDER.createContractDefinition("test-asset", "test-def", ap, cp); // act - var catalog = PLATO.getCatalogDatasets(SOKRATES); + var catalog = CONSUMER.getCatalogDatasets(PROVIDER); // assert assertThat(catalog).isNotEmpty() @@ -86,94 +86,94 @@ void requestCatalog_fulfillsPolicy_shouldReturnOffer() { } @Test - @DisplayName("Verify that Plato receives only the offers he is permitted to (using the legacy BPN validation)") + @DisplayName("Verify that the consumer receives only the offers he is permitted to (using the legacy BPN validation)") void requestCatalog_filteredByBpnLegacy_shouldReject() { - var onlyPlatoPolicy = bnpPolicy("BPN1", "BPN2", PLATO.getBpn()); + var onlyConsumerPolicy = bnpPolicy("BPN1", "BPN2", CONSUMER.getBpn()); var onlyDiogenesPolicy = bnpPolicy("ARISTOTELES-BPN"); - var onlyPlatoId = SOKRATES.createPolicyDefinition(onlyPlatoPolicy); - var onlyDiogenesId = SOKRATES.createPolicyDefinition(onlyDiogenesPolicy); - var noConstraintPolicyId = SOKRATES.createPolicyDefinition(noConstraintPolicy()); + var onlyConsumerId = PROVIDER.createPolicyDefinition(onlyConsumerPolicy); + var onlyDiogenesId = PROVIDER.createPolicyDefinition(onlyDiogenesPolicy); + var noConstraintPolicyId = PROVIDER.createPolicyDefinition(noConstraintPolicy()); - SOKRATES.createAsset("test-asset1"); - SOKRATES.createAsset("test-asset2"); - SOKRATES.createAsset("test-asset3"); + PROVIDER.createAsset("test-asset1"); + PROVIDER.createAsset("test-asset2"); + PROVIDER.createAsset("test-asset3"); - SOKRATES.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId); - SOKRATES.createContractDefinition("test-asset2", "def2", onlyPlatoId, noConstraintPolicyId); - SOKRATES.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset2", "def2", onlyConsumerId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId); // act - var catalog = PLATO.getCatalogDatasets(SOKRATES); + var catalog = CONSUMER.getCatalogDatasets(PROVIDER); assertThat(catalog).hasSize(2); } @Test - @DisplayName("Verify that Plato receives only the offers he is permitted to (using the legacy BPN validation)") + @DisplayName("Verify that the consumer receives only the offers he is permitted to (using the legacy BPN validation)") void requestCatalog_filteredByBpnLegacy_WithNamespace_shouldReject() { - var onlyPlatoPolicy = bnpPolicy("BPN1", "BPN2", PLATO.getBpn()); + var onlyConsumerPolicy = bnpPolicy("BPN1", "BPN2", CONSUMER.getBpn()); var onlyDiogenesPolicy = frameworkPolicy(Map.of(BUSINESS_PARTNER_LEGACY_EVALUATION_KEY, "ARISTOTELES-BPN")); - var onlyPlatoId = SOKRATES.createPolicyDefinition(onlyPlatoPolicy); - var onlyDiogenesId = SOKRATES.createPolicyDefinition(onlyDiogenesPolicy); - var noConstraintPolicyId = SOKRATES.createPolicyDefinition(noConstraintPolicy()); + var onlyConsumerId = PROVIDER.createPolicyDefinition(onlyConsumerPolicy); + var onlyDiogenesId = PROVIDER.createPolicyDefinition(onlyDiogenesPolicy); + var noConstraintPolicyId = PROVIDER.createPolicyDefinition(noConstraintPolicy()); - SOKRATES.createAsset("test-asset1"); - SOKRATES.createAsset("test-asset2"); - SOKRATES.createAsset("test-asset3"); + PROVIDER.createAsset("test-asset1"); + PROVIDER.createAsset("test-asset2"); + PROVIDER.createAsset("test-asset3"); - SOKRATES.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId); - SOKRATES.createContractDefinition("test-asset2", "def2", onlyPlatoId, noConstraintPolicyId); - SOKRATES.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset2", "def2", onlyConsumerId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId); // act - var catalog = PLATO.getCatalogDatasets(SOKRATES); + var catalog = CONSUMER.getCatalogDatasets(PROVIDER); assertThat(catalog).hasSize(2); } @Test - @DisplayName("Verify that Plato receives only the offers he is permitted to (using the new BPN validation)") + @DisplayName("Verify that the consumer receives only the offers he is permitted to (using the new BPN validation)") void requestCatalog_filteredByBpn_shouldReject() { var mustBeGreekPhilosopher = bpnGroupPolicy(Operator.IS_ANY_OF, "greek_customer", "philosopher"); var mustBeGreekMathematician = bpnGroupPolicy(Operator.IS_ALL_OF, "greek_customer", "mathematician"); - SOKRATES.storeBusinessPartner(PLATO.getBpn(), "greek_customer", "philosopher"); - var philosopherId = SOKRATES.createPolicyDefinition(mustBeGreekPhilosopher); - var mathId = SOKRATES.createPolicyDefinition(mustBeGreekMathematician); - var noConstraintPolicyId = SOKRATES.createPolicyDefinition(noConstraintPolicy()); + PROVIDER.storeBusinessPartner(CONSUMER.getBpn(), "greek_customer", "philosopher"); + var philosopherId = PROVIDER.createPolicyDefinition(mustBeGreekPhilosopher); + var mathId = PROVIDER.createPolicyDefinition(mustBeGreekMathematician); + var noConstraintPolicyId = PROVIDER.createPolicyDefinition(noConstraintPolicy()); - SOKRATES.createAsset("test-asset1"); - SOKRATES.createAsset("test-asset2"); - SOKRATES.createAsset("test-asset3"); + PROVIDER.createAsset("test-asset1"); + PROVIDER.createAsset("test-asset2"); + PROVIDER.createAsset("test-asset3"); - SOKRATES.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId); - SOKRATES.createContractDefinition("test-asset2", "def2", philosopherId, noConstraintPolicyId); - SOKRATES.createContractDefinition("test-asset3", "def3", mathId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset2", "def2", philosopherId, noConstraintPolicyId); + PROVIDER.createContractDefinition("test-asset3", "def3", mathId, noConstraintPolicyId); // act - var catalog = PLATO.getCatalogDatasets(SOKRATES); + var catalog = CONSUMER.getCatalogDatasets(PROVIDER); assertThat(catalog).hasSize(2); } @Test @DisplayName("Multiple ContractDefinitions exist for one Asset") void requestCatalog_multipleOffersForAsset() { - SOKRATES.storeBusinessPartner(PLATO.getBpn(), "test-group"); - SOKRATES.createAsset("asset-1"); - var noConstraintId = SOKRATES.createPolicyDefinition(noConstraintPolicy()); - var groupConstraintId = SOKRATES.createPolicyDefinition(bpnGroupPolicy(Operator.IS_ANY_OF, "test-group")); + PROVIDER.storeBusinessPartner(CONSUMER.getBpn(), "test-group"); + PROVIDER.createAsset("asset-1"); + var noConstraintId = PROVIDER.createPolicyDefinition(noConstraintPolicy()); + var groupConstraintId = PROVIDER.createPolicyDefinition(bpnGroupPolicy(Operator.IS_ANY_OF, "test-group")); - SOKRATES.createContractDefinition("asset-1", "def1", noConstraintId, noConstraintId); - SOKRATES.createContractDefinition("asset-1", "def2", groupConstraintId, noConstraintId); + PROVIDER.createContractDefinition("asset-1", "def1", noConstraintId, noConstraintId); + PROVIDER.createContractDefinition("asset-1", "def2", groupConstraintId, noConstraintId); - var catalog = PLATO.getCatalogDatasets(SOKRATES); + var catalog = CONSUMER.getCatalogDatasets(PROVIDER); assertThat(catalog).hasSize(1) .allSatisfy(cd -> { assertThat(getDatasetAssetId(cd.asJsonObject())).isEqualTo("asset-1"); @@ -185,24 +185,24 @@ void requestCatalog_multipleOffersForAsset() { @DisplayName("Catalog with 1000 offers") void requestCatalog_of1000Assets_shouldContainAll() { var policy = bpnGroupPolicy(Operator.IS_NONE_OF, "test-group1", "test-group2"); - var policyId = SOKRATES.createPolicyDefinition(policy); - var noConstraintId = SOKRATES.createPolicyDefinition(noConstraintPolicy()); - SOKRATES.storeBusinessPartner(PLATO.getBpn(), "test-group-3"); + var policyId = PROVIDER.createPolicyDefinition(policy); + var noConstraintId = PROVIDER.createPolicyDefinition(noConstraintPolicy()); + PROVIDER.storeBusinessPartner(CONSUMER.getBpn(), "test-group-3"); range(0, 1000) .forEach(i -> { var assetId = "asset-" + i; - SOKRATES.createAsset(assetId); - SOKRATES.createContractDefinition(assetId, "def-" + i, policyId, noConstraintId); + PROVIDER.createAsset(assetId); + PROVIDER.createContractDefinition(assetId, "def-" + i, policyId, noConstraintId); }); // request all at once - var dataset = PLATO.getCatalogDatasets(SOKRATES, createQuery(1000, 0)); + var dataset = CONSUMER.getCatalogDatasets(PROVIDER, createQuery(1000, 0)); assertThat(dataset).hasSize(1000); // request in chunks - var o2 = PLATO.getCatalogDatasets(SOKRATES, createQuery(500, 0)); - var o3 = PLATO.getCatalogDatasets(SOKRATES, createQuery(500, 500)); + var o2 = CONSUMER.getCatalogDatasets(PROVIDER, createQuery(500, 0)); + var o3 = CONSUMER.getCatalogDatasets(PROVIDER, createQuery(500, 500)); assertThat(o2).doesNotContainAnyElementsOf(o3); } @@ -213,10 +213,10 @@ void requestCatalog_of1000Assets_shouldContainAll() { class InMemory extends Tests { @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = memoryRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final ParticipantRuntime CONSUMER_RUNTIME = memoryRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = memoryRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final ParticipantRuntime PROVIDER_RUNTIME = memoryRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } @@ -225,10 +225,10 @@ class InMemory extends Tests { class Postgres extends Tests { @RegisterExtension - protected static final PgParticipantRuntime SOKRATES_RUNTIME = pgRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final PgParticipantRuntime CONSUMER_RUNTIME = pgRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final PgParticipantRuntime PLATO_RUNTIME = pgRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final PgParticipantRuntime PROVIDER_RUNTIME = pgRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } diff --git a/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/EdrCacheApiEndToEndTest.java b/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/EdrCacheApiEndToEndTest.java index 938a0dea4..f7dec1e3b 100644 --- a/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/EdrCacheApiEndToEndTest.java +++ b/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/EdrCacheApiEndToEndTest.java @@ -61,6 +61,8 @@ import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.EDR_PROPERTY_REFRESH_AUDIENCE; import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.EDR_PROPERTY_REFRESH_ENDPOINT; import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.EDR_PROPERTY_REFRESH_TOKEN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; import static org.mockserver.integration.ClientAndServer.startClientAndServer; import static org.mockserver.matchers.Times.exactly; import static org.mockserver.model.HttpRequest.request; @@ -74,16 +76,16 @@ */ @EndToEndTest public class EdrCacheApiEndToEndTest { - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name("sokrates") - .id("BPN00001") + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime( + protected static final ParticipantRuntime CONSUMER_RUNTIME = new ParticipantRuntime( ":edc-tests:runtime:runtime-memory", - SOKRATES.getName(), - SOKRATES.getId(), - with(SOKRATES.getConfiguration(), Map.of("edc.iam.issuer.id", "did:web:sokrates"))); + CONSUMER.getName(), + CONSUMER.getId(), + with(CONSUMER.getConfiguration(), Map.of("edc.iam.issuer.id", "did:web:consumer"))); private final ObjectMapper mapper = new ObjectMapper(); private String refreshEndpoint; private String refreshAudience; @@ -101,7 +103,7 @@ void setup() throws JOSEException { providerSigningKey = new ECKeyGenerator(Curve.P_256).keyID("did:web:provider#key-1").generate(); var port = getFreePort(); refreshEndpoint = "http://localhost:%s/refresh".formatted(port); - refreshAudience = "did:web:sokrates"; + refreshAudience = "did:web:consumer"; mockedRefreshApi = startClientAndServer(port); } @@ -127,7 +129,7 @@ void getEdrWithRefresh_success() { ); storeEdr("test-id", true); - var edr = SOKRATES.edrs().getEdrWithRefresh("test-id", true) + var edr = CONSUMER.edrs().getEdrWithRefresh("test-id", true) .statusCode(200) .extract().body().as(JsonObject.class); assertThat(edr).isNotNull(); @@ -151,7 +153,7 @@ void getEdrWithRefresh_notExpired_shouldNotCallEndpoint() { // mock the provider dataplane's refresh endpoint storeEdr("test-id", false); - var edr = SOKRATES.edrs().getEdrWithRefresh("test-id", true) + var edr = CONSUMER.edrs().getEdrWithRefresh("test-id", true) .statusCode(200) .extract().body().as(JsonObject.class); assertThat(edr).isNotNull(); @@ -174,7 +176,7 @@ void getEdrWithRefresh_whenNotAutorefresh_shouldNotCallEndpoint() { // mock the provider dataplane's refresh endpoint storeEdr("test-id", true); - var edr = SOKRATES.edrs() + var edr = CONSUMER.edrs() .getEdrWithRefresh("test-id", false) .statusCode(200) .extract().body().as(JsonObject.class); @@ -207,7 +209,7 @@ void getEdrWithRefresh_unauthorized() { ); storeEdr("test-id", true); - SOKRATES.edrs().getEdrWithRefresh("test-id", true) + CONSUMER.edrs().getEdrWithRefresh("test-id", true) .statusCode(403); // assert the correct endpoint was called @@ -235,7 +237,7 @@ void refreshEdr() { ); storeEdr("test-id", true); - var edr = SOKRATES.edrs().refreshEdr("test-id") + var edr = CONSUMER.edrs().refreshEdr("test-id") .statusCode(200) .extract().body().as(JsonObject.class); assertThat(edr).isNotNull(); @@ -253,7 +255,7 @@ void refreshEdr() { @Test void refreshEdr_whenNotFound() { - var edr = SOKRATES.edrs().refreshEdr("does-not-exist") + var edr = CONSUMER.edrs().refreshEdr("does-not-exist") .statusCode(404); } @@ -272,7 +274,7 @@ void refreshEdr_whenNotAuthorized() { ); storeEdr("test-id", true); - SOKRATES.edrs().refreshEdr("test-id") + CONSUMER.edrs().refreshEdr("test-id") .statusCode(403); // assert the correct endpoint was called @@ -300,7 +302,7 @@ private String tokenResponseBody() { private void storeEdr(String transferProcessId, boolean isExpired) { var claims = new JWTClaimsSet.Builder().claim("iss", "did:web:provider").build(); - var store = SOKRATES_RUNTIME.getService(EndpointDataReferenceStore.class); + var store = CONSUMER_RUNTIME.getService(EndpointDataReferenceStore.class); var edr = DataAddress.Builder.newInstance() .type("test-type") .property(EDC_NAMESPACE + "authorization", createJwt(providerSigningKey, claims)) diff --git a/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/NegotiateEdrTest.java b/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/NegotiateEdrTest.java index bb07930d0..b798fbf01 100644 --- a/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/NegotiateEdrTest.java +++ b/edc-tests/edc-controlplane/edr-api-tests/src/test/java/org/eclipse/tractusx/edc/tests/edrv2/NegotiateEdrTest.java @@ -56,10 +56,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.eclipse.edc.util.io.Ports.getFreePort; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.EdrNegotiationHelperFunctions.createEvent; import static org.eclipse.tractusx.edc.tests.helpers.Functions.readEvent; import static org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase.ASYNC_POLL_INTERVAL; @@ -70,14 +70,14 @@ public class NegotiateEdrTest { - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); - protected static final TransferParticipant PLATO = TransferParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final TransferParticipant PROVIDER = TransferParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .build(); @@ -120,12 +120,12 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException { "authCode", authCode ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - PLATO.storeBusinessPartner(SOKRATES.getBpn(), "test-group1", "test-group2"); - var accessPolicy = PLATO.createPolicyDefinition(PolicyHelperFunctions.bpnGroupPolicy(Operator.IS_NONE_OF, "forbidden-policy")); - var contractPolicy = PLATO.createPolicyDefinition(PolicyHelperFunctions.bpnGroupPolicy(Operator.IS_ALL_OF, "test-group1", "test-group2")); - PLATO.createContractDefinition(assetId, "def-1", accessPolicy, contractPolicy); + PROVIDER.storeBusinessPartner(CONSUMER.getBpn(), "test-group1", "test-group2"); + var accessPolicy = PROVIDER.createPolicyDefinition(PolicyHelperFunctions.bpnGroupPolicy(Operator.IS_NONE_OF, "forbidden-policy")); + var contractPolicy = PROVIDER.createPolicyDefinition(PolicyHelperFunctions.bpnGroupPolicy(Operator.IS_ALL_OF, "test-group1", "test-group2")); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicy, contractPolicy); var events = new ArrayList(); @@ -141,7 +141,7 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException { .add(EdrNegotiationHelperFunctions.createCallback(url, true, Set.of("contract.negotiation", "transfer.process"))) .build(); - var contractNegotiationId = SOKRATES.edrs().negotiateEdr(PLATO, assetId, callbacks); + var contractNegotiationId = CONSUMER.edrs().negotiateEdr(PROVIDER, assetId, callbacks); await().pollInterval(ASYNC_POLL_INTERVAL) .atMost(ASYNC_TIMEOUT) @@ -151,15 +151,15 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException { await().pollInterval(ASYNC_POLL_INTERVAL) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - var edrCaches = SOKRATES.edrs().getEdrEntriesByAssetId(assetId); + var edrCaches = CONSUMER.edrs().getEdrEntriesByAssetId(assetId); assertThat(edrCaches).hasSize(1); }); - var edrCaches = SOKRATES.edrs().getEdrEntriesByAssetId(assetId); + var edrCaches = CONSUMER.edrs().getEdrEntriesByAssetId(assetId); assertThat(edrCaches).hasSize(1); - assertThat(SOKRATES.edrs().getEdrEntriesByContractNegotiationId(contractNegotiationId)).hasSize(1); + assertThat(CONSUMER.edrs().getEdrEntriesByContractNegotiationId(contractNegotiationId)).hasSize(1); assertThat(edrCaches).hasSize(1); @@ -168,10 +168,10 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException { var agreementId = edrCaches.get(0).asJsonObject().getString("agreementId"); assertThat(cnId).isEqualTo(contractNegotiationId); - assertThat(SOKRATES.edrs().getEdrEntriesByAgreementId(agreementId)).hasSize(1); + assertThat(CONSUMER.edrs().getEdrEntriesByAgreementId(agreementId)).hasSize(1); - var edr = SOKRATES.edrs().getEdr(transferProcessId); + var edr = CONSUMER.edrs().getEdr(transferProcessId); assertThat(edr.getJsonString("type").getString()).isEqualTo("https://w3id.org/idsa/v4.1/HTTP"); assertThat(edr.getJsonString("endpoint").getString()).isNotNull(); @@ -191,10 +191,10 @@ void teardown() throws IOException { class InMemory extends Tests { @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = memoryRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final ParticipantRuntime CONSUMER_RUNTIME = memoryRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = memoryRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final ParticipantRuntime PROVIDER_RUNTIME = memoryRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } @@ -203,10 +203,10 @@ class InMemory extends Tests { class Postgres extends Tests { @RegisterExtension - protected static final PgParticipantRuntime SOKRATES_RUNTIME = pgRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final PgParticipantRuntime CONSUMER_RUNTIME = pgRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final PgParticipantRuntime PLATO_RUNTIME = pgRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final PgParticipantRuntime PROVIDER_RUNTIME = pgRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java index 26cddc343..e8c66b180 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java @@ -23,7 +23,7 @@ public interface ParticipantAwareTest { - TractusxParticipantBase plato(); + TractusxParticipantBase provider(); - TractusxParticipantBase sokrates(); + TractusxParticipantBase consumer(); } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java index db5f1178f..76a212ee8 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java @@ -22,10 +22,10 @@ public class TestRuntimeConfiguration { public static final String BPN_SUFFIX = "-BPN"; - public static final String SOKRATES_NAME = "SOKRATES"; - public static final String SOKRATES_BPN = SOKRATES_NAME + BPN_SUFFIX; - public static final String PLATO_NAME = "PLATO"; - public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX; + public static final String CONSUMER_NAME = "CONSUMER"; + public static final String CONSUMER_BPN = CONSUMER_NAME + BPN_SUFFIX; + public static final String PROVIDER_NAME = "PROVIDER"; + public static final String PROVIDER_BPN = PROVIDER_NAME + BPN_SUFFIX; public static final String DB_SCHEMA_NAME = "testschema"; } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java index 12e66c0ff..e5503761e 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java @@ -27,8 +27,8 @@ import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.tractusx.edc.validation.businesspartner.spi.BusinessPartnerStore; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; /** * Helper class to delete all objects from a runtime's data stores. @@ -51,8 +51,8 @@ public void clearPersistence() { public void clearBusinessPartnerStore() { var bps = context.getService(BusinessPartnerStore.class); - bps.delete(SOKRATES_BPN); - bps.delete(PLATO_BPN); + bps.delete(CONSUMER_BPN); + bps.delete(PROVIDER_BPN); } public void clearContractDefinitions() { diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java index b980c9695..0ea951065 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java @@ -71,12 +71,12 @@ void transferData_privateBackend() { "contentType", "application/json" ); - plato().createAsset(assetId, Map.of(), dataAddress); + provider().createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = plato().createPolicyDefinition(createAccessPolicy(sokrates().getBpn())); - var contractPolicyId = plato().createPolicyDefinition(createContractPolicy(sokrates().getBpn())); - plato().createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = sokrates().requestAsset(plato(), assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = provider().createPolicyDefinition(createAccessPolicy(consumer().getBpn())); + var contractPolicyId = provider().createPolicyDefinition(createContractPolicy(consumer().getBpn())); + provider().createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = consumer().requestAsset(provider(), assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); var edr = new AtomicReference(); @@ -84,7 +84,7 @@ void transferData_privateBackend() { await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - var tpState = sokrates().getTransferProcessState(transferProcessId); + var tpState = consumer().getTransferProcessState(transferProcessId); assertThat(tpState).isNotNull().isEqualTo(TransferProcessStates.STARTED.toString()); }); @@ -93,18 +93,18 @@ void transferData_privateBackend() { await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - edr.set(sokrates().edrs().getEdr(transferProcessId)); + edr.set(consumer().edrs().getEdr(transferProcessId)); assertThat(edr).isNotNull(); }); // pull data out of provider's backend service: // Prov-DP -> Prov-backend - assertThat(sokrates().data().pullData(edr.get(), Map.of())).isEqualTo("test response"); + assertThat(consumer().data().pullData(edr.get(), Map.of())).isEqualTo("test response"); server.verify(request() .withPath(MOCK_BACKEND_PATH) .withHeader("Edc-Contract-Agreement-Id") - .withHeader("Edc-Bpn", sokrates().getBpn()) + .withHeader("Edc-Bpn", consumer().getBpn()) .withMethod("GET"), VerificationTimes.exactly(1)); } @@ -120,12 +120,12 @@ void transferData_privateBackend_withConsumerDataPlane() { "contentType", "application/json" ); - plato().createAsset(assetId, Map.of(), dataAddress); + provider().createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = plato().createPolicyDefinition(createAccessPolicy(sokrates().getBpn())); - var contractPolicyId = plato().createPolicyDefinition(createContractPolicy(sokrates().getBpn())); - plato().createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = sokrates().requestAsset(plato(), assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = provider().createPolicyDefinition(createAccessPolicy(consumer().getBpn())); + var contractPolicyId = provider().createPolicyDefinition(createContractPolicy(consumer().getBpn())); + provider().createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = consumer().requestAsset(provider(), assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); var edr = new AtomicReference(); @@ -133,7 +133,7 @@ void transferData_privateBackend_withConsumerDataPlane() { await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - var tpState = sokrates().getTransferProcessState(transferProcessId); + var tpState = consumer().getTransferProcessState(transferProcessId); assertThat(tpState).isNotNull().isEqualTo(TransferProcessStates.STARTED.toString()); }); @@ -142,22 +142,22 @@ void transferData_privateBackend_withConsumerDataPlane() { await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - edr.set(sokrates().edrs().getEdr(transferProcessId)); + edr.set(consumer().edrs().getEdr(transferProcessId)); assertThat(edr).isNotNull(); }); // pull data out of provider's backend service: //Consumer-DP -> Prov-DP -> Prov-backend - assertThat(sokrates().dataPlane().pullData(Map.of("transferProcessId", transferProcessId))).isEqualTo("test response"); + assertThat(consumer().dataPlane().pullData(Map.of("transferProcessId", transferProcessId))).isEqualTo("test response"); server.verify(request() .withPath(MOCK_BACKEND_PATH) .withHeader("Edc-Contract-Agreement-Id") - .withHeader("Edc-Bpn", sokrates().getBpn()) + .withHeader("Edc-Bpn", consumer().getBpn()) .withMethod("GET"), VerificationTimes.exactly(1)); } - + @AfterEach void teardown() { server.stop(); diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java index fdb03f995..6a4b1ef1a 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java @@ -74,15 +74,15 @@ void httpPushDataTransfer() { "contentType", "application/json" ); - plato().createAsset(assetId, Map.of(), dataAddress); - var policyId = plato().createPolicyDefinition(bnpPolicy(sokrates().getBpn())); - plato().createContractDefinition(assetId, "def-1", policyId, policyId); + provider().createAsset(assetId, Map.of(), dataAddress); + var policyId = provider().createPolicyDefinition(bnpPolicy(consumer().getBpn())); + provider().createContractDefinition(assetId, "def-1", policyId, policyId); var destination = httpDataAddress(consumerUrl); - var transferProcessId = sokrates().requestAsset(plato(), assetId, createObjectBuilder().build(), destination, "HttpData-PUSH"); + var transferProcessId = consumer().requestAsset(provider(), assetId, createObjectBuilder().build(), destination, "HttpData-PUSH"); await().atMost(ASYNC_TIMEOUT).untilAsserted(() -> { - var state = sokrates().getTransferProcessState(transferProcessId); + var state = consumer().getTransferProcessState(transferProcessId); assertThat(state).isEqualTo(COMPLETED.name()); }); } diff --git a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java index 088b3364a..0ec87e4a3 100644 --- a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java +++ b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java @@ -61,10 +61,10 @@ import static org.eclipse.edc.util.io.Ports.getFreePort; import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.CX_CREDENTIAL_NS; import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.CX_POLICY_NS; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.PolicyHelperFunctions.frameworkPolicy; import static org.eclipse.tractusx.edc.tests.helpers.TransferProcessHelperFunctions.createProxyRequest; import static org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase.ASYNC_TIMEOUT; @@ -83,25 +83,25 @@ public abstract class AbstractIatpConsumerPullTest extends HttpConsumerPullBaseT .id("STS") .name("STS") .build(); - protected static final IatpParticipant SOKRATES = IatpParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final IatpParticipant CONSUMER = IatpParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .stsUri(STS.stsUri()) - .stsClientId(SOKRATES_BPN) + .stsClientId(CONSUMER_BPN) .stsClientSecret("client_secret") .trustedIssuer(DATASPACE_ISSUER_PARTICIPANT.didUrl()) .dimUri(DIM_URI) - .did(did(SOKRATES_NAME)) + .did(did(CONSUMER_NAME)) .build(); - protected static final IatpParticipant PLATO = IatpParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final IatpParticipant PROVIDER = IatpParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .stsUri(STS.stsUri()) - .stsClientId(PLATO_BPN) + .stsClientId(PROVIDER_BPN) .stsClientSecret("client_secret") .trustedIssuer(DATASPACE_ISSUER_PARTICIPANT.didUrl()) .dimUri(DIM_URI) - .did(did(PLATO_NAME)) + .did(did(PROVIDER_NAME)) .build(); private static String did(String name) { @@ -110,13 +110,13 @@ private static String did(String name) { @Override - public TractusxParticipantBase plato() { - return PLATO; + public TractusxParticipantBase provider() { + return PROVIDER; } @Override - public TractusxParticipantBase sokrates() { - return SOKRATES; + public TractusxParticipantBase consumer() { + return CONSUMER; } @DisplayName("Contract policy is fulfilled") @@ -136,12 +136,12 @@ void transferData_whenContractPolicyFulfilled(JsonObject contractPolicy, String "authCode", authCode ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = PLATO.createPolicyDefinition(createAccessPolicy(SOKRATES.getBpn())); - var contractPolicyId = PLATO.createPolicyDefinition(contractPolicy); - PLATO.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = SOKRATES.requestAsset(PLATO, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = PROVIDER.createPolicyDefinition(createAccessPolicy(CONSUMER.getBpn())); + var contractPolicyId = PROVIDER.createPolicyDefinition(contractPolicy); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); var edr = new AtomicReference(); @@ -149,7 +149,7 @@ void transferData_whenContractPolicyFulfilled(JsonObject contractPolicy, String await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - var tpState = SOKRATES.getTransferProcessState(transferProcessId); + var tpState = CONSUMER.getTransferProcessState(transferProcessId); assertThat(tpState).isNotNull().isEqualTo(TransferProcessStates.STARTED.toString()); }); @@ -158,18 +158,18 @@ void transferData_whenContractPolicyFulfilled(JsonObject contractPolicy, String await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - edr.set(SOKRATES.edrs().getEdr(transferProcessId)); + edr.set(CONSUMER.edrs().getEdr(transferProcessId)); assertThat(edr).isNotNull(); }); // pull data out of provider's backend service: // Prov-DP -> Prov-backend - assertThat(sokrates().data().pullData(edr.get(), Map.of())).isEqualTo("test response"); + assertThat(consumer().data().pullData(edr.get(), Map.of())).isEqualTo("test response"); server.verify(request() .withPath(MOCK_BACKEND_PATH) .withHeader("Edc-Contract-Agreement-Id") - .withHeader("Edc-Bpn", sokrates().getBpn()) + .withHeader("Edc-Bpn", consumer().getBpn()) .withMethod("GET"), VerificationTimes.exactly(1)); } @@ -190,17 +190,17 @@ void transferData_whenContractPolicyNotFulfilled(JsonObject contractPolicy, Stri "authCode", authCode ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = PLATO.createPolicyDefinition(createAccessPolicy(SOKRATES.getBpn())); - var contractPolicyId = PLATO.createPolicyDefinition(contractPolicy); - PLATO.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var negotiationId = SOKRATES.initContractNegotiation(PLATO, assetId); + var accessPolicyId = PROVIDER.createPolicyDefinition(createAccessPolicy(CONSUMER.getBpn())); + var contractPolicyId = PROVIDER.createPolicyDefinition(contractPolicy); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var negotiationId = CONSUMER.initContractNegotiation(PROVIDER, assetId); await().pollInterval(fibonacci()) .atMost(ASYNC_TIMEOUT) .untilAsserted(() -> { - var contractNegotiationState = SOKRATES.getContractNegotiationState(negotiationId); + var contractNegotiationState = CONSUMER.getContractNegotiationState(negotiationId); assertThat(contractNegotiationState).isEqualTo("TERMINATED"); }); } @@ -209,8 +209,8 @@ void transferData_whenContractPolicyNotFulfilled(JsonObject contractPolicy, Stri @Test void catalogRequest_whenCredentialExpired() { //update the membership credential to an expirationDate that is in the past - var store = sokratesRuntime().getService(CredentialStore.class); - var jsonLd = sokratesRuntime().getService(JsonLd.class); + var store = consumerRuntime().getService(CredentialStore.class); + var jsonLd = consumerRuntime().getService(JsonLd.class); var existingCred = store.query(QuerySpec.Builder.newInstance().filter(new Criterion("verifiableCredential.credential.type", "contains", "MembershipCredential")).build()) .orElseThrow(f -> new RuntimeException(f.getFailureDetail())) @@ -227,8 +227,8 @@ void catalogRequest_whenCredentialExpired() { .expirationDate(expirationDate) .build(); - var did = SOKRATES.getDid(); - var bpn = SOKRATES.getBpn(); + var did = CONSUMER.getDid(); + var bpn = CONSUMER.getBpn(); var newRawVc = createVcBuilder(DATASPACE_ISSUER_PARTICIPANT.didUrl(), "MembershipCredential", membershipSubject(did, bpn)); newRawVc.add("expirationDate", expirationDate.toString()); @@ -246,7 +246,7 @@ void catalogRequest_whenCredentialExpired() { // verify the failed catalog request try { - SOKRATES.getCatalog(PLATO) + CONSUMER.getCatalog(PROVIDER) .log().ifError() .statusCode(not(200)); } finally { @@ -259,8 +259,8 @@ void catalogRequest_whenCredentialExpired() { @Test void catalogRequest_whenCredentialRevoked() { //update the membership credential to contain a `credentialStatus` with a revocation - var store = sokratesRuntime().getService(CredentialStore.class); - var jsonLd = sokratesRuntime().getService(JsonLd.class); + var store = consumerRuntime().getService(CredentialStore.class); + var jsonLd = consumerRuntime().getService(JsonLd.class); var port = getFreePort(); var existingCred = store.query(QuerySpec.Builder.newInstance().filter(new Criterion("verifiableCredential.credential.type", "contains", "MembershipCredential")).build()) @@ -282,8 +282,8 @@ void catalogRequest_whenCredentialRevoked() { .issuanceDate(existingCred.getVerifiableCredential().credential().getIssuanceDate()) .build(); - var did = SOKRATES.getDid(); - var bpn = SOKRATES.getBpn(); + var did = CONSUMER.getDid(); + var bpn = CONSUMER.getBpn(); var newRawVc = createVcBuilder(DATASPACE_ISSUER_PARTICIPANT.didUrl(), "MembershipCredential", membershipSubject(did, bpn)); newRawVc.add("credentialStatus", Json.createObjectBuilder() .add("id", "http://localhost:%d/status/list/7#12345".formatted(port)) @@ -311,7 +311,7 @@ void catalogRequest_whenCredentialRevoked() { revocationServer.when(request().withPath("/status/list/7")).respond(response().withBody(slCred.toJsonObject().toString())); // verify the failed catalog request - SOKRATES.getCatalog(PLATO) + CONSUMER.getCatalog(PROVIDER) .log().ifValidationFails() .statusCode(not(200)); } finally { @@ -325,9 +325,9 @@ protected JsonObject createContractPolicy(String bpn) { return frameworkPolicy(Map.of(CX_CREDENTIAL_NS + "Membership", "active")); } - protected abstract IatpParticipantRuntime sokratesRuntime(); + protected abstract IatpParticipantRuntime consumerRuntime(); - protected abstract IatpParticipantRuntime platoRuntime(); + protected abstract IatpParticipantRuntime providerRuntime(); private static class ValidContractPolicyProvider implements ArgumentsProvider { @Override diff --git a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpConsumerPullTest.java b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpConsumerPullTest.java index 9386ddec7..f1212a162 100644 --- a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpConsumerPullTest.java +++ b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/DimHttpConsumerPullTest.java @@ -50,9 +50,9 @@ public class DimHttpConsumerPullTest extends AbstractIatpConsumerPullTest { @RegisterExtension - protected static final IatpParticipantRuntime SOKRATES_RUNTIME = dimRuntime(SOKRATES.getName(), SOKRATES.iatpConfiguration(PLATO), SOKRATES.getKeyPair()); + protected static final IatpParticipantRuntime CONSUMER_RUNTIME = dimRuntime(CONSUMER.getName(), CONSUMER.iatpConfiguration(PROVIDER), CONSUMER.getKeyPair()); @RegisterExtension - protected static final IatpParticipantRuntime PLATO_RUNTIME = dimRuntime(PLATO.getName(), PLATO.iatpConfiguration(SOKRATES), PLATO.getKeyPair()); + protected static final IatpParticipantRuntime PROVIDER_RUNTIME = dimRuntime(PROVIDER.getName(), PROVIDER.iatpConfiguration(CONSUMER), PROVIDER.getKeyPair()); private static final TypeManager MAPPER = new JacksonTypeManager(); private static ClientAndServer oauthServer; private static ClientAndServer dimServer; @@ -63,8 +63,8 @@ static void prepare() { var tokenGeneration = new JwtGenerationService(); var generatorServices = Map.of( - SOKRATES.getDid(), tokenServiceFor(tokenGeneration, SOKRATES), - PLATO.getDid(), tokenServiceFor(tokenGeneration, PLATO)); + CONSUMER.getDid(), tokenServiceFor(tokenGeneration, CONSUMER), + PROVIDER.getDid(), tokenServiceFor(tokenGeneration, PROVIDER)); oauthServer = ClientAndServer.startClientAndServer(STS.stsUri().getPort()); @@ -77,11 +77,11 @@ static void prepare() { // create the DIDs cache var dids = new HashMap(); dids.put(DATASPACE_ISSUER_PARTICIPANT.didUrl(), DATASPACE_ISSUER_PARTICIPANT.didDocument()); - dids.put(SOKRATES.getDid(), SOKRATES.getDidDocument()); - dids.put(PLATO.getDid(), PLATO.getDidDocument()); + dids.put(CONSUMER.getDid(), CONSUMER.getDidDocument()); + dids.put(PROVIDER.getDid(), PROVIDER.getDidDocument()); - configureParticipant(DATASPACE_ISSUER_PARTICIPANT, SOKRATES, SOKRATES_RUNTIME, dids, null); - configureParticipant(DATASPACE_ISSUER_PARTICIPANT, PLATO, PLATO_RUNTIME, dids, null); + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, CONSUMER, CONSUMER_RUNTIME, dids, null); + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, PROVIDER, PROVIDER_RUNTIME, dids, null); } @@ -104,12 +104,12 @@ private static Supplier publicIdSupplier(IatpParticipant participant) { } @Override - protected IatpParticipantRuntime sokratesRuntime() { - return SOKRATES_RUNTIME; + protected IatpParticipantRuntime consumerRuntime() { + return CONSUMER_RUNTIME; } @Override - protected IatpParticipantRuntime platoRuntime() { - return SOKRATES_RUNTIME; + protected IatpParticipantRuntime providerRuntime() { + return CONSUMER_RUNTIME; } } diff --git a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/StsHttpConsumerPullTest.java b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/StsHttpConsumerPullTest.java index 69f1905e2..b4a6665b9 100644 --- a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/StsHttpConsumerPullTest.java +++ b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/StsHttpConsumerPullTest.java @@ -36,13 +36,13 @@ public class StsHttpConsumerPullTest extends AbstractIatpConsumerPullTest { @RegisterExtension - protected static final IatpParticipantRuntime SOKRATES_RUNTIME = iatpRuntime(SOKRATES.getName(), SOKRATES.iatpConfiguration(PLATO), SOKRATES.getKeyPair()); + protected static final IatpParticipantRuntime CONSUMER_RUNTIME = iatpRuntime(CONSUMER.getName(), CONSUMER.iatpConfiguration(PROVIDER), CONSUMER.getKeyPair()); @RegisterExtension - protected static final IatpParticipantRuntime PLATO_RUNTIME = iatpRuntime(PLATO.getName(), PLATO.iatpConfiguration(SOKRATES), PLATO.getKeyPair()); + protected static final IatpParticipantRuntime PROVIDER_RUNTIME = iatpRuntime(PROVIDER.getName(), PROVIDER.iatpConfiguration(CONSUMER), PROVIDER.getKeyPair()); @RegisterExtension - protected static final IatpParticipantRuntime STS_RUNTIME = stsRuntime(STS.getName(), STS.stsConfiguration(SOKRATES, PLATO), STS.getKeyPair()); + protected static final IatpParticipantRuntime STS_RUNTIME = stsRuntime(STS.getName(), STS.stsConfiguration(CONSUMER, PROVIDER), STS.getKeyPair()); @BeforeAll static void prepare() { @@ -50,21 +50,21 @@ static void prepare() { // create the DIDs cache var dids = new HashMap(); dids.put(DATASPACE_ISSUER_PARTICIPANT.didUrl(), DATASPACE_ISSUER_PARTICIPANT.didDocument()); - dids.put(SOKRATES.getDid(), SOKRATES.getDidDocument()); - dids.put(PLATO.getDid(), PLATO.getDidDocument()); + dids.put(CONSUMER.getDid(), CONSUMER.getDidDocument()); + dids.put(PROVIDER.getDid(), PROVIDER.getDidDocument()); - configureParticipant(DATASPACE_ISSUER_PARTICIPANT, SOKRATES, SOKRATES_RUNTIME, dids, STS_RUNTIME); - configureParticipant(DATASPACE_ISSUER_PARTICIPANT, PLATO, PLATO_RUNTIME, dids, STS_RUNTIME); + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, CONSUMER, CONSUMER_RUNTIME, dids, STS_RUNTIME); + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, PROVIDER, PROVIDER_RUNTIME, dids, STS_RUNTIME); } @Override - protected IatpParticipantRuntime sokratesRuntime() { - return SOKRATES_RUNTIME; + protected IatpParticipantRuntime consumerRuntime() { + return CONSUMER_RUNTIME; } @Override - protected IatpParticipantRuntime platoRuntime() { - return PLATO_RUNTIME; + protected IatpParticipantRuntime providerRuntime() { + return PROVIDER_RUNTIME; } } diff --git a/edc-tests/edc-controlplane/policy-tests/src/test/java/org/eclipse/tractusx/edc/tests/policy/PolicyMonitorEndToEndTest.java b/edc-tests/edc-controlplane/policy-tests/src/test/java/org/eclipse/tractusx/edc/tests/policy/PolicyMonitorEndToEndTest.java index 373a10ca1..6dc9d28c7 100644 --- a/edc-tests/edc-controlplane/policy-tests/src/test/java/org/eclipse/tractusx/edc/tests/policy/PolicyMonitorEndToEndTest.java +++ b/edc-tests/edc-controlplane/policy-tests/src/test/java/org/eclipse/tractusx/edc/tests/policy/PolicyMonitorEndToEndTest.java @@ -37,10 +37,10 @@ import static org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiationStates.TERMINATED; import static org.eclipse.edc.connector.controlplane.test.system.utils.PolicyFixtures.inForceDatePolicy; import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.STARTED; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.TransferProcessHelperFunctions.createProxyRequest; import static org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase.ASYNC_TIMEOUT; import static org.eclipse.tractusx.edc.tests.runtimes.Runtimes.memoryRuntime; @@ -48,15 +48,15 @@ public class PolicyMonitorEndToEndTest { - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); - protected static final TransferParticipant PLATO = TransferParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final TransferParticipant PROVIDER = TransferParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .build(); abstract static class Tests { @@ -72,21 +72,21 @@ void shouldTerminateTransfer_whenPolicyExpires() { "contentType", "application/json", "proxyQueryParams", "true" ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); var policy = inForceDatePolicy("gteq", "contractAgreement+0s", "lteq", "contractAgreement+10s"); - var policyId = PLATO.createPolicyDefinition(policy); - PLATO.createContractDefinition(assetId, UUID.randomUUID().toString(), policyId, policyId); + var policyId = PROVIDER.createPolicyDefinition(policy); + PROVIDER.createContractDefinition(assetId, UUID.randomUUID().toString(), policyId, policyId); - var transferProcessId = SOKRATES.requestAsset(PLATO, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); await().atMost(ASYNC_TIMEOUT).untilAsserted(() -> { - var state = SOKRATES.getTransferProcessState(transferProcessId); + var state = CONSUMER.getTransferProcessState(transferProcessId); assertThat(state).isEqualTo(STARTED.name()); }); await().atMost(ASYNC_TIMEOUT).untilAsserted(() -> { - var state = SOKRATES.getTransferProcessState(transferProcessId); + var state = CONSUMER.getTransferProcessState(transferProcessId); assertThat(state).isEqualTo(TERMINATED.name()); }); } @@ -98,10 +98,10 @@ void shouldTerminateTransfer_whenPolicyExpires() { class InMemory extends Tests { @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = memoryRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final ParticipantRuntime CONSUMER_RUNTIME = memoryRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = memoryRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final ParticipantRuntime PROVIDER_RUNTIME = memoryRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } @@ -110,10 +110,10 @@ class InMemory extends Tests { class Postgres extends Tests { @RegisterExtension - protected static final PgParticipantRuntime SOKRATES_RUNTIME = pgRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final PgParticipantRuntime CONSUMER_RUNTIME = pgRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final PgParticipantRuntime PLATO_RUNTIME = pgRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final PgParticipantRuntime PROVIDER_RUNTIME = pgRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } } diff --git a/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPullEndToEndTest.java b/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPullEndToEndTest.java index 409fb2ca4..6dfc2bf7a 100644 --- a/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPullEndToEndTest.java +++ b/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPullEndToEndTest.java @@ -37,10 +37,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.connector.controlplane.test.system.utils.PolicyFixtures.inForceDatePolicy; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.TransferProcessHelperFunctions.createProxyRequest; import static org.eclipse.tractusx.edc.tests.runtimes.Runtimes.memoryRuntime; import static org.eclipse.tractusx.edc.tests.runtimes.Runtimes.pgRuntime; @@ -51,23 +51,23 @@ public class TransferPullEndToEndTest { abstract static class Tests extends HttpConsumerPullBaseTest { - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); - protected static final TransferParticipant PLATO = TransferParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final TransferParticipant PROVIDER = TransferParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .build(); @Override - public TractusxParticipantBase plato() { - return PLATO; + public TractusxParticipantBase provider() { + return PROVIDER; } @Override - public TractusxParticipantBase sokrates() { - return SOKRATES; + public TractusxParticipantBase consumer() { + return CONSUMER; } @@ -83,46 +83,46 @@ void transferData_withSuspendResume() { "contentType", "application/json" ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = PLATO.createPolicyDefinition(createAccessPolicy(SOKRATES.getBpn())); - var contractPolicyId = PLATO.createPolicyDefinition(createContractPolicy(SOKRATES.getBpn())); - PLATO.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = SOKRATES.requestAsset(PLATO, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = PROVIDER.createPolicyDefinition(createAccessPolicy(CONSUMER.getBpn())); + var contractPolicyId = PROVIDER.createPolicyDefinition(createContractPolicy(CONSUMER.getBpn())); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); // wait until EDC is available on the consumer side server.when(requestDefinition).respond(response().withStatusCode(200).withBody("test response")); - var edr = SOKRATES.edrs().waitForEdr(transferProcessId); + var edr = CONSUMER.edrs().waitForEdr(transferProcessId); // consumer can fetch data with a valid token - var data = SOKRATES.data().pullData(edr, Map.of()); + var data = CONSUMER.data().pullData(edr, Map.of()); assertThat(data).isNotNull().isEqualTo("test response"); server.verify(requestDefinition, VerificationTimes.exactly(1)); - SOKRATES.suspendTransfer(transferProcessId, "reason"); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.SUSPENDED); + CONSUMER.suspendTransfer(transferProcessId, "reason"); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.SUSPENDED); // consumer cannot fetch data with the prev token (suspended) - SOKRATES.data().pullDataRequest(edr, Map.of()).statusCode(403); + CONSUMER.data().pullDataRequest(edr, Map.of()).statusCode(403); server.verify(requestDefinition, VerificationTimes.exactly(1)); - SOKRATES.resumeTransfer(transferProcessId); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); + CONSUMER.resumeTransfer(transferProcessId); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); - var newEdr = SOKRATES.edrs().waitForEdr(transferProcessId); + var newEdr = CONSUMER.edrs().waitForEdr(transferProcessId); // consumer can now re-fetch data with a new EDR token - data = SOKRATES.data().pullData(newEdr, Map.of()); + data = CONSUMER.data().pullData(newEdr, Map.of()); assertThat(data).isNotNull().isEqualTo("test response"); server.verify(requestDefinition, VerificationTimes.exactly(2)); // consumer cannot fetch data with the prev token (suspended) after the transfer process has been resumed - SOKRATES.data().pullDataRequest(edr, Map.of()).statusCode(403); + CONSUMER.data().pullDataRequest(edr, Map.of()).statusCode(403); server.verify(requestDefinition, VerificationTimes.exactly(2)); } @@ -139,34 +139,34 @@ void transferData_withTerminate() { "contentType", "application/json" ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = PLATO.createPolicyDefinition(createAccessPolicy(SOKRATES.getBpn())); - var contractPolicyId = PLATO.createPolicyDefinition(inForcePolicy()); - PLATO.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = SOKRATES.requestAsset(PLATO, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = PROVIDER.createPolicyDefinition(createAccessPolicy(CONSUMER.getBpn())); + var contractPolicyId = PROVIDER.createPolicyDefinition(inForcePolicy()); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); // wait until EDC is available on the consumer side server.when(requestDefinition).respond(response().withStatusCode(200).withBody("test response")); - var edr = SOKRATES.edrs().waitForEdr(transferProcessId); + var edr = CONSUMER.edrs().waitForEdr(transferProcessId); // consumer can fetch data with a valid token - var data = SOKRATES.data().pullData(edr, Map.of()); + var data = CONSUMER.data().pullData(edr, Map.of()); assertThat(data).isNotNull().isEqualTo("test response"); server.verify(requestDefinition, VerificationTimes.exactly(1)); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.TERMINATED); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.TERMINATED); // consumer cannot fetch data with the prev token (suspended) - var body = SOKRATES.data().pullDataRequest(edr, Map.of()).statusCode(403).extract().body().asString(); + var body = CONSUMER.data().pullDataRequest(edr, Map.of()).statusCode(403).extract().body().asString(); server.verify(requestDefinition, VerificationTimes.exactly(1)); } - + protected JsonObject inForcePolicy() { return inForceDatePolicy("gteq", "contractAgreement+0s", "lteq", "contractAgreement+10s"); } @@ -178,10 +178,10 @@ protected JsonObject inForcePolicy() { class InMemory extends Tests { @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = memoryRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final ParticipantRuntime CONSUMER_RUNTIME = memoryRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = memoryRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final ParticipantRuntime PROVIDER_RUNTIME = memoryRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } @@ -190,10 +190,10 @@ class InMemory extends Tests { class Postgres extends Tests { @RegisterExtension - protected static final PgParticipantRuntime SOKRATES_RUNTIME = pgRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final PgParticipantRuntime CONSUMER_RUNTIME = pgRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final PgParticipantRuntime PLATO_RUNTIME = pgRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final PgParticipantRuntime PROVIDER_RUNTIME = pgRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } } \ No newline at end of file diff --git a/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPushEndToEndTest.java b/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPushEndToEndTest.java index ad9d34e71..c316949ca 100644 --- a/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPushEndToEndTest.java +++ b/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferPushEndToEndTest.java @@ -28,10 +28,10 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.runtimes.Runtimes.memoryRuntime; import static org.eclipse.tractusx.edc.tests.runtimes.Runtimes.pgRuntime; @@ -39,23 +39,23 @@ public class TransferPushEndToEndTest { abstract static class Tests extends ProviderPushBaseTest { - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); - protected static final TransferParticipant PLATO = TransferParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final TransferParticipant PROVIDER = TransferParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .build(); @Override - public TractusxParticipantBase plato() { - return PLATO; + public TractusxParticipantBase provider() { + return PROVIDER; } @Override - public TractusxParticipantBase sokrates() { - return SOKRATES; + public TractusxParticipantBase consumer() { + return CONSUMER; } } @@ -65,10 +65,10 @@ public TractusxParticipantBase sokrates() { class InMemory extends Tests { @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = memoryRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final ParticipantRuntime CONSUMER_RUNTIME = memoryRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = memoryRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final ParticipantRuntime PROVIDER_RUNTIME = memoryRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } @@ -77,10 +77,10 @@ class InMemory extends Tests { class Postgres extends Tests { @RegisterExtension - protected static final PgParticipantRuntime SOKRATES_RUNTIME = pgRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final PgParticipantRuntime CONSUMER_RUNTIME = pgRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); @RegisterExtension - protected static final PgParticipantRuntime PLATO_RUNTIME = pgRuntime(PLATO.getName(), PLATO.getBpn(), PLATO.getConfiguration()); + protected static final PgParticipantRuntime PROVIDER_RUNTIME = pgRuntime(PROVIDER.getName(), PROVIDER.getBpn(), PROVIDER.getConfiguration()); } } \ No newline at end of file diff --git a/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferWithTokenRefreshTest.java b/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferWithTokenRefreshTest.java index 291152773..81a46a962 100644 --- a/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferWithTokenRefreshTest.java +++ b/edc-tests/edc-controlplane/transfer-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/TransferWithTokenRefreshTest.java @@ -43,10 +43,10 @@ import static org.awaitility.Awaitility.await; import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci; import static org.eclipse.edc.util.io.Ports.getFreePort; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PLATO_NAME; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_BPN; -import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.SOKRATES_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; import static org.eclipse.tractusx.edc.tests.helpers.PolicyHelperFunctions.bnpPolicy; import static org.eclipse.tractusx.edc.tests.helpers.TransferProcessHelperFunctions.createProxyRequest; import static org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase.ASYNC_TIMEOUT; @@ -64,21 +64,21 @@ public class TransferWithTokenRefreshTest { public static final String MOCK_BACKEND_REMOTE_HOST = "localhost"; public static final String MOCK_BACKEND_PATH = "/mock/api"; - protected static final TransferParticipant SOKRATES = TransferParticipant.Builder.newInstance() - .name(SOKRATES_NAME) - .id(SOKRATES_BPN) + protected static final TransferParticipant CONSUMER = TransferParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) .build(); - protected static final TransferParticipant PLATO = TransferParticipant.Builder.newInstance() - .name(PLATO_NAME) - .id(PLATO_BPN) + protected static final TransferParticipant PROVIDER = TransferParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) .build(); @RegisterExtension - protected static final ParticipantRuntime SOKRATES_RUNTIME = memoryRuntime(SOKRATES.getName(), SOKRATES.getBpn(), SOKRATES.getConfiguration()); + protected static final ParticipantRuntime CONSUMER_RUNTIME = memoryRuntime(CONSUMER.getName(), CONSUMER.getBpn(), CONSUMER.getConfiguration()); private static final Long VERY_SHORT_TOKEN_EXPIRY = 3L; @RegisterExtension - protected static final ParticipantRuntime PLATO_RUNTIME = memoryRuntime(PLATO.getName(), PLATO.getBpn(), forConfig(PLATO.getConfiguration()), TransferWithTokenRefreshTest::platoInitiator); + protected static final ParticipantRuntime PROVIDER_RUNTIME = memoryRuntime(PROVIDER.getName(), PROVIDER.getBpn(), forConfig(PROVIDER.getConfiguration()), TransferWithTokenRefreshTest::providerInitiator); protected ClientAndServer server; private String privateBackendUrl; @@ -90,8 +90,8 @@ private static Map forConfig(Map originalConfig) return newConfig; } - private static void platoInitiator(EdcExtension runtime) { - runtime.registerServiceMock(BdrsClient.class, (c) -> SOKRATES.getDid()); + private static void providerInitiator(EdcExtension runtime) { + runtime.registerServiceMock(BdrsClient.class, (c) -> CONSUMER.getDid()); } @BeforeEach @@ -110,20 +110,20 @@ void transferData_withExpiredEdr_shouldReturn4xx() { "contentType", "application/json" ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = PLATO.createPolicyDefinition(createAccessPolicy(SOKRATES.getBpn())); - var contractPolicyId = PLATO.createPolicyDefinition(createContractPolicy(SOKRATES.getBpn())); - PLATO.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = SOKRATES.requestAsset(PLATO, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = PROVIDER.createPolicyDefinition(createAccessPolicy(CONSUMER.getBpn())); + var contractPolicyId = PROVIDER.createPolicyDefinition(createContractPolicy(CONSUMER.getBpn())); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); // wait until EDC is available on the consumer side server.when(request().withMethod("GET").withPath(MOCK_BACKEND_PATH)).respond(response().withStatusCode(200).withBody("test response")); - var edr = SOKRATES.edrs().waitForEdr(transferProcessId); + var edr = CONSUMER.edrs().waitForEdr(transferProcessId); // wait until the EDR expires @@ -146,13 +146,13 @@ void transferData_withExpiredEdr_shouldReturn4xx() { server.verify(request().withPath(MOCK_BACKEND_PATH), VerificationTimes.never()); // renew EDR explicitly - var renewedEdr = SOKRATES.edrs().refreshEdr(transferProcessId) + var renewedEdr = CONSUMER.edrs().refreshEdr(transferProcessId) .statusCode(200) .extract().body() .as(JsonObject.class); // make sure the consumer has now been able to fetch the data. - var data = SOKRATES.data().pullData(renewedEdr, Map.of()); + var data = CONSUMER.data().pullData(renewedEdr, Map.of()); assertThat(data).isNotNull().isEqualTo("test response"); server.verify(request().withPath(MOCK_BACKEND_PATH), VerificationTimes.exactly(1)); @@ -168,19 +168,19 @@ void transferData_withAutomaticRefresh() { "contentType", "application/json" ); - PLATO.createAsset(assetId, Map.of(), dataAddress); + PROVIDER.createAsset(assetId, Map.of(), dataAddress); - var accessPolicyId = PLATO.createPolicyDefinition(createAccessPolicy(SOKRATES.getBpn())); - var contractPolicyId = PLATO.createPolicyDefinition(createContractPolicy(SOKRATES.getBpn())); - PLATO.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); - var transferProcessId = SOKRATES.requestAsset(PLATO, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); + var accessPolicyId = PROVIDER.createPolicyDefinition(createAccessPolicy(CONSUMER.getBpn())); + var contractPolicyId = PROVIDER.createPolicyDefinition(createContractPolicy(CONSUMER.getBpn())); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, Json.createObjectBuilder().build(), createProxyRequest(), "HttpData-PULL"); - SOKRATES.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); + CONSUMER.waitForTransferProcess(transferProcessId, TransferProcessStates.STARTED); // wait until EDC is available on the consumer side server.when(request().withMethod("GET").withPath(MOCK_BACKEND_PATH)).respond(response().withStatusCode(200).withBody("test response")); - var edr = SOKRATES.edrs().waitForEdr(transferProcessId); + var edr = CONSUMER.edrs().waitForEdr(transferProcessId); // wait until the EDR expires await().pollDelay(Duration.ofSeconds(VERY_SHORT_TOKEN_EXPIRY + 1)) @@ -202,13 +202,13 @@ void transferData_withAutomaticRefresh() { server.verify(request().withPath(MOCK_BACKEND_PATH), VerificationTimes.never()); // get EDR with automatic refresh - var renewedEdr = SOKRATES.edrs().getEdrWithRefresh(transferProcessId, true) + var renewedEdr = CONSUMER.edrs().getEdrWithRefresh(transferProcessId, true) .statusCode(200) .extract().body() .as(JsonObject.class); // make sure the consumer has now been able to fetch the data. - var data = SOKRATES.data().pullData(renewedEdr, Map.of()); + var data = CONSUMER.data().pullData(renewedEdr, Map.of()); assertThat(data).isNotNull().isEqualTo("test response"); server.verify(request().withPath(MOCK_BACKEND_PATH), VerificationTimes.exactly(1)); From fd92b4310628eea16cf9697f0bc92eab5e2f004e Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 29 Apr 2024 16:41:47 +0200 Subject: [PATCH 12/37] chore: add more iatp tests on spoofing credentials --- .../tests/transfer/CredentialSpoofTest.java | 211 ++++++++++++++++++ .../edc/tests/transfer/IatpParticipants.java | 68 ++++++ 2 files changed, 279 insertions(+) create mode 100644 edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/CredentialSpoofTest.java create mode 100644 edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/IatpParticipants.java diff --git a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/CredentialSpoofTest.java b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/CredentialSpoofTest.java new file mode 100644 index 000000000..a16e7cf2e --- /dev/null +++ b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/CredentialSpoofTest.java @@ -0,0 +1,211 @@ +/******************************************************************************** + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * 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. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + +package org.eclipse.tractusx.edc.tests.transfer; + +import jakarta.json.JsonObject; +import org.eclipse.edc.iam.did.spi.document.DidDocument; +import org.eclipse.edc.iam.did.spi.document.Service; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage; +import org.eclipse.edc.identityhub.spi.store.CredentialStore; +import org.eclipse.edc.identityhub.spi.verifiablecredentials.generator.VerifiablePresentationService; +import org.eclipse.edc.identityhub.spi.verifiablecredentials.model.VerifiableCredentialResource; +import org.eclipse.edc.jsonld.spi.JsonLd; +import org.eclipse.edc.junit.annotations.EndToEndTest; +import org.eclipse.edc.spi.EdcException; +import org.eclipse.edc.spi.query.QuerySpec; +import org.eclipse.edc.spi.result.Result; +import org.eclipse.edc.transform.spi.TypeTransformerRegistry; +import org.eclipse.tractusx.edc.tests.transfer.iatp.harness.IatpParticipant; +import org.eclipse.tractusx.edc.tests.transfer.iatp.runtime.IatpParticipantRuntime; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.mockserver.integration.ClientAndServer; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +import static org.eclipse.edc.util.io.Ports.getFreePort; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.BPN_SUFFIX; +import static org.eclipse.tractusx.edc.tests.helpers.PolicyHelperFunctions.bnpPolicy; +import static org.eclipse.tractusx.edc.tests.transfer.iatp.harness.IatpHelperFunctions.configureParticipant; +import static org.eclipse.tractusx.edc.tests.transfer.iatp.runtime.Runtimes.iatpRuntime; +import static org.eclipse.tractusx.edc.tests.transfer.iatp.runtime.Runtimes.stsRuntime; +import static org.hamcrest.Matchers.not; +import static org.mockserver.model.HttpRequest.request; +import static org.mockserver.model.HttpResponse.response; + +@EndToEndTest +public class CredentialSpoofTest implements IatpParticipants { + + public static final String MALICIOUS_ACTOR_NAME = "MALICIOUS"; + public static final String MALICIOUS_ACTOR_BPN = MALICIOUS_ACTOR_NAME + BPN_SUFFIX; + protected static final IatpParticipant MALICIOUS_ACTOR = IatpParticipant.Builder.newInstance() + .name(MALICIOUS_ACTOR_NAME) + .id(MALICIOUS_ACTOR_BPN) + .stsUri(STS.stsUri()) + .stsClientId(MALICIOUS_ACTOR_BPN) + .stsClientSecret("client_secret") + .trustedIssuer(DATASPACE_ISSUER_PARTICIPANT.didUrl()) + .dimUri(DIM_URI) + .did(IatpParticipants.did(MALICIOUS_ACTOR_NAME)) + .build(); + + @RegisterExtension + protected static final IatpParticipantRuntime MALICIOUS_ACTOR_RUNTIME = iatpRuntime(MALICIOUS_ACTOR.getName(), MALICIOUS_ACTOR.iatpConfiguration(PROVIDER, CONSUMER), MALICIOUS_ACTOR.getKeyPair()); + @RegisterExtension + protected static final IatpParticipantRuntime CONSUMER_RUNTIME = iatpRuntime(CONSUMER.getName(), CONSUMER.iatpConfiguration(PROVIDER, MALICIOUS_ACTOR), CONSUMER.getKeyPair()); + @RegisterExtension + protected static final IatpParticipantRuntime PROVIDER_RUNTIME = iatpRuntime(PROVIDER.getName(), PROVIDER.iatpConfiguration(CONSUMER, MALICIOUS_ACTOR), PROVIDER.getKeyPair()); + @RegisterExtension + protected static final IatpParticipantRuntime STS_RUNTIME = stsRuntime(STS.getName(), STS.stsConfiguration(CONSUMER, PROVIDER, MALICIOUS_ACTOR), STS.getKeyPair()); + private static final Integer MOCKED_CS_SERVICE_PORT = getFreePort(); + protected ClientAndServer server; + + + @BeforeAll + static void prepare() { + + // create the DIDs cache + var dids = new HashMap(); + dids.put(DATASPACE_ISSUER_PARTICIPANT.didUrl(), DATASPACE_ISSUER_PARTICIPANT.didDocument()); + dids.put(CONSUMER.getDid(), CONSUMER.getDidDocument()); + dids.put(PROVIDER.getDid(), PROVIDER.getDidDocument()); + dids.put(MALICIOUS_ACTOR.getDid(), maliciousActorDidDocument(MALICIOUS_ACTOR.getDidDocument())); + + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, CONSUMER, CONSUMER_RUNTIME, dids, STS_RUNTIME); + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, PROVIDER, PROVIDER_RUNTIME, dids, STS_RUNTIME); + configureParticipant(DATASPACE_ISSUER_PARTICIPANT, MALICIOUS_ACTOR, MALICIOUS_ACTOR_RUNTIME, dids, STS_RUNTIME); + + } + + private static DidDocument maliciousActorDidDocument(DidDocument didDocument) { + var service = new Service(); + service.setId("#credential-service"); + service.setType("CredentialService"); + service.setServiceEndpoint("http://%s:%d".formatted("localhost", MOCKED_CS_SERVICE_PORT)); + return DidDocument.Builder.newInstance() + .id(didDocument.getId()) + .verificationMethod(didDocument.getVerificationMethod()) + .service(List.of(service)) + .build(); + } + + @BeforeEach + void setup() { + server = ClientAndServer.startClientAndServer("localhost", getFreePort(), MOCKED_CS_SERVICE_PORT); + } + + @AfterEach + void shutdown() { + server.stop(); + } + + @Test + @DisplayName("Malicious actor should not impersonate a consumer by creating a VP with the consumer membership credential") + void shouldNotImpersonateConsumer_withWrappedConsumerCredential() { + var assetId = "api-asset-1"; + + + Map dataAddress = Map.of( + "baseUrl", "http://mock", + "type", "HttpData", + "contentType", "application/json" + ); + + var presentationService = MALICIOUS_ACTOR_RUNTIME.getService(VerifiablePresentationService.class); + + withMock((membershipCredential) -> presentationService.createPresentation(MALICIOUS_ACTOR.getDid(), List.of(membershipCredential.getVerifiableCredential()), null, PROVIDER.getDid())); + + PROVIDER.createAsset(assetId, Map.of(), dataAddress); + + var policy = createAccessPolicy(CONSUMER.getBpn()); + var accessPolicyId = PROVIDER.createPolicyDefinition(policy); + var contractPolicyId = PROVIDER.createPolicyDefinition(policy); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + + MALICIOUS_ACTOR.getCatalog(PROVIDER) + .log().ifError() + .statusCode(not(200)); + + } + + @Test + @DisplayName("Malicious actor should not impersonate a consumer sending a valid consumer VP") + void shouldNotImpersonateConsumer_withConsumerPresentation() { + var assetId = "api-asset-1"; + + + Map dataAddress = Map.of( + "baseUrl", "http://mock", + "type", "HttpData", + "contentType", "application/json" + ); + + var presentationService = CONSUMER_RUNTIME.getService(VerifiablePresentationService.class); + + withMock((membershipCredential) -> presentationService.createPresentation(CONSUMER.getDid(), List.of(membershipCredential.getVerifiableCredential()), null, PROVIDER.getDid())); + + PROVIDER.createAsset(assetId, Map.of(), dataAddress); + + var policy = createAccessPolicy(CONSUMER.getBpn()); + var accessPolicyId = PROVIDER.createPolicyDefinition(policy); + var contractPolicyId = PROVIDER.createPolicyDefinition(policy); + PROVIDER.createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId); + + MALICIOUS_ACTOR.getCatalog(PROVIDER) + .log().ifError() + .statusCode(not(200)); + + } + + void withMock(Function> response) { + + var store = CONSUMER_RUNTIME.getService(CredentialStore.class); + + var sokratesMembershipCredential = store.query(QuerySpec.max()).getContent() + .stream().filter(c -> c.getVerifiableCredential().credential().getType().contains("MembershipCredential")) + .findFirst() + .orElseThrow(); + + var transformerRegistry = MALICIOUS_ACTOR_RUNTIME.getService(TypeTransformerRegistry.class); + var jsonLd = MALICIOUS_ACTOR_RUNTIME.getService(JsonLd.class); + + + server.when(request().withMethod("POST").withPath("/presentations/query")).respond((request -> { + var json = response.apply(sokratesMembershipCredential) + .compose(presentation -> transformerRegistry.transform(presentation, JsonObject.class)) + .compose(jsonLd::compact) + .orElseThrow(failure -> new EdcException(failure.getFailureDetail())); + + return response().withStatusCode(200).withBody(json.toString()); + })); + } + + protected JsonObject createAccessPolicy(String bpn) { + return bnpPolicy(bpn); + } + +} diff --git a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/IatpParticipants.java b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/IatpParticipants.java new file mode 100644 index 000000000..f096ffc17 --- /dev/null +++ b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/IatpParticipants.java @@ -0,0 +1,68 @@ +/******************************************************************************** + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * 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. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + +package org.eclipse.tractusx.edc.tests.transfer; + +import org.eclipse.tractusx.edc.tests.transfer.iatp.harness.DataspaceIssuer; +import org.eclipse.tractusx.edc.tests.transfer.iatp.harness.IatpParticipant; +import org.eclipse.tractusx.edc.tests.transfer.iatp.harness.StsParticipant; + +import java.net.URI; + +import static org.eclipse.edc.util.io.Ports.getFreePort; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.CONSUMER_NAME; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_BPN; +import static org.eclipse.tractusx.edc.tests.TestRuntimeConfiguration.PROVIDER_NAME; + +public interface IatpParticipants { + + URI DIM_URI = URI.create("http://localhost:" + getFreePort()); + DataspaceIssuer DATASPACE_ISSUER_PARTICIPANT = new DataspaceIssuer(); + StsParticipant STS = StsParticipant.Builder.newInstance() + .id("STS") + .name("STS") + .build(); + IatpParticipant CONSUMER = IatpParticipant.Builder.newInstance() + .name(CONSUMER_NAME) + .id(CONSUMER_BPN) + .stsUri(STS.stsUri()) + .stsClientId(CONSUMER_BPN) + .stsClientSecret("client_secret") + .trustedIssuer(DATASPACE_ISSUER_PARTICIPANT.didUrl()) + .dimUri(DIM_URI) + .did(did(CONSUMER_NAME)) + .build(); + + IatpParticipant PROVIDER = IatpParticipant.Builder.newInstance() + .name(PROVIDER_NAME) + .id(PROVIDER_BPN) + .stsUri(STS.stsUri()) + .stsClientId(PROVIDER_BPN) + .stsClientSecret("client_secret") + .trustedIssuer(DATASPACE_ISSUER_PARTICIPANT.didUrl()) + .dimUri(DIM_URI) + .did(did(PROVIDER_NAME)) + .build(); + + static String did(String name) { + return "did:example:" + name.toLowerCase(); + } + +} From d525ec01dd3a3b7496581cdab71654f906716a1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 01:58:23 +0000 Subject: [PATCH 13/37] chore(deps): bump aquasecurity/trivy-action from 0.19.0 to 0.20.0 Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.19.0 to 0.20.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/0.19.0...0.20.0) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/trivy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 0db9c033a..b3fdb049d 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -58,7 +58,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@0.19.0 + uses: aquasecurity/trivy-action@0.20.0 with: scan-type: "config" # ignore-unfixed: true @@ -102,7 +102,7 @@ jobs: ## the next two steps will only execute if the image exists check was successful - name: Run Trivy vulnerability scanner if: success() && steps.imageCheck.outcome != 'failure' - uses: aquasecurity/trivy-action@0.19.0 + uses: aquasecurity/trivy-action@0.20.0 with: image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}" format: "sarif" From 8a6163cc65fb525e0dd4de312dbe51916329062d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 01:58:32 +0000 Subject: [PATCH 14/37] chore(deps): bump mikefarah/yq from 4.43.1 to 4.44.1 Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.43.1 to 4.44.1. - [Release notes](https://github.com/mikefarah/yq/releases) - [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt) - [Commits](https://github.com/mikefarah/yq/compare/v4.43.1...v4.44.1) --- updated-dependencies: - dependency-name: mikefarah/yq dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/draft-new-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml index 3133badfa..4713d6dde 100644 --- a/.github/workflows/draft-new-release.yaml +++ b/.github/workflows/draft-new-release.yaml @@ -54,7 +54,7 @@ jobs: GITHUB_PACKAGE_USERNAME: ${{ github.actor }} GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }} - name: Bump version in /charts - uses: mikefarah/yq@v4.43.1 + uses: mikefarah/yq@v4.44.1 with: cmd: |- find charts -name Chart.yaml -maxdepth 3 | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"' From f62d66448ba695109b15a94cf8a14e48807f23e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 02:02:38 +0000 Subject: [PATCH 15/37] chore(deps): bump testcontainers from 1.19.7 to 1.19.8 Bumps `testcontainers` from 1.19.7 to 1.19.8. Updates `org.testcontainers:junit-jupiter` from 1.19.7 to 1.19.8 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.7...1.19.8) Updates `org.testcontainers:postgresql` from 1.19.7 to 1.19.8 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.7...1.19.8) Updates `org.testcontainers:vault` from 1.19.7 to 1.19.8 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.7...1.19.8) --- updated-dependencies: - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:vault dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c35f7932f..a660364ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ postgres = "42.7.3" restAssured = "5.4.0" rsApi = "4.0.0" slf4j = "2.0.13" -testcontainers = "1.19.7" +testcontainers = "1.19.8" tink = "1.13.0" titanium = "1.4.0" From 09a5a9fff48f820ceb33274191df5b76a7fd8961 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 13 May 2024 09:10:03 +0200 Subject: [PATCH 16/37] chore: deps file --- DEPENDENCIES | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index c15b9e15f..591542ce4 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -563,7 +563,7 @@ maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.20, EPL-2.0 OR Apache-2.0, 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.12.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.12.0, , restricted, clearlydefined +maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.12.0, NOASSERTION, restricted, clearlydefined maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, 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.6, 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.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish @@ -644,11 +644,16 @@ maven/mavencentral/org.slf4j/slf4j-api/2.0.13, MIT, approved, #5915 maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915 maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915 maven/mavencentral/org.testcontainers/database-commons/1.19.7, Apache-2.0, approved, #10345 +maven/mavencentral/org.testcontainers/database-commons/1.19.8, Apache-2.0, approved, #10345 maven/mavencentral/org.testcontainers/jdbc/1.19.7, Apache-2.0, approved, #10348 +maven/mavencentral/org.testcontainers/jdbc/1.19.8, Apache-2.0, approved, #10348 maven/mavencentral/org.testcontainers/junit-jupiter/1.19.6, MIT, approved, #10344 maven/mavencentral/org.testcontainers/junit-jupiter/1.19.7, MIT, approved, #10344 +maven/mavencentral/org.testcontainers/junit-jupiter/1.19.8, MIT, approved, #10344 maven/mavencentral/org.testcontainers/postgresql/1.19.7, MIT, approved, #10350 +maven/mavencentral/org.testcontainers/postgresql/1.19.8, MIT, approved, #10350 maven/mavencentral/org.testcontainers/testcontainers/1.19.7, Apache-2.0 AND MIT, approved, #10347 +maven/mavencentral/org.testcontainers/testcontainers/1.19.8, Apache-2.0 AND MIT, approved, #10347 maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.xmlunit/xmlunit-placeholders/2.9.1, Apache-2.0, approved, clearlydefined From 2fcc11119f24b44e18122c1b6d49da64e90f56e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 08:29:15 +0000 Subject: [PATCH 17/37] chore(deps): bump aws from 2.25.46 to 2.25.50 Bumps `aws` from 2.25.46 to 2.25.50. Updates `software.amazon.awssdk:s3` from 2.25.46 to 2.25.50 Updates `software.amazon.awssdk:s3-transfer-manager` from 2.25.46 to 2.25.50 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3-transfer-manager dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a660364ff..f4c1aafd1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ edc = "0.6.3" apache-sshd = "2.12.1" assertj = "3.25.3" awaitility = "4.2.1" -aws = "2.25.46" +aws = "2.25.50" azure-identity = "1.12.1" bouncyCastle-jdk18on = "1.78.1" flyway = "10.12.0" From cf5796a866745e35900b9ad4230b80627a9156d7 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 13 May 2024 10:32:32 +0200 Subject: [PATCH 18/37] chore: deps file --- DEPENDENCIES | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 591542ce4..ffca73539 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -661,58 +661,58 @@ maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 maven/mavencentral/software.amazon.awssdk/annotations/2.24.10, Apache-2.0, approved, #13251 -maven/mavencentral/software.amazon.awssdk/annotations/2.25.46, Apache-2.0, approved, #13691 +maven/mavencentral/software.amazon.awssdk/annotations/2.25.50, Apache-2.0, approved, #13691 maven/mavencentral/software.amazon.awssdk/apache-client/2.24.10, Apache-2.0, approved, #13257 -maven/mavencentral/software.amazon.awssdk/apache-client/2.25.46, Apache-2.0, approved, #13687 +maven/mavencentral/software.amazon.awssdk/apache-client/2.25.50, Apache-2.0, approved, #13687 maven/mavencentral/software.amazon.awssdk/arns/2.24.10, Apache-2.0, approved, #13243 -maven/mavencentral/software.amazon.awssdk/arns/2.25.46, Apache-2.0, approved, #13695 +maven/mavencentral/software.amazon.awssdk/arns/2.25.50, Apache-2.0, approved, #13695 maven/mavencentral/software.amazon.awssdk/auth/2.24.10, Apache-2.0, approved, #13256 -maven/mavencentral/software.amazon.awssdk/auth/2.25.46, Apache-2.0, approved, #13692 +maven/mavencentral/software.amazon.awssdk/auth/2.25.50, Apache-2.0, approved, #13692 maven/mavencentral/software.amazon.awssdk/aws-core/2.24.10, Apache-2.0, approved, #13240 -maven/mavencentral/software.amazon.awssdk/aws-core/2.25.46, Apache-2.0, approved, #13702 +maven/mavencentral/software.amazon.awssdk/aws-core/2.25.50, Apache-2.0, approved, #13702 maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.24.10, Apache-2.0, approved, #13262 -maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.46, Apache-2.0, approved, #13701 +maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.50, Apache-2.0, approved, #13701 maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.24.10, Apache-2.0, approved, #13247 -maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.46, Apache-2.0, approved, #13684 +maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.50, Apache-2.0, approved, #13684 maven/mavencentral/software.amazon.awssdk/checksums-spi/2.24.10, Apache-2.0, approved, #13245 -maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.46, Apache-2.0, approved, #13686 +maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.50, Apache-2.0, approved, #13686 maven/mavencentral/software.amazon.awssdk/checksums/2.24.10, Apache-2.0, approved, #13242 -maven/mavencentral/software.amazon.awssdk/checksums/2.25.46, Apache-2.0, approved, #13677 +maven/mavencentral/software.amazon.awssdk/checksums/2.25.50, Apache-2.0, approved, #13677 maven/mavencentral/software.amazon.awssdk/crt-core/2.24.10, Apache-2.0, approved, #13252 -maven/mavencentral/software.amazon.awssdk/crt-core/2.25.46, Apache-2.0, approved, #13705 +maven/mavencentral/software.amazon.awssdk/crt-core/2.25.50, Apache-2.0, approved, #13705 maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.24.10, Apache-2.0, approved, #13246 -maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.46, Apache-2.0, approved, #13681 +maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.50, Apache-2.0, approved, #13681 maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.24.10, Apache-2.0, approved, #13253 -maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.46, Apache-2.0, approved, #13696 +maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.50, Apache-2.0, approved, #13696 maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.24.10, Apache-2.0, approved, #13264 -maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.46, Apache-2.0, approved, #13704 +maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.50, Apache-2.0, approved, #13704 maven/mavencentral/software.amazon.awssdk/http-auth/2.24.10, Apache-2.0, approved, #13248 -maven/mavencentral/software.amazon.awssdk/http-auth/2.25.46, Apache-2.0, approved, #13682 +maven/mavencentral/software.amazon.awssdk/http-auth/2.25.50, Apache-2.0, approved, #13682 maven/mavencentral/software.amazon.awssdk/http-client-spi/2.24.10, Apache-2.0, approved, #13259 -maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.46, Apache-2.0, approved, #13706 +maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.50, Apache-2.0, approved, #13706 maven/mavencentral/software.amazon.awssdk/iam/2.24.10, Apache-2.0, approved, #13444 maven/mavencentral/software.amazon.awssdk/identity-spi/2.24.10, Apache-2.0, approved, #13244 -maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.46, Apache-2.0, approved, #13685 +maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.50, Apache-2.0, approved, #13685 maven/mavencentral/software.amazon.awssdk/json-utils/2.24.10, Apache-2.0, approved, #13261 -maven/mavencentral/software.amazon.awssdk/json-utils/2.25.46, Apache-2.0, approved, #13698 +maven/mavencentral/software.amazon.awssdk/json-utils/2.25.50, Apache-2.0, approved, #13698 maven/mavencentral/software.amazon.awssdk/metrics-spi/2.24.10, Apache-2.0, approved, #13239 -maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.46, Apache-2.0, approved, #13680 +maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.50, Apache-2.0, approved, #13680 maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.24.10, Apache-2.0, approved, #13260 -maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.46, Apache-2.0, approved, #13693 +maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.50, Apache-2.0, approved, #13693 maven/mavencentral/software.amazon.awssdk/profiles/2.24.10, Apache-2.0, approved, #13258 -maven/mavencentral/software.amazon.awssdk/profiles/2.25.46, Apache-2.0, approved, #13697 +maven/mavencentral/software.amazon.awssdk/profiles/2.25.50, Apache-2.0, approved, #13697 maven/mavencentral/software.amazon.awssdk/protocol-core/2.24.10, Apache-2.0, approved, #13241 -maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.46, Apache-2.0, approved, #13679 +maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.50, Apache-2.0, approved, #13679 maven/mavencentral/software.amazon.awssdk/regions/2.24.10, Apache-2.0, approved, #13255 -maven/mavencentral/software.amazon.awssdk/regions/2.25.46, Apache-2.0, approved, #13694 -maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.46, Apache-2.0, approved, #13699 +maven/mavencentral/software.amazon.awssdk/regions/2.25.50, Apache-2.0, approved, #13694 +maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.50, Apache-2.0, approved, #13699 maven/mavencentral/software.amazon.awssdk/s3/2.24.10, Apache-2.0, approved, #13254 -maven/mavencentral/software.amazon.awssdk/s3/2.25.46, Apache-2.0, approved, #13688 +maven/mavencentral/software.amazon.awssdk/s3/2.25.50, Apache-2.0, approved, #13688 maven/mavencentral/software.amazon.awssdk/sdk-core/2.24.10, Apache-2.0, approved, #13265 -maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.46, Apache-2.0, approved, #13700 +maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.50, Apache-2.0, approved, #13700 maven/mavencentral/software.amazon.awssdk/sts/2.24.10, Apache-2.0, approved, #13442 maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.24.10, Apache-2.0, approved, #13249 -maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.46, Apache-2.0, approved, #13703 +maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.50, Apache-2.0, approved, #13703 maven/mavencentral/software.amazon.awssdk/utils/2.24.10, Apache-2.0, approved, #13250 -maven/mavencentral/software.amazon.awssdk/utils/2.25.46, Apache-2.0, approved, #13689 +maven/mavencentral/software.amazon.awssdk/utils/2.25.50, Apache-2.0, approved, #13689 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined From 6f1af118ce24fa1ab9452074b15e8504c7856ff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 09:12:37 +0000 Subject: [PATCH 19/37] chore(deps): bump thomaseizinger/create-pull-request from 1.3.1 to 1.4.0 Bumps [thomaseizinger/create-pull-request](https://github.com/thomaseizinger/create-pull-request) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/thomaseizinger/create-pull-request/releases) - [Changelog](https://github.com/thomaseizinger/create-pull-request/blob/master/CHANGELOG.md) - [Commits](https://github.com/thomaseizinger/create-pull-request/compare/1.3.1...1.4.0) --- updated-dependencies: - dependency-name: thomaseizinger/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/draft-new-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml index 4713d6dde..318011de0 100644 --- a/.github/workflows/draft-new-release.yaml +++ b/.github/workflows/draft-new-release.yaml @@ -75,7 +75,7 @@ jobs: - name: Push new branch run: git push origin release/${{ github.event.inputs.version }} - name: Create pull request - uses: thomaseizinger/create-pull-request@1.3.1 + uses: thomaseizinger/create-pull-request@1.4.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 9307fd8c91352307ad4bc3a2f82d135d3109cef5 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 13 May 2024 17:38:43 +0200 Subject: [PATCH 20/37] chore: disable dim int test (#1300) --- .../edc/tests/catalog/DimCatalogIntegrationTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java index 39b558b00..486981db1 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/DimCatalogIntegrationTest.java @@ -22,12 +22,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.tractusx.edc.lifecycle.DimParticipant; import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime; -import org.eclipse.tractusx.edc.tag.DimIntegrationTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.mockserver.integration.ClientAndServer; import org.mockserver.model.HttpResponse; @@ -49,8 +46,8 @@ import static org.eclipse.tractusx.edc.tests.helpers.PolicyHelperFunctions.frameworkPolicy; import static org.mockserver.model.HttpRequest.request; -@DimIntegrationTest -@Disabled +//@DimIntegrationTest +//@Disabled public class DimCatalogIntegrationTest { private static final ObjectMapper MAPPER = new ObjectMapper(); @@ -98,7 +95,7 @@ static void afterAll() { bdrsServer.stop(); } - @Test + //@Test @DisplayName("Verify that the consumer receives only the offers he is permitted to") void requestCatalog_filteredByDismantler_shouldReturnOffer() { // arrange From c6b1b31eba7f3288ddeb547c98723a83829031d3 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Tue, 14 May 2024 09:34:27 +0200 Subject: [PATCH 21/37] feat: make auto_refresh default to true (#1301) --- .../tractusx/edc/api/edr/v2/EdrCacheApi.java | 2 +- .../edc/api/edr/v2/EdrCacheApiController.java | 3 +- .../api/edr/v2/EdrCacheApiControllerTest.java | 35 ++++++++++++++++--- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java b/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java index 29dd28843..dd429b1ef 100644 --- a/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java +++ b/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java @@ -67,7 +67,7 @@ public interface EdrCacheApi { @Operation(description = "Gets the EDR data address with the given transfer process ID", parameters = { @Parameter(name = "transferProcessId", description = "The ID of the transferprocess for which the EDR should be fetched", required = true), - @Parameter(name = "auto_refresh", description = "Whether the access token that is stored on the EDR should be checked for expiry, and renewed if necessary. Default is true") + @Parameter(name = "auto_refresh", description = "Whether the access token that is stored on the EDR should be checked for expiry, and renewed if necessary. Default is true.") }, responses = { @ApiResponse(responseCode = "200", description = "The data address", diff --git a/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiController.java b/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiController.java index ea201d0af..d14e521e8 100644 --- a/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiController.java +++ b/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiController.java @@ -23,6 +23,7 @@ import jakarta.json.JsonObject; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; @@ -139,7 +140,7 @@ public JsonArray requestEdrEntries(JsonObject querySpecJson) { @GET @Path("{transferProcessId}/dataaddress") @Override - public JsonObject getEdrEntryDataAddress(@PathParam("transferProcessId") String transferProcessId, @QueryParam("auto_refresh") boolean autoRefresh) { + public JsonObject getEdrEntryDataAddress(@PathParam("transferProcessId") String transferProcessId, @DefaultValue("true") @QueryParam("auto_refresh") boolean autoRefresh) { var mode = autoRefresh ? AUTO_REFRESH : NO_REFRESH; var dataAddress = edrService.resolveByTransferProcess(transferProcessId, mode) .orElseThrow(exceptionMapper(EndpointDataReferenceEntry.class, transferProcessId)); diff --git a/edc-extensions/edr/edr-api-v2/src/test/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiControllerTest.java b/edc-extensions/edr/edr-api-v2/src/test/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiControllerTest.java index ae7017dfa..1b63ff148 100644 --- a/edc-extensions/edr/edr-api-v2/src/test/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiControllerTest.java +++ b/edc-extensions/edr/edr-api-v2/src/test/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApiControllerTest.java @@ -161,7 +161,7 @@ void getEdrEntryDataAddress() { var dataAddressType = "type"; var dataAddress = DataAddress.Builder.newInstance().type(dataAddressType).build(); - when(edrService.resolveByTransferProcess("transferProcessId", NO_REFRESH)) + when(edrService.resolveByTransferProcess("transferProcessId", AUTO_REFRESH)) .thenReturn(ServiceResult.success(dataAddress)); when(transformerRegistry.transform(isA(DataAddress.class), eq(JsonObject.class))) @@ -176,13 +176,13 @@ void getEdrEntryDataAddress() { .contentType(JSON) .body("'%s'".formatted(DataAddress.EDC_DATA_ADDRESS_TYPE_PROPERTY), equalTo(dataAddressType)); - verify(edrService).resolveByTransferProcess("transferProcessId", NO_REFRESH); + verify(edrService).resolveByTransferProcess("transferProcessId", AUTO_REFRESH); verify(transformerRegistry).transform(isA(DataAddress.class), eq(JsonObject.class)); verifyNoMoreInteractions(transformerRegistry); } @Test - void getEdrEntryDataAddress_withAutorefresh() { + void getEdrEntryDataAddress_withExplicitAutoRefreshTrue() { var dataAddressType = "type"; var dataAddress = DataAddress.Builder.newInstance().type(dataAddressType).build(); @@ -206,11 +206,36 @@ void getEdrEntryDataAddress_withAutorefresh() { verifyNoMoreInteractions(transformerRegistry); } + @Test + void getEdrEntryDataAddress_withExplicitAutoRefreshFalse() { + + var dataAddressType = "type"; + var dataAddress = DataAddress.Builder.newInstance().type(dataAddressType).build(); + when(edrService.resolveByTransferProcess("transferProcessId", NO_REFRESH)) + .thenReturn(ServiceResult.success(dataAddress)); + + when(transformerRegistry.transform(isA(DataAddress.class), eq(JsonObject.class))) + .thenReturn(Result.success(createDataAddress(dataAddressType).build())); + + baseRequest() + .contentType(JSON) + .get("/v2/edrs/transferProcessId/dataaddress?auto_refresh=false") + .then() + .log().ifError() + .statusCode(200) + .contentType(JSON) + .body("'%s'".formatted(DataAddress.EDC_DATA_ADDRESS_TYPE_PROPERTY), equalTo(dataAddressType)); + + verify(edrService).resolveByTransferProcess("transferProcessId", NO_REFRESH); + verify(transformerRegistry).transform(isA(DataAddress.class), eq(JsonObject.class)); + verifyNoMoreInteractions(transformerRegistry); + } + @Test void getEdrEntryDataAddress_whenNotFound() { - when(edrService.resolveByTransferProcess("transferProcessId", NO_REFRESH)) + when(edrService.resolveByTransferProcess("transferProcessId", AUTO_REFRESH)) .thenReturn(ServiceResult.notFound("notFound")); @@ -222,7 +247,7 @@ void getEdrEntryDataAddress_whenNotFound() { .statusCode(404) .contentType(JSON); - verify(edrService).resolveByTransferProcess("transferProcessId", NO_REFRESH); + verify(edrService).resolveByTransferProcess("transferProcessId", AUTO_REFRESH); verifyNoMoreInteractions(transformerRegistry); } From b47551b02e65a71f468790ecf84500da98f95e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Uma=C5=84ski?= Date: Tue, 14 May 2024 14:31:38 +0200 Subject: [PATCH 22/37] fix: make azure vault related variables in deployment chart optional #1304 (#1305) * fix: make azure vault related variables in deployment chart optional * docs: update tractus-connector-azure-vault chart README --- charts/tractusx-connector-azure-vault/README.md | 4 ++-- .../templates/deployment-controlplane.yaml | 17 ++++++++++------- .../templates/deployment-dataplane.yaml | 11 +++++++---- .../tractusx-connector-azure-vault/values.yaml | 4 ++-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 46c20e5a1..540dccf24 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -280,10 +280,10 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | tests | object | `{"hookDeletePolicy":"before-hook-creation,hook-succeeded"}` | Configurations for Helm tests | | tests.hookDeletePolicy | string | `"before-hook-creation,hook-succeeded"` | Configure the hook-delete-policy for Helm tests | | vault.azure.certificate | string | `nil` | | -| vault.azure.client | string | `""` | | +| vault.azure.client | string | `nil` | | | vault.azure.name | string | `""` | | | vault.azure.secret | string | `nil` | | -| vault.azure.tenant | string | `""` | | +| vault.azure.tenant | string | `nil` | | | vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` | | | vault.secretNames.transferProxyTokenSignerPrivateKey | string | `nil` | | | vault.secretNames.transferProxyTokenSignerPublicKey | string | `nil` | | diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index 311cdfa0d..9dec5c1e4 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -321,18 +321,21 @@ spec: ## VAULT ## ########### - - name: "AZURE_CLIENT_ID" - value: {{ .Values.vault.azure.client | required ".Values.vault.azure.client is required" | quote }} - - name: "AZURE_TENANT_ID" - value: {{ .Values.vault.azure.tenant | required ".Values.vault.azure.tenant is required" | quote }} - name: "EDC_VAULT_NAME" value: {{ .Values.vault.azure.name | required ".Values.vault.azure.name is required" | quote }} - # only set the env var if config value not null + # only set the env vars if config value not null + {{- if .Values.vault.azure.client }} + - name: "AZURE_CLIENT_ID" + value: {{ .Values.vault.azure.client | quote }} + {{- end }} + {{- if .Values.vault.azure.tenant }} + - name: "AZURE_TENANT_ID" + value: {{ .Values.vault.azure.tenant | quote }} + {{- end }} {{- if .Values.vault.azure.secret }} - name: "AZURE_CLIENT_SECRET" value: {{ .Values.vault.azure.secret | quote }} - {{- end }} - # only set the env var if config value not null + {{- end }} {{- if .Values.vault.azure.certificate }} - name: "AZURE_CLIENT_CERTIFICATE_PATH" value: {{ .Values.vault.azure.certificate | quote }} diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml index 564ecdaa6..fbddb75bc 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml @@ -188,18 +188,21 @@ spec: ## VAULT ## ########### + - name: "EDC_VAULT_NAME" + value: {{ .Values.vault.azure.name | required ".Values.vault.azure.name is required" | quote }} + # only set the env vars if config value not null + {{- if .Values.vault.azure.client }} - name: "AZURE_CLIENT_ID" value: {{ .Values.vault.azure.client | quote }} + {{- end }} + {{- if .Values.vault.azure.tenant }} - name: "AZURE_TENANT_ID" value: {{ .Values.vault.azure.tenant | quote }} - - name: "EDC_VAULT_NAME" - value: {{ .Values.vault.azure.name | quote }} - # only set the env var if config value not null + {{- end }} {{- if .Values.vault.azure.secret }} - name: "AZURE_CLIENT_SECRET" value: {{ .Values.vault.azure.secret | quote }} {{- end }} - # only set the env var if config value not null {{- if .Values.vault.azure.certificate }} - name: "AZURE_CLIENT_CERTIFICATE_PATH" value: {{ .Values.vault.azure.certificate | quote }} diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index d5636be71..56c8bb9be 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -530,8 +530,8 @@ postgresql: vault: azure: name: "" - client: "" - tenant: "" + client: + tenant: secret: certificate: From ba2d4d37b839411dd25da26b29a350142259273f Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Tue, 14 May 2024 15:26:23 +0200 Subject: [PATCH 23/37] chore: harmonize settings names (with backwards compat) (#1307) * chore: harmonize settings names (with backwards compat) * update test settings * checkstyle --- .../tractusx/edc/core/utils/ConfigUtil.java | 92 +++++++++++++++++++ .../core/utils/RequiredConfigWarnings.java | 30 ------ .../edc/core/utils/ConfigUtilTest.java | 92 +++++++++++++++++++ .../edc-runtime-memory/build.gradle.kts | 1 + .../edc/vault/memory/VaultSeedExtension.java | 9 +- .../identity/mapper/BdrsClientExtension.java | 24 +++-- .../mapper/BdrsClientImplExtensionTest.java | 8 +- .../build.gradle.kts | 4 +- .../DataPlaneProxyConsumerApiExtension.java | 15 ++- ...DataPlaneTokenRefreshServiceExtension.java | 37 +++++--- .../dim/DimSecureTokenServiceExtension.java | 18 ++-- .../sts/dim/DimStsConfigurationExtension.java | 3 +- .../sts/dim/DimOauthClientExtensionTest.java | 9 -- .../dim/DimSecureServiceExtensionTest.java | 2 +- .../iam/iatp/IatpDefaultScopeExtension.java | 2 +- .../postgresql-migration-lib/build.gradle.kts | 1 + .../AbstractPostgresqlMigrationExtension.java | 6 +- .../TokenRefreshHandlerExtension.java | 4 +- .../edc/lifecycle/DimParticipant.java | 2 +- .../TractusxIatpParticipantBase.java | 2 +- .../participant/TractusxParticipantBase.java | 2 +- .../transfer/test/RuntimeConfig.java | 2 +- .../tokenrefresh/e2e/RuntimeConfig.java | 2 +- edc-tests/runtime/extensions/build.gradle.kts | 2 +- .../edc/lifecycle/VaultSeedExtension.java | 8 +- .../edc/iatp/TestAudienceMapperExtension.java | 2 +- .../edc-dast-runtime/configuration.properties | 2 +- .../src/test/resources/tenants.properties | 4 +- 28 files changed, 283 insertions(+), 102 deletions(-) create mode 100644 core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/ConfigUtil.java delete mode 100644 core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/RequiredConfigWarnings.java create mode 100644 core/core-utils/src/test/java/org/eclipse/tractusx/edc/core/utils/ConfigUtilTest.java diff --git a/core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/ConfigUtil.java b/core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/ConfigUtil.java new file mode 100644 index 000000000..3191c6651 --- /dev/null +++ b/core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/ConfigUtil.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * 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. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.eclipse.tractusx.edc.core.utils; + +import org.eclipse.edc.spi.EdcException; +import org.eclipse.edc.spi.monitor.Monitor; +import org.eclipse.edc.spi.system.ServiceExtensionContext; +import org.jetbrains.annotations.NotNull; + +public class ConfigUtil { + + public static final String DEPRECATION_WARNING = "Deprecated property used: '%s'. Please consider using the new property '%s' instead."; + + public static void missingMandatoryProperty(Monitor monitor, String missingConfig) { + throw new EdcException("Mandatory config value missing: '%s'. This runtime is not operational.".formatted(missingConfig)); + } + + public static String propertyCompatibility(ServiceExtensionContext context, String config, String deprecatedConfig, String defaultValue) { + var value = context.getSetting(config, null); + if (value == null) { + value = context.getSetting(deprecatedConfig, null); + if (value == null) { + return defaultValue; + } + context.getMonitor().warning(DEPRECATION_WARNING.formatted(deprecatedConfig, config)); + } + return value; + } + + public static int propertyCompatibility(ServiceExtensionContext context, String config, String deprecatedConfig, int defaultValue) { + var value = context.getConfig().getInteger(config, null); + if (value == null) { + value = context.getConfig().getInteger(deprecatedConfig, null); + if (value == null) { + return defaultValue; + } + context.getMonitor().warning(DEPRECATION_WARNING.formatted(deprecatedConfig, config)); + } + return value; + } + + public static long propertyCompatibility(ServiceExtensionContext context, String config, String deprecatedConfig, long defaultValue) { + var value = context.getConfig().getLong(config, null); + if (value == null) { + value = context.getConfig().getLong(deprecatedConfig, null); + if (value == null) { + return defaultValue; + } + context.getMonitor().warning(DEPRECATION_WARNING.formatted(deprecatedConfig, config)); + } + return value; + } + + @NotNull + public static String propertyCompatibility(ServiceExtensionContext context, String config, String deprecatedConfig) { + var value = context.getSetting(config, null); + if (value == null) { + value = context.getConfig().getString(deprecatedConfig); + context.getMonitor().warning(DEPRECATION_WARNING.formatted(deprecatedConfig, config)); + } + return value; + } + + public static boolean propertyCompatibility(ServiceExtensionContext context, String config, String deprecatedConfig, boolean defaultValue) { + var value = context.getConfig().getBoolean(config, null); + if (value == null) { + value = context.getConfig().getBoolean(deprecatedConfig, null); + if (value == null) { + return defaultValue; + } + context.getMonitor().warning(DEPRECATION_WARNING.formatted(deprecatedConfig, config)); + } + return value; + } +} diff --git a/core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/RequiredConfigWarnings.java b/core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/RequiredConfigWarnings.java deleted file mode 100644 index c905ec56b..000000000 --- a/core/core-utils/src/main/java/org/eclipse/tractusx/edc/core/utils/RequiredConfigWarnings.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * 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. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.eclipse.tractusx.edc.core.utils; - -import org.eclipse.edc.spi.EdcException; -import org.eclipse.edc.spi.monitor.Monitor; - -public class RequiredConfigWarnings { - - public static void missingMandatoryProperty(Monitor monitor, String missingConfig) { - throw new EdcException("Mandatory config value missing: '%s'. This runtime is not operational.".formatted(missingConfig)); - } -} diff --git a/core/core-utils/src/test/java/org/eclipse/tractusx/edc/core/utils/ConfigUtilTest.java b/core/core-utils/src/test/java/org/eclipse/tractusx/edc/core/utils/ConfigUtilTest.java new file mode 100644 index 000000000..062079556 --- /dev/null +++ b/core/core-utils/src/test/java/org/eclipse/tractusx/edc/core/utils/ConfigUtilTest.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * 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. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.eclipse.tractusx.edc.core.utils; + +import org.eclipse.edc.spi.EdcException; +import org.eclipse.edc.spi.monitor.Monitor; +import org.eclipse.edc.spi.system.ServiceExtensionContext; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +class ConfigUtilTest { + + private static final String CONFIG = "tx.edc.test.config"; + private static final String CONFIG_DEPRECATED = "tx.edc.test.config.deprecated"; + private final ServiceExtensionContext context = mock(ServiceExtensionContext.class); + + @Test + void missingProperty_shouldThrowException() { + assertThatThrownBy(() -> ConfigUtil.missingMandatoryProperty(mock(), "foo")) + .isInstanceOf(EdcException.class) + .hasMessage("Mandatory config value missing: 'foo'. This runtime is not operational."); + } + + @Test + void propertyCompatibility_whenConfigExists_shouldReturnValue() { + when(context.getSetting(eq(CONFIG), isNull())).thenReturn("some-val"); + assertThat(ConfigUtil.propertyCompatibility(context, CONFIG, CONFIG_DEPRECATED, "default-value")) + .isEqualTo("some-val"); + + verify(context).getSetting(eq(CONFIG), isNull()); + verifyNoMoreInteractions(context); + } + + @Test + void propertyCompatibility_whenDeprecatedConfigExists_shouldReturnOldValue() { + when(context.getSetting(eq(CONFIG_DEPRECATED), isNull())).thenReturn("some-val"); + var monitorMock = mock(Monitor.class); + when(context.getMonitor()).thenReturn(monitorMock); + + assertThat(ConfigUtil.propertyCompatibility(context, CONFIG, CONFIG_DEPRECATED, "default-value")).isEqualTo("some-val"); + + verify(context).getSetting(eq(CONFIG), isNull()); + verify(context).getSetting(eq(CONFIG_DEPRECATED), isNull()); + verify(monitorMock).warning(anyString()); + } + + @Test + void propertyCompatibility_whenBothConfigsExists_shouldReturnNewValue() { + when(context.getSetting(eq(CONFIG), isNull())).thenReturn("some-val"); + when(context.getSetting(eq(CONFIG_DEPRECATED), isNull())).thenReturn("some-old-val"); + + assertThat(ConfigUtil.propertyCompatibility(context, CONFIG, CONFIG_DEPRECATED, "default-value")).isEqualTo("some-val"); + + verify(context).getSetting(eq(CONFIG), isNull()); + verifyNoMoreInteractions(context); + } + + @Test + void propertyCompatibility_whenNoConfigsExists_shouldReturnDefaultValue() { + assertThat(ConfigUtil.propertyCompatibility(context, CONFIG, CONFIG_DEPRECATED, "default-value")).isEqualTo("default-value"); + + verify(context).getSetting(eq(CONFIG), isNull()); + verify(context).getSetting(eq(CONFIG_DEPRECATED), isNull()); + verifyNoMoreInteractions(context); + } +} \ No newline at end of file diff --git a/edc-controlplane/edc-runtime-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts index b3b9dc9a4..fb20ab45c 100644 --- a/edc-controlplane/edc-runtime-memory/build.gradle.kts +++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts @@ -24,6 +24,7 @@ plugins { } dependencies { + implementation(project(":core:core-utils")) implementation(libs.edc.spi.core) runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java index 3a429d272..995bc5206 100644 --- a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java +++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java @@ -27,15 +27,18 @@ import org.eclipse.edc.spi.security.Vault; import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; +import org.eclipse.tractusx.edc.core.utils.ConfigUtil; import java.util.stream.Stream; -@Extension(value = "Vault seed extension: adds secrets to the vault", categories = {"vault", "security"}) +@Extension(value = "Vault seed extension: adds secrets to the vault", categories = { "vault", "security" }) @BaseExtension public class VaultSeedExtension implements ServiceExtension { @Setting(value = "Secrets with which the vault gets initially populated. Specify as comma-separated list of key:secret pairs.") - public static final String VAULT_MEMORY_SECRETS_PROPERTY = "edc.vault.secrets"; + public static final String VAULT_MEMORY_SECRETS_PROPERTY = "tx.edc.vault.secrets"; + @Deprecated(since = "0.7.1") + public static final String VAULT_MEMORY_SECRETS_PROPERTY_DEPRECATED = "edc.vault.secrets"; public static final String NAME = "Vault Seed Extension"; @Inject @@ -48,7 +51,7 @@ public String name() { @Provider public Vault createInMemVault(ServiceExtensionContext context) { - var seedSecrets = context.getSetting(VAULT_MEMORY_SECRETS_PROPERTY, null); + var seedSecrets = ConfigUtil.propertyCompatibility(context, VAULT_MEMORY_SECRETS_PROPERTY, VAULT_MEMORY_SECRETS_PROPERTY_DEPRECATED, (String) null); if (seedSecrets != null) { Stream.of(seedSecrets.split(";")) .filter(pair -> pair.contains(":")) diff --git a/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java b/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java index 94e6ed7b6..ce095d97f 100644 --- a/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java +++ b/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java @@ -35,7 +35,8 @@ import java.util.function.Supplier; -import static org.eclipse.tractusx.edc.core.utils.RequiredConfigWarnings.missingMandatoryProperty; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.missingMandatoryProperty; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility; import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.NAME; @Extension(value = NAME) @@ -44,13 +45,19 @@ public class BdrsClientExtension implements ServiceExtension { public static final int DEFAULT_BDRS_CACHE_VALIDITY = 15 * 60; // 15 minutes @Setting(value = "Base URL of the BDRS service", required = true) - public static final String BDRS_SERVER_URL_PROPERTY = "tx.iam.iatp.bdrs.server.url"; + public static final String BDRS_SERVER_URL_PROPERTY = "tx.edc.iam.iatp.bdrs.server.url"; + @Deprecated(since = "0.7.1") + public static final String BDRS_SERVER_URL_PROPERTY_DEPRECATED = "tx.iam.iatp.bdrs.server.url"; @Setting(value = "Base URL of the CredentialService, that belongs to this connector runtime. If not specified, the URL is resolved from this participant's DID document.") - public static final String CREDENTIAL_SERVICE_BASE_URL_PROPERTY = "tx.iam.iatp.credentialservice.url"; + public static final String CREDENTIAL_SERVICE_BASE_URL_PROPERTY = "tx.edc.iam.iatp.credentialservice.url"; + @Deprecated(since = "0.7.1") + public static final String CREDENTIAL_SERVICE_BASE_URL_PROPERTY_DEPRECATED = "tx.iam.iatp.credentialservice.url"; @Setting(value = "Validity period in seconds for the cached BPN/DID mappings. After this period a new resolution request will hit the server.", defaultValue = DEFAULT_BDRS_CACHE_VALIDITY + "") - public static final String BDRS_SERVER_CACHE_VALIDITY_PERIOD = "tx.iam.iatp.bdrs.cache.validity"; + public static final String BDRS_SERVER_CACHE_VALIDITY_PERIOD = "tx.edc.iam.iatp.bdrs.cache.validity"; + @Deprecated(since = "0.7.1") + public static final String BDRS_SERVER_CACHE_VALIDITY_PERIOD_DEPRECATED = "tx.iam.iatp.bdrs.cache.validity"; // this setting is already defined in IdentityAndTrustExtension public static final String CONNECTOR_DID_PROPERTY = "edc.iam.issuer.id"; @@ -77,12 +84,9 @@ public String name() { @Provider public BdrsClient getBdrsClient(ServiceExtensionContext context) { - var baseUrl = context.getConfig().getString(BDRS_SERVER_URL_PROPERTY, null); + var baseUrl = propertyCompatibility(context, BDRS_SERVER_URL_PROPERTY, BDRS_SERVER_URL_PROPERTY_DEPRECATED); var monitor = context.getMonitor(); - if (baseUrl == null) { - missingMandatoryProperty(monitor, BDRS_SERVER_URL_PROPERTY); - } - var cacheValidity = context.getConfig().getInteger(BDRS_SERVER_CACHE_VALIDITY_PERIOD, DEFAULT_BDRS_CACHE_VALIDITY); + var cacheValidity = propertyCompatibility(context, BDRS_SERVER_CACHE_VALIDITY_PERIOD, BDRS_SERVER_CACHE_VALIDITY_PERIOD_DEPRECATED, DEFAULT_BDRS_CACHE_VALIDITY); // get DID var ownDid = context.getConfig().getString(CONNECTOR_DID_PROPERTY, null); @@ -92,7 +96,7 @@ public BdrsClient getBdrsClient(ServiceExtensionContext context) { // get CS URL Supplier urlSupplier; - var configuredUrl = context.getConfig().getString(CREDENTIAL_SERVICE_BASE_URL_PROPERTY, null); + var configuredUrl = propertyCompatibility(context, CREDENTIAL_SERVICE_BASE_URL_PROPERTY, CREDENTIAL_SERVICE_BASE_URL_PROPERTY_DEPRECATED, (String) null); if (configuredUrl != null) { urlSupplier = () -> configuredUrl; } else { diff --git a/edc-extensions/bdrs-client/src/test/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientImplExtensionTest.java b/edc-extensions/bdrs-client/src/test/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientImplExtensionTest.java index ea23a2ad0..dea3dad47 100644 --- a/edc-extensions/bdrs-client/src/test/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientImplExtensionTest.java +++ b/edc-extensions/bdrs-client/src/test/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientImplExtensionTest.java @@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.BDRS_SERVER_URL_PROPERTY; +import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.BDRS_SERVER_URL_PROPERTY_DEPRECATED; import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.CONNECTOR_DID_PROPERTY; import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.CREDENTIAL_SERVICE_BASE_URL_PROPERTY; import static org.mockito.ArgumentMatchers.anyString; @@ -60,8 +61,9 @@ void setup(ServiceExtensionContext context) { } @Test - void createClient_whenUrlMissing_expectLogError(ServiceExtensionContext context, BdrsClientExtension extension) { + void createClient_whenUrlMissing_expectException(ServiceExtensionContext context, BdrsClientExtension extension) { var cfg = mock(Config.class); + when(cfg.getString(eq(BDRS_SERVER_URL_PROPERTY_DEPRECATED))).thenThrow(new EdcException(BDRS_SERVER_URL_PROPERTY)); when(context.getConfig()).thenReturn(cfg); when(cfg.getString(eq(BDRS_SERVER_URL_PROPERTY), isNull())).thenReturn(null); when(cfg.getString(eq(CONNECTOR_DID_PROPERTY), isNull())).thenReturn("did:web:self"); @@ -82,7 +84,7 @@ void createClient_whenNoCredentialServiceUrl_shouldInvokeResolver(ServiceExtensi extension.getBdrsClient(context); - verify(monitor).warning("No config value found for 'tx.iam.iatp.credentialservice.url'. As a fallback, the credentialService URL from this connector's DID document will be resolved."); + verify(monitor).warning("No config value found for 'tx.edc.iam.iatp.credentialservice.url'. As a fallback, the credentialService URL from this connector's DID document will be resolved."); verifyNoMoreInteractions(monitor); } @@ -97,7 +99,7 @@ void createClient_whenResolverFails_expectLogError(ServiceExtensionContext conte var client = extension.getBdrsClient(context); - verify(monitor).warning("No config value found for 'tx.iam.iatp.credentialservice.url'. As a fallback, the credentialService URL from this connector's DID document will be resolved."); + verify(monitor).warning("No config value found for 'tx.edc.iam.iatp.credentialservice.url'. As a fallback, the credentialService URL from this connector's DID document will be resolved."); // the DID url resolver is only invoked on-demand, so no eager-loading of the DID document verify(monitor, never()).severe("Resolving the credentialService URL failed. This runtime won't be able to communicate with BDRS. Error: test failure."); diff --git a/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/build.gradle.kts b/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/build.gradle.kts index 53845bed9..29cf8af8f 100644 --- a/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/build.gradle.kts +++ b/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/build.gradle.kts @@ -24,6 +24,9 @@ plugins { dependencies { + implementation(project(":core:core-utils")) + implementation(project(":spi:edr-spi")) + implementation(libs.jakarta.rsApi) implementation(libs.edc.spi.http) @@ -34,7 +37,6 @@ dependencies { implementation(libs.edc.spi.auth) implementation(libs.edc.spi.edrstore) - implementation(project(":spi:edr-spi")) testImplementation(libs.edc.junit) testImplementation(testFixtures(libs.edc.core.jersey)) diff --git a/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java b/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java index 39ee2fe18..43af0b59f 100644 --- a/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java +++ b/edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java @@ -39,6 +39,7 @@ import java.util.concurrent.ExecutorService; import static java.util.concurrent.Executors.newFixedThreadPool; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility; /** * Instantiates the Proxy Data API for the consumer-side data plane. @@ -52,9 +53,13 @@ public class DataPlaneProxyConsumerApiExtension implements ServiceExtension { private static final String CONSUMER_CONTEXT_PATH = "/proxy"; private static final String CONSUMER_CONFIG_KEY = "web.http.proxy"; @Setting(value = "Data plane proxy API consumer port", type = "int") - private static final String CONSUMER_PORT = "tx.dpf.consumer.proxy.port"; + private static final String CONSUMER_PORT = "tx.edc.dpf.consumer.proxy.port"; + @Deprecated(since = "0.7.1") + private static final String CONSUMER_PORT_DEPRECATED = "tx.dpf.consumer.proxy.port"; @Setting(value = "Thread pool size for the consumer data plane proxy gateway", type = "int") - private static final String THREAD_POOL_SIZE = "tx.dpf.consumer.proxy.thread.pool"; + private static final String THREAD_POOL_SIZE = "tx.edc.dpf.consumer.proxy.thread.pool"; + @Deprecated(since = "0.7.1") + private static final String THREAD_POOL_SIZE_DEPRECATED = "tx.dpf.consumer.proxy.thread.pool"; @Inject private WebService webService; @@ -85,10 +90,12 @@ public String name() { @Override public void initialize(ServiceExtensionContext context) { - var port = context.getSetting(CONSUMER_PORT, DEFAULT_PROXY_PORT); + var port = propertyCompatibility(context, CONSUMER_PORT, CONSUMER_PORT_DEPRECATED, DEFAULT_PROXY_PORT); + configurer.configure(context, webServer, createApiContext(port)); - executorService = newFixedThreadPool(context.getSetting(THREAD_POOL_SIZE, DEFAULT_THREAD_POOL)); + var poolSize = propertyCompatibility(context, THREAD_POOL_SIZE, THREAD_POOL_SIZE_DEPRECATED, DEFAULT_THREAD_POOL); + executorService = newFixedThreadPool(poolSize); webService.registerResource(CONSUMER_API_ALIAS, new AuthenticationRequestFilter(authenticationService)); webService.registerResource(CONSUMER_API_ALIAS, new ClientErrorExceptionMapper()); diff --git a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java index 1a202356f..4754d07e5 100644 --- a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java +++ b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java @@ -43,7 +43,8 @@ import java.time.Clock; import java.util.function.Supplier; -import static org.eclipse.tractusx.edc.core.utils.RequiredConfigWarnings.missingMandatoryProperty; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.missingMandatoryProperty; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility; import static org.eclipse.tractusx.edc.dataplane.tokenrefresh.core.DataPlaneTokenRefreshServiceExtension.NAME; @Extension(value = NAME) @@ -52,15 +53,29 @@ public class DataPlaneTokenRefreshServiceExtension implements ServiceExtension { public static final int DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS = 5; public static final long DEFAULT_TOKEN_EXPIRY_SECONDS = 300L; @Setting(value = "Token expiry tolerance period in seconds to allow for clock skew", defaultValue = "" + DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS) - public static final String TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY = "edc.dataplane.token.expiry.tolerance"; + public static final String TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY = "tx.edc.dataplane.token.expiry.tolerance"; + @Deprecated(since = "0.7.1") + public static final String TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY_DEPRECATED = "edc.dataplane.token.expiry.tolerance"; + @Setting(value = "The HTTP endpoint where clients can request a renewal of their access token for the public dataplane API") - public static final String REFRESH_ENDPOINT_PROPERTY = "edc.dataplane.token.refresh.endpoint"; + public static final String REFRESH_ENDPOINT_PROPERTY = "tx.edc.dataplane.token.refresh.endpoint"; + @Deprecated(since = "0.7.1") + public static final String REFRESH_ENDPOINT_PROPERTY_DEPRECATED = "edc.dataplane.token.refresh.endpoint"; + @Setting(value = "Alias of private key used for signing tokens, retrieved from private key resolver") - public static final String TOKEN_SIGNER_PRIVATE_KEY_ALIAS = "edc.transfer.proxy.token.signer.privatekey.alias"; + public static final String TOKEN_SIGNER_PRIVATE_KEY_ALIAS = "tx.edc.transfer.proxy.token.signer.privatekey.alias"; + @Deprecated(since = "0.7.1") + public static final String TOKEN_SIGNER_PRIVATE_KEY_ALIAS_DEPRECATED = "edc.transfer.proxy.token.signer.privatekey.alias"; + @Setting(value = "Alias of public key used for verifying the tokens, retrieved from the vault") - public static final String TOKEN_VERIFIER_PUBLIC_KEY_ALIAS = "edc.transfer.proxy.token.verifier.publickey.alias"; + public static final String TOKEN_VERIFIER_PUBLIC_KEY_ALIAS = "tx.edc.transfer.proxy.token.verifier.publickey.alias"; + @Deprecated(since = "0.7.1") + public static final String TOKEN_VERIFIER_PUBLIC_KEY_ALIAS_DEPRECATED = "edc.transfer.proxy.token.verifier.publickey.alias"; + @Setting(value = "Expiry time of access token in seconds", defaultValue = DEFAULT_TOKEN_EXPIRY_SECONDS + "") - public static final String TOKEN_EXPIRY_SECONDS_PROPERTY = "edc.dataplane.token.expiry"; + public static final String TOKEN_EXPIRY_SECONDS_PROPERTY = "tx.edc.dataplane.token.expiry"; + @Deprecated(since = "0.7.1") + public static final String TOKEN_EXPIRY_SECONDS_PROPERTY_DEPRECATED = "edc.dataplane.token.expiry"; @Setting(value = "DID of this connector", required = true) private static final String PARTICIPANT_DID_PROPERTY = "edc.iam.issuer.id"; @@ -104,7 +119,7 @@ public DataPlaneTokenRefreshService createRefreshTokenService(ServiceExtensionCo } private int getExpiryToleranceConfig(ServiceExtensionContext context) { - return context.getConfig().getInteger(TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY, DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS); + return propertyCompatibility(context, TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY, TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY_DEPRECATED, DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS); } @NotNull @@ -118,17 +133,17 @@ private DataPlaneTokenRefreshServiceImpl getTokenRefreshService(ServiceExtension monitor.debug("Token refresh time tolerance: %d s".formatted(expiryTolerance)); tokenRefreshService = new DataPlaneTokenRefreshServiceImpl(clock, tokenValidationService, didPkResolver, localPublicKeyService, accessTokenDataStore, new JwtGenerationService(), getPrivateKeySupplier(context), context.getMonitor(), refreshEndpoint, getOwnDid(context), expiryTolerance, tokenExpiry, - () -> context.getConfig().getString(TOKEN_VERIFIER_PUBLIC_KEY_ALIAS), vault, typeManager.getMapper()); + () -> propertyCompatibility(context, TOKEN_VERIFIER_PUBLIC_KEY_ALIAS, TOKEN_VERIFIER_PUBLIC_KEY_ALIAS_DEPRECATED), vault, typeManager.getMapper()); } return tokenRefreshService; } private Long getExpiryConfig(ServiceExtensionContext context) { - return context.getConfig().getLong(TOKEN_EXPIRY_SECONDS_PROPERTY, DEFAULT_TOKEN_EXPIRY_SECONDS); + return propertyCompatibility(context, TOKEN_EXPIRY_SECONDS_PROPERTY, TOKEN_EXPIRY_SECONDS_PROPERTY_DEPRECATED, DEFAULT_TOKEN_EXPIRY_SECONDS); } private String getRefreshEndpointConfig(ServiceExtensionContext context, Monitor monitor) { - var refreshEndpoint = context.getConfig().getString(REFRESH_ENDPOINT_PROPERTY, null); + var refreshEndpoint = propertyCompatibility(context, REFRESH_ENDPOINT_PROPERTY, REFRESH_ENDPOINT_PROPERTY_DEPRECATED, null); if (refreshEndpoint == null) { var port = context.getConfig().getInteger("web.http.public.port", 8185); var path = context.getConfig().getString("web.http.public.path", "/api/v2/public"); @@ -149,7 +164,7 @@ private String getOwnDid(ServiceExtensionContext context) { @NotNull private Supplier getPrivateKeySupplier(ServiceExtensionContext context) { return () -> { - var alias = context.getConfig().getString(TOKEN_SIGNER_PRIVATE_KEY_ALIAS); + var alias = propertyCompatibility(context, TOKEN_SIGNER_PRIVATE_KEY_ALIAS, TOKEN_SIGNER_PRIVATE_KEY_ALIAS_DEPRECATED); return privateKeyResolver.resolvePrivateKey(alias) .orElse(f -> { context.getMonitor().warning("Cannot resolve private key: " + f.getFailureDetail()); diff --git a/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceExtension.java b/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceExtension.java index 6f8eac970..678e1f8d9 100644 --- a/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceExtension.java +++ b/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceExtension.java @@ -29,17 +29,18 @@ import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.edc.spi.types.TypeManager; -import org.eclipse.tractusx.edc.core.utils.PathUtils; import org.eclipse.tractusx.edc.iam.iatp.sts.dim.oauth.DimOauth2Client; -import static java.util.Optional.ofNullable; -import static org.eclipse.tractusx.edc.core.utils.RequiredConfigWarnings.missingMandatoryProperty; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility; +import static org.eclipse.tractusx.edc.core.utils.PathUtils.removeTrailingSlash; @Extension(DimSecureTokenServiceExtension.NAME) public class DimSecureTokenServiceExtension implements ServiceExtension { @Setting(value = "STS Dim endpoint") - public static final String DIM_URL = "edc.iam.sts.dim.url"; + public static final String DIM_URL = "tx.edc.iam.sts.dim.url"; + @Deprecated(since = "0.7.1") + public static final String DIM_URL_DEPRECATED = "edc.iam.sts.dim.url"; protected static final String NAME = "DIM Secure token service extension"; @Inject @@ -65,14 +66,7 @@ public String name() { @Provider public SecureTokenService secureTokenService(ServiceExtensionContext context) { - var dimUrl = ofNullable(context.getConfig().getString(DIM_URL, null)) - .map(PathUtils::removeTrailingSlash) - .orElse(null); - - if (dimUrl == null) { - missingMandatoryProperty(context.getMonitor().withPrefix("STS Client for DIM"), DIM_URL); - } - + var dimUrl = removeTrailingSlash(propertyCompatibility(context, DIM_URL, DIM_URL_DEPRECATED)); return new DimSecureTokenService(httpClient, dimUrl, dimOauth2Client, typeManager.getMapper(), monitor); } } \ No newline at end of file diff --git a/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java b/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java index b3dc2a6a6..ba17b9b45 100644 --- a/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java +++ b/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java @@ -27,7 +27,7 @@ import org.eclipse.tractusx.edc.core.utils.PathUtils; import static java.util.Optional.ofNullable; -import static org.eclipse.tractusx.edc.core.utils.RequiredConfigWarnings.missingMandatoryProperty; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.missingMandatoryProperty; /** * Configuration Extension for the STS OAuth2 client @@ -70,7 +70,6 @@ public StsRemoteClientConfiguration clientConfiguration(ServiceExtensionContext if (clientSecretAlias == null) { missingMandatoryProperty(monitor, CLIENT_SECRET_ALIAS); } - return new StsRemoteClientConfiguration(tokenUrl, clientId, clientSecretAlias); } diff --git a/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimOauthClientExtensionTest.java b/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimOauthClientExtensionTest.java index 0c366f52d..2d394c9ad 100644 --- a/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimOauthClientExtensionTest.java +++ b/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimOauthClientExtensionTest.java @@ -20,9 +20,7 @@ package org.eclipse.tractusx.edc.iam.iatp.sts.dim; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; -import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.tractusx.edc.iam.iatp.sts.dim.oauth.DimOauthClientImpl; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,15 +29,8 @@ @ExtendWith(DependencyInjectionExtension.class) public class DimOauthClientExtensionTest { - @BeforeEach - void setup(ServiceExtensionContext context) { - - } - @Test void initialize(DimOauthClientExtension extension) { assertThat(extension.oauth2Client()).isInstanceOf(DimOauthClientImpl.class); } - - } diff --git a/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureServiceExtensionTest.java b/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureServiceExtensionTest.java index 12f5f16e8..15e7bd314 100644 --- a/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureServiceExtensionTest.java +++ b/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureServiceExtensionTest.java @@ -53,7 +53,7 @@ void initialize_shouldNotThrow_whenUrlIsMissing(ServiceExtensionContext context, assertThatThrownBy(() -> extension.secureTokenService(context)) .isInstanceOf(EdcException.class) - .hasMessage("Mandatory config value missing: 'edc.iam.sts.dim.url'. This runtime is not operational."); + .hasMessage("No setting found for key edc.iam.sts.dim.url"); } } diff --git a/edc-extensions/iatp/tx-iatp/src/main/java/org/eclipse/tractusx/edc/iam/iatp/IatpDefaultScopeExtension.java b/edc-extensions/iatp/tx-iatp/src/main/java/org/eclipse/tractusx/edc/iam/iatp/IatpDefaultScopeExtension.java index a4310231f..68551adc4 100644 --- a/edc-extensions/iatp/tx-iatp/src/main/java/org/eclipse/tractusx/edc/iam/iatp/IatpDefaultScopeExtension.java +++ b/edc-extensions/iatp/tx-iatp/src/main/java/org/eclipse/tractusx/edc/iam/iatp/IatpDefaultScopeExtension.java @@ -39,7 +39,7 @@ @Extension(NAME) public class IatpDefaultScopeExtension implements ServiceExtension { - public static final String TX_IATP_DEFAULT_SCOPE_PREFIX = "edc.iam.iatp.default-scopes"; + public static final String TX_IATP_DEFAULT_SCOPE_PREFIX = "tx.edc.iam.iatp.default-scopes"; public static final String TX_IATP_DEFAULT_SCOPE_PREFIX_CONFIG_ALIAS = TX_IATP_DEFAULT_SCOPE_PREFIX + ".."; diff --git a/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts b/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts index ed6ad7469..1a4b8e044 100644 --- a/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts +++ b/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts @@ -23,6 +23,7 @@ plugins { } dependencies { + implementation(project(":core:core-utils")) implementation(libs.edc.spi.core) implementation(libs.edc.junit) implementation(libs.edc.spi.transaction.datasource) diff --git a/edc-extensions/migrations/postgresql-migration-lib/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java b/edc-extensions/migrations/postgresql-migration-lib/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java index 20ca7979f..e06c59c31 100644 --- a/edc-extensions/migrations/postgresql-migration-lib/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java +++ b/edc-extensions/migrations/postgresql-migration-lib/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java @@ -26,6 +26,7 @@ import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.edc.sql.DriverManagerConnectionFactory; import org.eclipse.edc.sql.datasource.ConnectionFactoryDataSource; +import org.eclipse.tractusx.edc.core.utils.ConfigUtil; import java.util.Objects; import java.util.Properties; @@ -38,7 +39,9 @@ abstract class AbstractPostgresqlMigrationExtension implements ServiceExtension private static final String DEFAULT_MIGRATION_ENABLED_TEMPLATE = "true"; @Setting(value = "Enable/disables subsystem schema migration", defaultValue = DEFAULT_MIGRATION_ENABLED_TEMPLATE, type = "boolean") - private static final String MIGRATION_ENABLED_TEMPLATE = "org.eclipse.tractusx.edc.postgresql.migration.%s.enabled"; + private static final String MIGRATION_ENABLED_TEMPLATE = "tx.edc.postgresql.migration.%s.enabled"; + @Deprecated(since = "0.7.1") + private static final String MIGRATION_ENABLED_TEMPLATE_DEPRECATED = "org.eclipse.tractusx.edc.postgresql.migration.%s.enabled"; private static final String DEFAULT_MIGRATION_SCHEMA = "public"; @Setting(value = "Schema used for the migration", defaultValue = DEFAULT_MIGRATION_SCHEMA) @@ -56,6 +59,7 @@ public void initialize(final ServiceExtensionContext context) { var subSystemName = Objects.requireNonNull(getSubsystemName()); var enabled = config.getBoolean(MIGRATION_ENABLED_TEMPLATE.formatted(subSystemName), Boolean.valueOf(DEFAULT_MIGRATION_ENABLED_TEMPLATE)); + ConfigUtil.propertyCompatibility(context, MIGRATION_ENABLED_TEMPLATE.formatted(subSystemName), MIGRATION_ENABLED_TEMPLATE_DEPRECATED.formatted(subSystemName), Boolean.valueOf(DEFAULT_MIGRATION_ENABLED_TEMPLATE)); if (!enabled) { return; } diff --git a/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java b/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java index a7a29598a..f1c2b3d85 100644 --- a/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java +++ b/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java @@ -28,7 +28,7 @@ import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.edc.spi.types.TypeManager; -import org.eclipse.tractusx.edc.core.utils.RequiredConfigWarnings; +import org.eclipse.tractusx.edc.core.utils.ConfigUtil; import org.eclipse.tractusx.edc.spi.tokenrefresh.common.TokenRefreshHandler; import static org.eclipse.tractusx.edc.common.tokenrefresh.TokenRefreshHandlerExtension.NAME; @@ -61,7 +61,7 @@ public TokenRefreshHandler createTokenRefreshHander(ServiceExtensionContext cont private String getOwnDid(ServiceExtensionContext context) { var did = context.getConfig().getString(PARTICIPANT_DID_PROPERTY, null); if (did == null) { - RequiredConfigWarnings.missingMandatoryProperty(context.getMonitor().withPrefix("Token Refresh Handler"), PARTICIPANT_DID_PROPERTY); + ConfigUtil.missingMandatoryProperty(context.getMonitor().withPrefix("Token Refresh Handler"), PARTICIPANT_DID_PROPERTY); } return did; } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java index e521753a6..6cdcd7f55 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java @@ -39,7 +39,7 @@ public class DimParticipant extends TractusxIatpParticipantBase { public Map iatpConfiguration(TractusxIatpParticipantBase... others) { var config = new HashMap<>(super.iatpConfiguration(others)); config.put("edc.iam.sts.dim.url", dimUri.toString()); - config.put("tx.iam.iatp.bdrs.server.url", bdrsUri.toString()); + config.put("tx.edc.iam.iatp.bdrs.server.url", bdrsUri.toString()); config.put("edc.transfer.proxy.token.verifier.publickey.alias", getKeyId()); return config; } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java index 462ec1738..69dfaf4d0 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java @@ -54,7 +54,7 @@ public Map iatpConfiguration(TractusxIatpParticipantBase... othe }; Stream.concat(Stream.of(this), Arrays.stream(others)).forEach(p -> { - var prefix = "tx.iam.iatp.audiences.%s".formatted(p.getName().toLowerCase()); + var prefix = "tx.edc.iam.iatp.audiences.%s".formatted(p.getName().toLowerCase()); iatpConfiguration.put("%s.from".formatted(prefix), p.getBpn()); iatpConfiguration.put("%s.to".formatted(prefix), p.getDid()); }); diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java index c6f2957a3..1ffe39b8b 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java @@ -118,7 +118,7 @@ public Map getConfiguration() { put("edc.iam.sts.oauth.client.id", "test-clientid"); put("edc.iam.sts.oauth.client.secret.alias", "test-clientid-alias"); put("edc.iam.sts.dim.url", "http://sts.example.com"); - put("tx.iam.iatp.bdrs.server.url", "http://sts.example.com"); + put("tx.edc.iam.iatp.bdrs.server.url", "http://sts.example.com"); put("edc.dataplane.api.public.baseurl", "http://localhost:%d/api/public/v2/data".formatted(dataPlanePublic.getPort())); } }; diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java index 5a48fc5b8..0d4b4121b 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java @@ -50,7 +50,7 @@ public static Map baseConfig(String controlPath, int controlPort put("edc.iam.sts.oauth.client.id", "test-clientid"); put("edc.iam.sts.oauth.client.secret.alias", "test-clientid-alias"); put("edc.iam.sts.dim.url", "http://sts.example.com"); - put("tx.iam.iatp.bdrs.server.url", "http://sts.example.com"); + put("tx.edc.iam.iatp.bdrs.server.url", "http://sts.example.com"); } }; } diff --git a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java index e16b3d57b..1d4134ecd 100644 --- a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java +++ b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java @@ -57,7 +57,7 @@ public Map baseConfig() { put("edc.iam.sts.oauth.client.id", "test-clientid"); put("edc.iam.sts.oauth.client.secret.alias", "test-clientid-alias"); put("edc.iam.sts.dim.url", "http://sts.example.com"); - put("tx.iam.iatp.bdrs.server.url", "http://sts.example.com"); + put("tx.edc.iam.iatp.bdrs.server.url", "http://sts.example.com"); } }; } diff --git a/edc-tests/runtime/extensions/build.gradle.kts b/edc-tests/runtime/extensions/build.gradle.kts index be04ee59e..585e84076 100644 --- a/edc-tests/runtime/extensions/build.gradle.kts +++ b/edc-tests/runtime/extensions/build.gradle.kts @@ -23,7 +23,7 @@ plugins { dependencies { - + implementation(project(":core:core-utils")) implementation(libs.edc.core.controlplane) implementation(libs.edc.lib.util) implementation(libs.edc.spi.web) diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java index 61b5b4b4e..038fb4709 100644 --- a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java +++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java @@ -28,17 +28,21 @@ import java.util.stream.Stream; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility; + @BaseExtension public class VaultSeedExtension implements ServiceExtension { @Setting - private static final String TX_VAULT_SEED = "tx.vault.seed.secrets"; + private static final String TX_VAULT_SEED = "tx.edc.vault.seed.secrets"; + @Deprecated(since = "0.7.1") + private static final String TX_VAULT_SEED_DEPRECATED = "tx.vault.seed.secrets"; @Inject private Vault vault; @Override public void initialize(ServiceExtensionContext context) { - var seedSecrets = context.getSetting(TX_VAULT_SEED, null); + var seedSecrets = propertyCompatibility(context, TX_VAULT_SEED, TX_VAULT_SEED_DEPRECATED, null); if (seedSecrets != null) { Stream.of(seedSecrets.split(";")) .filter(pair -> pair.contains(":")) diff --git a/edc-tests/runtime/iatp/iatp-extensions/src/main/java/org/eclipse/tractusx/edc/iatp/TestAudienceMapperExtension.java b/edc-tests/runtime/iatp/iatp-extensions/src/main/java/org/eclipse/tractusx/edc/iatp/TestAudienceMapperExtension.java index c2f7268ee..038207639 100644 --- a/edc-tests/runtime/iatp/iatp-extensions/src/main/java/org/eclipse/tractusx/edc/iatp/TestAudienceMapperExtension.java +++ b/edc-tests/runtime/iatp/iatp-extensions/src/main/java/org/eclipse/tractusx/edc/iatp/TestAudienceMapperExtension.java @@ -32,7 +32,7 @@ public class TestAudienceMapperExtension implements ServiceExtension { @Setting - private static final String TX_IATP_AUDIENCES = "tx.iam.iatp.audiences"; + private static final String TX_IATP_AUDIENCES = "tx.edc.iam.iatp.audiences"; @Provider public AudienceResolver audienceResolver(ServiceExtensionContext context) { diff --git a/samples/edc-dast/edc-dast-runtime/configuration.properties b/samples/edc-dast/edc-dast-runtime/configuration.properties index 1e22ee6e7..0c884464b 100644 --- a/samples/edc-dast/edc-dast-runtime/configuration.properties +++ b/samples/edc-dast/edc-dast-runtime/configuration.properties @@ -20,5 +20,5 @@ web.http.default.path=/api web.http.sts.port=8990 web.http.sts.path=/v1/sts edc.api.auth.key=password -tx.iam.iatp.bdrs.server.url=http://localhost:8081 +tx.edc.iam.iatp.bdrs.server.url=http://localhost:8081 tx.vault.seed.secrets=client_secret_alias:secret \ No newline at end of file diff --git a/samples/multi-tenancy/src/test/resources/tenants.properties b/samples/multi-tenancy/src/test/resources/tenants.properties index eca9d0dec..4e072948a 100644 --- a/samples/multi-tenancy/src/test/resources/tenants.properties +++ b/samples/multi-tenancy/src/test/resources/tenants.properties @@ -22,12 +22,12 @@ edc.tenants.one.web.http.port=18181 edc.tenants.one.web.http.path=/api edc.tenants.one.web.http.protocol.port=18282 edc.tenants.one.web.http.protocol.path=/protocol -edc.tenants.one.tx.iam.iatp.bdrs.server.url=http://bdrs.test.com +edc.tenants.one.tx.edc.iam.iatp.bdrs.server.url=http://bdrs.test.com edc.tenants.one.edc.iam.issuer.id=did:web:tenant1 edc.tenants.two.edc.any=any edc.tenants.two.web.http.port=28181 edc.tenants.two.web.http.path=/api edc.tenants.two.web.http.protocol.port=28282 edc.tenants.two.web.http.protocol.path=/protocol -edc.tenants.two.tx.iam.iatp.bdrs.server.url=http://bdrs.test.com +edc.tenants.two.tx.edc.iam.iatp.bdrs.server.url=http://bdrs.test.com edc.tenants.two.edc.iam.issuer.id=did:web:tenant2 From 6a27157d2ef249009fa10d66482ca5e9cfa7e2b1 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Tue, 14 May 2024 16:23:09 +0200 Subject: [PATCH 24/37] chore(deps): bump EDC to 0.6.4 (#1308) --- DEPENDENCIES | 488 ++++++++---------- .../build.gradle.kts | 2 +- .../runtime-memory-iatp-ih/build.gradle.kts | 3 +- gradle/libs.versions.toml | 6 +- 4 files changed, 235 insertions(+), 264 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index ffca73539..63a0c26c9 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -27,50 +27,42 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.0, Apache-2.0, approved, #5303 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.1, Apache-2.0, approved, #5303 -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.1, Apache-2.0, approved, #7947 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.0, Apache-2.0, approved, #13672 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.1, Apache-2.0, approved, #13672 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.1, Apache-2.0 AND MIT, approved, #4303 -maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.1, MIT AND Apache-2.0, approved, #7932 -maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.0, , approved, #13665 +maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.16.2, Apache-2.0 AND MIT, approved, #11602 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.1, , approved, #13665 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.11.0, Apache-2.0, approved, CQ23093 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.0, approved, #2134 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.0, Apache-2.0, approved, #4105 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.1, Apache-2.0, approved, #4105 -maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105 -maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.1, Apache-2.0, approved, #7934 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.2, Apache-2.0, approved, #11605 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.0, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.15.2, Apache-2.0, approved, #9160 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.17.0, Apache-2.0, approved, #14192 +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.17.1, Apache-2.0, approved, #14192 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.13.5, Apache-2.0, approved, #3768 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.17.0, Apache-2.0, approved, #13666 +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.17.1, Apache-2.0, approved, #13666 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.0, Apache-2.0, approved, #5933 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.1, 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.dataformat/jackson-dataformat-yaml/2.17.0, Apache-2.0, approved, #13669 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.0, Apache-2.0, approved, #14161 +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.1, Apache-2.0, approved, #13669 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.1, 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.16.2, Apache-2.0, approved, #11853 -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.17.0, Apache-2.0, approved, #14194 -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.datatype/jackson-datatype-jsr310/2.17.1, Apache-2.0, approved, #14160 +maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.17.1, Apache-2.0, approved, #14194 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.16.2, Apache-2.0, approved, #11858 -maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.17.0, Apache-2.0, approved, #14195 +maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.17.1, Apache-2.0, approved, #14195 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.0, Apache-2.0, approved, #13668 -maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.1, Apache-2.0, approved, #7929 -maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.0, Apache-2.0, approved, #14162 +maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.1, Apache-2.0, approved, #13668 +maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.1, 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.6.1, Apache-2.0, approved, #12789 +maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.6.2, Apache-2.0, approved, #12789 maven/mavencentral/com.github.cliftonlabs/json-simple/3.0.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-api/3.3.6, Apache-2.0, approved, #10346 maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.6, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #7946 @@ -117,16 +109,16 @@ maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefin maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.28, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.30.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701 +maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.38, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/10.7.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/11.9.1, Apache-2.0, approved, #12667 -maven/mavencentral/com.puppycrawl.tools/checkstyle/10.15.0, LGPL-2.1-or-later, restricted, clearlydefined +maven/mavencentral/com.puppycrawl.tools/checkstyle/10.16.0, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #14689 maven/mavencentral/com.samskivert/jmustache/1.15, BSD-2-Clause, approved, clearlydefined maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159 maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #11156 maven/mavencentral/com.squareup.okhttp3/okhttp/4.9.3, Apache-2.0 AND MPL-2.0, approved, #3225 maven/mavencentral/com.squareup.okio/okio-jvm/3.6.0, Apache-2.0, approved, #11158 maven/mavencentral/com.squareup.okio/okio/3.6.0, Apache-2.0, approved, #11155 -maven/mavencentral/com.sun.activation/jakarta.activation/2.0.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/com.sun.activation/jakarta.activation/2.0.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/com.sun.mail/mailapi/1.6.2, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, clearlydefined maven/mavencentral/com.sun.xml.bind/jaxb-core/4.0.1, BSD-3-Clause, approved, ee4j.jaxb-impl @@ -148,19 +140,16 @@ maven/mavencentral/io.github.classgraph/classgraph/4.8.165, MIT, approved, CQ225 maven/mavencentral/io.micrometer/micrometer-commons/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679 maven/mavencentral/io.micrometer/micrometer-core/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11678 maven/mavencentral/io.micrometer/micrometer-observation/1.12.5, Apache-2.0, approved, #11680 -maven/mavencentral/io.netty/netty-buffer/4.1.100.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-buffer/4.1.101.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-buffer/4.1.107.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-buffer/4.1.108.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-buffer/4.1.86.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-codec-dns/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-dns/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-http/4.1.100.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-http2/4.1.100.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http2/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http2/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-http2/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 @@ -168,12 +157,10 @@ maven/mavencentral/io.netty/netty-codec-http2/4.1.86.Final, Apache-2.0 AND BSD-3 maven/mavencentral/io.netty/netty-codec-socks/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-socks/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec-socks/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec/4.1.100.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-codec/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-common/4.1.100.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 maven/mavencentral/io.netty/netty-common/4.1.101.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 maven/mavencentral/io.netty/netty-common/4.1.107.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 maven/mavencentral/io.netty/netty-common/4.1.108.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 @@ -182,7 +169,6 @@ maven/mavencentral/io.netty/netty-handler-proxy/4.1.101.Final, Apache-2.0 AND BS maven/mavencentral/io.netty/netty-handler-proxy/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-handler-proxy/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-handler-proxy/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-handler/4.1.100.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-handler/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-handler/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-handler/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 @@ -193,7 +179,6 @@ maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.101.Final, Apach maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.107.Final, Apache-2.0, approved, #7004 maven/mavencentral/io.netty/netty-resolver-dns/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-resolver-dns/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-resolver/4.1.100.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-resolver/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-resolver/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-resolver/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 @@ -204,7 +189,6 @@ maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.65.Final, Apache maven/mavencentral/io.netty/netty-tcnative-classes/2.0.56.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/io.netty/netty-tcnative-classes/2.0.62.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/io.netty/netty-tcnative-classes/2.0.65.Final, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.100.Final, Apache-2.0, approved, #6366 maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.101.Final, Apache-2.0, approved, #6366 maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.108.Final, Apache-2.0, approved, #6366 maven/mavencentral/io.netty/netty-transport-classes-kqueue/4.1.101.Final, Apache-2.0, approved, #4107 @@ -218,7 +202,6 @@ maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.101.Final, Ap maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-transport/4.1.100.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-transport/4.1.101.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-transport/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.netty/netty-transport/4.1.108.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 @@ -243,23 +226,18 @@ maven/mavencentral/io.rest-assured/rest-assured-common/5.4.0, Apache-2.0, approv maven/mavencentral/io.rest-assured/rest-assured/5.4.0, Apache-2.0, approved, #12040 maven/mavencentral/io.rest-assured/xml-path/5.4.0, Apache-2.0, approved, #12038 maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.15, Apache-2.0, approved, #5947 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.21, Apache-2.0, approved, #5947 -maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.15, Apache-2.0, approved, #11362 +maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.21, Apache-2.0, approved, #11362 maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.8, Apache-2.0, approved, #11362 -maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.15, Apache-2.0, approved, #5929 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.21, Apache-2.0, approved, #5929 -maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.15, Apache-2.0, approved, #9265 +maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.21, Apache-2.0, approved, #9265 maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.8, Apache-2.0, approved, #9265 -maven/mavencentral/io.swagger.core.v3/swagger-integration-jakarta/2.2.15, Apache-2.0, approved, #11475 maven/mavencentral/io.swagger.core.v3/swagger-integration-jakarta/2.2.21, Apache-2.0, approved, #11475 -maven/mavencentral/io.swagger.core.v3/swagger-integration/2.2.15, Apache-2.0, approved, #10352 -maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2-jakarta/2.2.15, Apache-2.0, approved, #11477 +maven/mavencentral/io.swagger.core.v3/swagger-integration/2.2.21, Apache-2.0, approved, #10352 maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2-jakarta/2.2.21, Apache-2.0, approved, #11477 -maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2/2.2.15, Apache-2.0, approved, #9814 -maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.15, Apache-2.0, approved, #5919 +maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2/2.2.21, Apache-2.0, approved, #9814 maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.21, Apache-2.0, approved, #5919 -maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.15, Apache-2.0, approved, #10353 +maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.21, Apache-2.0, approved, #10353 maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.8, Apache-2.0, approved, #10353 maven/mavencentral/io.swagger.parser.v3/swagger-parser-core/2.1.10, Apache-2.0, approved, #11478 maven/mavencentral/io.swagger.parser.v3/swagger-parser-v2-converter/2.1.10, Apache-2.0, approved, #9330 @@ -270,7 +248,7 @@ maven/mavencentral/io.swagger/swagger-compat-spec-parser/1.0.64, Apache-2.0, app maven/mavencentral/io.swagger/swagger-core/1.6.9, Apache-2.0, approved, #4358 maven/mavencentral/io.swagger/swagger-models/1.6.9, Apache-2.0, approved, #11476 maven/mavencentral/io.swagger/swagger-parser/1.0.64, Apache-2.0, approved, #4359 -maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf +maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.3, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca @@ -282,7 +260,7 @@ maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/4.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.0, BSD-3-Clause, approved, ee4j.jaxb +maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.1, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.2, BSD-3-Clause, approved, ee4j.jaxb @@ -296,7 +274,6 @@ maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.12, Apache-2.0, approved, maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.11, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.12, Apache-2.0 AND BSD-3-Clause, approved, #7163 -maven/mavencentral/net.bytebuddy/byte-buddy/1.14.9, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.java.dev.jna/jna-platform/5.13.0, Apache-2.0 OR LGPL-2.1-or-later, approved, #6707 maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390 maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #6709 @@ -359,187 +336,188 @@ maven/mavencentral/org.codehaus.plexus/plexus-utils/3.1.1, , approved, CQ16492 maven/mavencentral/org.codehaus.plexus/plexus-utils/3.3.0, , approved, CQ21066 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.2, BSD-2-Clause, approved, #2670 maven/mavencentral/org.eclipse.angus/angus-activation/1.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus -maven/mavencentral/org.eclipse.edc/accesstoken-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/accesstokendata-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/api-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/api-observability/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-index-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/auth-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/autodoc-processor/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/aws-s3-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/aws-s3-test/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/azure-blob-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/azure-test/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/callback-static-endpoint/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/connector-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-definition-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-api-configuration/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-catalog/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-contract/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-policies-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-transform/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/core-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/credential-query-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-azure-storage/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-control-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-public-api-v2/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-api-configuration/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-client/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-transform/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-util/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/did-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-http-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-api-configuration/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-version-http-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-index-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-store-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-store-receiver/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-store-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/iam-mock/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-web/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-credentials/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-did/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-keypairs/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-participants/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-store-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-issuers-configuration/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-service/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-client-configuration/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-embedded/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-client/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jetty-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/junit-base/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/junit/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jws2020-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jwt-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jwt-verifiable-credentials/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keypair-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keypair-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keys-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keys-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/ldp-verifiable-credentials/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/management-api-configuration/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/management-api-test-fixtures/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/management-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/micrometer-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/oauth2-client/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/oauth2-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/participant-context-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-definition-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-model/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/presentation-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/query-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-lease/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/state-machine-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/store-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/token-core/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/token-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-local/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-data-plane-signaling/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-process-api/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transform-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transform-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/util-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-data-address-http-data/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/vault-azure/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/vault-hashicorp/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credential-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credentials/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-presentation-lib/0.6.3, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/web-spi/0.6.3, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/accesstoken-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/accesstokendata-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/api-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/api-observability/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-index-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/auth-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/autodoc-processor/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/aws-s3-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/aws-s3-test/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/azure-blob-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/azure-test/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/callback-static-endpoint/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/connector-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-definition-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-api-configuration/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-catalog/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-contract/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-policies-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-transform/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/core-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/credential-query-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-azure-storage/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-control-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-public-api-v2/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-api-configuration/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-client/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-transform/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-util/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/did-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-http-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-api-configuration/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-version-http-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-index-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-store-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-store-receiver/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-store-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/iam-mock/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-did-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-did-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-did-web/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-did/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-keypairs/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-participants/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-store-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-issuers-configuration/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-service/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-client-configuration/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-embedded/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-client/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jetty-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/junit-base/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/junit/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jws2020-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jwt-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jwt-verifiable-credentials/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keypair-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keypair-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keys-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keys-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/ldp-verifiable-credentials/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api-configuration/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api-test-fixtures/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/micrometer-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/oauth2-client/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/oauth2-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/participant-context-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-definition-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-model/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/presentation-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/query-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/secrets-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-lease/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/state-machine-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/store-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/token-core/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/token-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-local/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-data-plane-signaling/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-process-api/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/util-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-data-address-http-data/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/vault-azure/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/vault-hashicorp/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credential-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credentials/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-presentation-lib/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/web-spi/0.6.4, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty @@ -589,7 +567,6 @@ maven/mavencentral/org.jacoco/org.jacoco.ant/0.8.9, EPL-2.0, approved, #1068 maven/mavencentral/org.jacoco/org.jacoco.core/0.8.9, EPL-2.0, approved, CQ23283 maven/mavencentral/org.jacoco/org.jacoco.report/0.8.9, EPL-2.0 AND Apache-2.0, approved, CQ23284 maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327 -maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023 maven/mavencentral/org.javassist/javassist/3.30.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #12108 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.10, Apache-2.0, approved, #14186 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.10, Apache-2.0, approved, #14193 @@ -643,76 +620,69 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.7, MIT, approved, CQ9827 maven/mavencentral/org.slf4j/slf4j-api/2.0.13, MIT, approved, #5915 maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915 maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915 -maven/mavencentral/org.testcontainers/database-commons/1.19.7, Apache-2.0, approved, #10345 maven/mavencentral/org.testcontainers/database-commons/1.19.8, Apache-2.0, approved, #10345 -maven/mavencentral/org.testcontainers/jdbc/1.19.7, Apache-2.0, approved, #10348 maven/mavencentral/org.testcontainers/jdbc/1.19.8, Apache-2.0, approved, #10348 -maven/mavencentral/org.testcontainers/junit-jupiter/1.19.6, MIT, approved, #10344 -maven/mavencentral/org.testcontainers/junit-jupiter/1.19.7, MIT, approved, #10344 maven/mavencentral/org.testcontainers/junit-jupiter/1.19.8, MIT, approved, #10344 -maven/mavencentral/org.testcontainers/postgresql/1.19.7, MIT, approved, #10350 maven/mavencentral/org.testcontainers/postgresql/1.19.8, MIT, approved, #10350 -maven/mavencentral/org.testcontainers/testcontainers/1.19.7, Apache-2.0 AND MIT, approved, #10347 maven/mavencentral/org.testcontainers/testcontainers/1.19.8, Apache-2.0 AND MIT, approved, #10347 maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.xmlunit/xmlunit-placeholders/2.9.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 -maven/mavencentral/software.amazon.awssdk/annotations/2.24.10, Apache-2.0, approved, #13251 +maven/mavencentral/software.amazon.awssdk/annotations/2.25.48, Apache-2.0, approved, #13691 maven/mavencentral/software.amazon.awssdk/annotations/2.25.50, Apache-2.0, approved, #13691 -maven/mavencentral/software.amazon.awssdk/apache-client/2.24.10, Apache-2.0, approved, #13257 +maven/mavencentral/software.amazon.awssdk/apache-client/2.25.48, Apache-2.0, approved, #13687 maven/mavencentral/software.amazon.awssdk/apache-client/2.25.50, Apache-2.0, approved, #13687 -maven/mavencentral/software.amazon.awssdk/arns/2.24.10, Apache-2.0, approved, #13243 +maven/mavencentral/software.amazon.awssdk/arns/2.25.48, Apache-2.0, approved, #13695 maven/mavencentral/software.amazon.awssdk/arns/2.25.50, Apache-2.0, approved, #13695 -maven/mavencentral/software.amazon.awssdk/auth/2.24.10, Apache-2.0, approved, #13256 +maven/mavencentral/software.amazon.awssdk/auth/2.25.48, Apache-2.0, approved, #13692 maven/mavencentral/software.amazon.awssdk/auth/2.25.50, Apache-2.0, approved, #13692 -maven/mavencentral/software.amazon.awssdk/aws-core/2.24.10, Apache-2.0, approved, #13240 +maven/mavencentral/software.amazon.awssdk/aws-core/2.25.48, Apache-2.0, approved, #13702 maven/mavencentral/software.amazon.awssdk/aws-core/2.25.50, Apache-2.0, approved, #13702 -maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.24.10, Apache-2.0, approved, #13262 +maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.48, Apache-2.0, approved, #13701 maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.50, Apache-2.0, approved, #13701 -maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.24.10, Apache-2.0, approved, #13247 +maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.48, Apache-2.0, approved, #13684 maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.50, Apache-2.0, approved, #13684 -maven/mavencentral/software.amazon.awssdk/checksums-spi/2.24.10, Apache-2.0, approved, #13245 +maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.48, Apache-2.0, approved, #13686 maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.50, Apache-2.0, approved, #13686 -maven/mavencentral/software.amazon.awssdk/checksums/2.24.10, Apache-2.0, approved, #13242 +maven/mavencentral/software.amazon.awssdk/checksums/2.25.48, Apache-2.0, approved, #13677 maven/mavencentral/software.amazon.awssdk/checksums/2.25.50, Apache-2.0, approved, #13677 -maven/mavencentral/software.amazon.awssdk/crt-core/2.24.10, Apache-2.0, approved, #13252 +maven/mavencentral/software.amazon.awssdk/crt-core/2.25.48, Apache-2.0, approved, #13705 maven/mavencentral/software.amazon.awssdk/crt-core/2.25.50, Apache-2.0, approved, #13705 -maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.24.10, Apache-2.0, approved, #13246 +maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.48, Apache-2.0, approved, #13681 maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.50, Apache-2.0, approved, #13681 -maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.24.10, Apache-2.0, approved, #13253 +maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.48, Apache-2.0, approved, #13696 maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.50, Apache-2.0, approved, #13696 -maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.24.10, Apache-2.0, approved, #13264 +maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.48, Apache-2.0, approved, #13704 maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.50, Apache-2.0, approved, #13704 -maven/mavencentral/software.amazon.awssdk/http-auth/2.24.10, Apache-2.0, approved, #13248 +maven/mavencentral/software.amazon.awssdk/http-auth/2.25.48, Apache-2.0, approved, #13682 maven/mavencentral/software.amazon.awssdk/http-auth/2.25.50, Apache-2.0, approved, #13682 -maven/mavencentral/software.amazon.awssdk/http-client-spi/2.24.10, Apache-2.0, approved, #13259 +maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.48, Apache-2.0, approved, #13706 maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.50, Apache-2.0, approved, #13706 -maven/mavencentral/software.amazon.awssdk/iam/2.24.10, Apache-2.0, approved, #13444 -maven/mavencentral/software.amazon.awssdk/identity-spi/2.24.10, Apache-2.0, approved, #13244 +maven/mavencentral/software.amazon.awssdk/iam/2.25.48, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.48, Apache-2.0, approved, #13685 maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.50, Apache-2.0, approved, #13685 -maven/mavencentral/software.amazon.awssdk/json-utils/2.24.10, Apache-2.0, approved, #13261 +maven/mavencentral/software.amazon.awssdk/json-utils/2.25.48, Apache-2.0, approved, #13698 maven/mavencentral/software.amazon.awssdk/json-utils/2.25.50, Apache-2.0, approved, #13698 -maven/mavencentral/software.amazon.awssdk/metrics-spi/2.24.10, Apache-2.0, approved, #13239 +maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.48, Apache-2.0, approved, #13680 maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.50, Apache-2.0, approved, #13680 -maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.24.10, Apache-2.0, approved, #13260 +maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.48, Apache-2.0, approved, #13693 maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.50, Apache-2.0, approved, #13693 -maven/mavencentral/software.amazon.awssdk/profiles/2.24.10, Apache-2.0, approved, #13258 +maven/mavencentral/software.amazon.awssdk/profiles/2.25.48, Apache-2.0, approved, #13697 maven/mavencentral/software.amazon.awssdk/profiles/2.25.50, Apache-2.0, approved, #13697 -maven/mavencentral/software.amazon.awssdk/protocol-core/2.24.10, Apache-2.0, approved, #13241 +maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.48, Apache-2.0, approved, #13679 maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.50, Apache-2.0, approved, #13679 -maven/mavencentral/software.amazon.awssdk/regions/2.24.10, Apache-2.0, approved, #13255 +maven/mavencentral/software.amazon.awssdk/regions/2.25.48, Apache-2.0, approved, #13694 maven/mavencentral/software.amazon.awssdk/regions/2.25.50, Apache-2.0, approved, #13694 maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.50, Apache-2.0, approved, #13699 -maven/mavencentral/software.amazon.awssdk/s3/2.24.10, Apache-2.0, approved, #13254 +maven/mavencentral/software.amazon.awssdk/s3/2.25.48, Apache-2.0, approved, #13688 maven/mavencentral/software.amazon.awssdk/s3/2.25.50, Apache-2.0, approved, #13688 -maven/mavencentral/software.amazon.awssdk/sdk-core/2.24.10, Apache-2.0, approved, #13265 +maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.48, Apache-2.0, approved, #13700 maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.50, Apache-2.0, approved, #13700 -maven/mavencentral/software.amazon.awssdk/sts/2.24.10, Apache-2.0, approved, #13442 -maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.24.10, Apache-2.0, approved, #13249 +maven/mavencentral/software.amazon.awssdk/sts/2.25.48, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.48, Apache-2.0, approved, #13703 maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.50, Apache-2.0, approved, #13703 -maven/mavencentral/software.amazon.awssdk/utils/2.24.10, Apache-2.0, approved, #13250 +maven/mavencentral/software.amazon.awssdk/utils/2.25.48, Apache-2.0, approved, #13689 maven/mavencentral/software.amazon.awssdk/utils/2.25.50, Apache-2.0, approved, #13689 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined diff --git a/edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts b/edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts index 80dda5b69..e3ebeed3d 100644 --- a/edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts +++ b/edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts @@ -49,10 +49,10 @@ dependencies { implementation(libs.edc.identity.trust.issuers.configuration) implementation(libs.edc.auth.oauth2.client) implementation(libs.edc.ih.api.presentation) - implementation(libs.edc.ih.credentials) implementation(libs.edc.ih.keypairs) implementation(libs.edc.ih.participants) implementation(libs.edc.ih.did) + implementation(libs.edc.ih.core) // for the controller implementation(libs.jakarta.rsApi) diff --git a/edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts b/edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts index 642db2960..821f5b032 100644 --- a/edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts +++ b/edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts @@ -49,11 +49,12 @@ dependencies { implementation(libs.edc.identity.trust.sts.remote.client) implementation(libs.edc.identity.trust.issuers.configuration) implementation(libs.edc.auth.oauth2.client) + // IH dependencies implementation(libs.edc.ih.api.presentation) - implementation(libs.edc.ih.credentials) implementation(libs.edc.ih.keypairs) implementation(libs.edc.ih.participants) implementation(libs.edc.ih.did) + implementation(libs.edc.ih.core) // for the controller implementation(libs.jakarta.rsApi) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f4c1aafd1..3804c2ea0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ format.version = "1.1" [versions] -edc = "0.6.3" +edc = "0.6.4" apache-sshd = "2.12.1" assertj = "3.25.3" awaitility = "4.2.1" @@ -13,7 +13,7 @@ flyway = "10.12.0" jackson = "2.17.1" jakarta-json = "2.0.1" jupiter = "5.10.2" -nimbus = "9.37.3" +nimbus = "9.38" netty-mockserver = "5.15.0" okhttp = "4.12.0" postgres = "42.7.3" @@ -155,7 +155,6 @@ edc-identity-trust-sts-client-configuration = { module = "org.eclipse.edc:identi ## IH for testing edc-ih-api-presentation = { module = "org.eclipse.edc:presentation-api", version.ref = "edc" } -edc-ih-credentials = { module = "org.eclipse.edc:identity-hub-credentials", version.ref = "edc" } edc-ih-spi-store = { module = "org.eclipse.edc:identity-hub-store-spi", version.ref = "edc" } edc-ih-spi = { module = "org.eclipse.edc:identity-hub-spi", version.ref = "edc" } edc-ih-spi-participant-context = { module = "org.eclipse.edc:participant-context-spi", version.ref = "edc" } @@ -163,6 +162,7 @@ edc-ih-spi-credentials = { module = "org.eclipse.edc:verifiable-credential-spi", edc-ih-keypairs = { module = "org.eclipse.edc:identity-hub-keypairs", version.ref = "edc" } edc-ih-participants = { module = "org.eclipse.edc:identity-hub-participants", version.ref = "edc" } edc-ih-did = { module = "org.eclipse.edc:identity-hub-did", version.ref = "edc" } +edc-ih-core = { module = "org.eclipse.edc:identity-hub-core", version.ref = "edc" } # DPF modules edc-spi-dataplane-dataplane = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" } From e037eba88531d475d15ba6b54680a994a07506d5 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Wed, 15 May 2024 14:07:55 +0200 Subject: [PATCH 25/37] fix: add checks on accessTokenData not found in AuthTokenAudienceRule (#1306) --- .../core/rules/AuthTokenAudienceRule.java | 3 ++ .../core/rules/AuthTokenAudienceRuleTest.java | 10 +++++ .../DataPlaneTokenRefreshEndToEndTest.java | 37 +++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRule.java b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRule.java index 49bf722e3..34eb5a4b9 100644 --- a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRule.java +++ b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRule.java @@ -54,6 +54,9 @@ public Result checkRule(@NotNull ClaimToken authenticationToken, @Nullable var tokenId = getTokenId(accessToken); var accessTokenData = store.getById(tokenId); + if (accessTokenData == null) { + return Result.failure("Token with id '%s' not found".formatted(tokenId)); + } var expectedAudience = accessTokenData.additionalProperties().getOrDefault(AUDIENCE_PROPERTY, null); if (expectedAudience instanceof String expectedAud) { return expectedAud.equals(issuer) ? Result.success() : Result.failure("Principal '%s' is not authorized to refresh this token.".formatted(issuer)); diff --git a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRuleTest.java b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRuleTest.java index bf4637fe7..4840e505f 100644 --- a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRuleTest.java +++ b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/rules/AuthTokenAudienceRuleTest.java @@ -78,4 +78,14 @@ void checkRule_audienceNotPresent() { .detail() .isEqualTo("Property '%s' was expected to be java.lang.String but was null.".formatted(AUDIENCE_PROPERTY)); } + + @Test + void checkRule_accessTokenDataNotFound() { + when(store.getById(TEST_TOKEN_ID)).thenReturn(null); + + assertThat(rule.checkRule(createAuthenticationToken(TEST_TOKEN_ID), Map.of())) + .isFailed() + .detail() + .isEqualTo("Token with id '%s' not found".formatted(TEST_TOKEN_ID)); + } } \ No newline at end of file diff --git a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/DataPlaneTokenRefreshEndToEndTest.java b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/DataPlaneTokenRefreshEndToEndTest.java index ff888c8fc..9e3440725 100644 --- a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/DataPlaneTokenRefreshEndToEndTest.java +++ b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/DataPlaneTokenRefreshEndToEndTest.java @@ -316,6 +316,43 @@ void refresh_invalidAuthenticationToken_missingAudience() { .body(containsString("Required claim 'aud' not present on token.")); } + @DisplayName("The authentication token has a invalid id") + @Test + void refresh_invalidTokenId() { + prepareDataplaneRuntime(); + + var authorizationService = DATAPLANE_RUNTIME.getService(DataPlaneAuthorizationService.class); + var edr = authorizationService.createEndpointDataReference(createStartMessage("test-process-id", CONSUMER_DID)) + .orElseThrow(f -> new AssertionError(f.getFailureDetail())); + + var refreshToken = edr.getStringProperty(TX_AUTH_NS + "refreshToken"); + var accessToken = edr.getStringProperty(EDC_NAMESPACE + "authorization"); + + + authorizationService.revokeEndpointDataReference("test-process-id", "Revoked"); + var tokenId = getJwtId(accessToken); + + var claims = new JWTClaimsSet.Builder() + .claim("token", accessToken) + .issuer(CONSUMER_DID) + .subject(CONSUMER_DID) + .audience("did:web:bob") + .jwtID(tokenId) + .build(); + + var authToken = createJwt(consumerKey, claims); + + RUNTIME_CONFIG.getRefreshApi().baseRequest() + .queryParam("grant_type", "refresh_token") + .queryParam("refresh_token", refreshToken) + .header(AUTHORIZATION, "Bearer " + authToken) + .post("/token") + .then() + .log().ifValidationFails() + .statusCode(401) + .body(containsString("Authentication token validation failed: Token with id '%s' not found".formatted(tokenId))); + } + private void prepareDataplaneRuntime() { var vault = DATAPLANE_RUNTIME.getContext().getService(Vault.class); vault.storeSecret(PROVIDER_KEY_ID, providerKey.toJSONString()); From 95370e4754eaac741728c222a33547ce64fd8a50 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 16 May 2024 14:56:27 +0200 Subject: [PATCH 26/37] build(deps): align eclipse-temurin versions to 22.0.1_8-jre-alpine (#1309) * build(deps): align eclipse-temurin versions to 22.0.1_8-jre-alpine * dependencies --- .github/dependabot.yml | 30 +++++++++++++++---- DEPENDENCIES | 4 +-- .../src/main/docker/Dockerfile | 2 +- .../mock-connector/src/main/docker/Dockerfile | 2 +- .../src/main/docker/Dockerfile | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0165d0e38..997a647b1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ ################################################################################# -# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation +# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -21,7 +21,8 @@ --- version: 2 updates: - # Maven + + # Gradle - package-ecosystem: "gradle" target-branch: main @@ -44,6 +45,14 @@ updates: interval: "weekly" # Docker + - package-ecosystem: "docker" + target-branch: main + directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/ + labels: + - "dependabot" + - "docker" + schedule: + interval: "weekly" - package-ecosystem: "docker" target-branch: main @@ -56,7 +65,7 @@ updates: - package-ecosystem: "docker" target-branch: main - directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/ + directory: ./edc-controlplane/edc-runtime-memory/src/main/docker/ labels: - "dependabot" - "docker" @@ -65,7 +74,7 @@ updates: - package-ecosystem: "docker" target-branch: main - directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/ + directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/ labels: - "dependabot" - "docker" @@ -74,7 +83,7 @@ updates: - package-ecosystem: "docker" target-branch: main - directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/ + directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/ labels: - "dependabot" - "docker" @@ -83,7 +92,16 @@ updates: - package-ecosystem: "docker" target-branch: main - directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/ + directory: ./edc-tests/runtime/mock-connector/src/main/docker/ + labels: + - "dependabot" + - "docker" + schedule: + interval: "weekly" + - + package-ecosystem: "docker" + target-branch: main + directory: ./samples/edc-dast/edc-dast-runtime/src/main/docker/ labels: - "dependabot" - "docker" diff --git a/DEPENDENCIES b/DEPENDENCIES index 63a0c26c9..c3feab034 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,11 +8,11 @@ maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, maven/mavencentral/com.azure/azure-core-http-netty/1.13.11, MIT AND Apache-2.0, approved, #7948 maven/mavencentral/com.azure/azure-core-http-netty/1.14.0, MIT AND Apache-2.0, approved, #13238 maven/mavencentral/com.azure/azure-core-http-netty/1.14.2, MIT AND Apache-2.0, approved, #13238 -maven/mavencentral/com.azure/azure-core-http-netty/1.15.0, , restricted, clearlydefined +maven/mavencentral/com.azure/azure-core-http-netty/1.15.0, MIT, approved, clearlydefined maven/mavencentral/com.azure/azure-core/1.45.1, MIT AND Apache-2.0, approved, #11845 maven/mavencentral/com.azure/azure-core/1.46.0, MIT AND Apache-2.0, approved, #13234 maven/mavencentral/com.azure/azure-core/1.48.0, MIT AND Apache-2.0, approved, #14409 -maven/mavencentral/com.azure/azure-core/1.49.0, , restricted, clearlydefined +maven/mavencentral/com.azure/azure-core/1.49.0, MIT, approved, clearlydefined maven/mavencentral/com.azure/azure-identity/1.11.2, MIT AND Apache-2.0, approved, #13237 maven/mavencentral/com.azure/azure-identity/1.12.1, MIT AND Apache-2.0, approved, #14412 maven/mavencentral/com.azure/azure-json/1.1.0, MIT AND Apache-2.0, approved, #10547 diff --git a/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile index 281f7baaf..04a3c182f 100644 --- a/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile +++ b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile @@ -21,7 +21,7 @@ ################################################################################# -FROM eclipse-temurin:21.0.2_13-jre-alpine +FROM eclipse-temurin:22.0.1_8-jre-alpine ARG JAR ARG APP_USER=docker diff --git a/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile b/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile index 999103615..a7cc2e36c 100644 --- a/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile +++ b/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile @@ -18,7 +18,7 @@ ################################################################################# -FROM eclipse-temurin:22_36-jre-alpine +FROM eclipse-temurin:22.0.1_8-jre-alpine ARG JAR ARG OTEL_JAR ARG ADDITIONAL_FILES diff --git a/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile b/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile index def311707..0a233f5e7 100644 --- a/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile +++ b/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 ################################################################################# -FROM eclipse-temurin:22_36-jre-alpine +FROM eclipse-temurin:22.0.1_8-jre-alpine ARG JAR ARG OTEL_JAR ARG ADDITIONAL_FILES From 47b2aff54fdb91c8df6601b633319ec041c923c4 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Fri, 17 May 2024 09:00:26 +0200 Subject: [PATCH 27/37] feat(ci): add multi-t pushk8s versions test (#1314) --- .../actions/run-deployment-test/action.yml | 19 +++++++++++++------ .github/workflows/deployment-test.yaml | 8 ++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml index 0564771c3..a8dd85a18 100644 --- a/.github/actions/run-deployment-test/action.yml +++ b/.github/actions/run-deployment-test/action.yml @@ -40,17 +40,17 @@ inputs: required: true description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory" + k8sversion: + required: false + description: "Version of Kubernetes to use" + default: "v1.30.0" + runs: using: "composite" steps: - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java - - name: Build docker images - shell: bash - run: |- - ./gradlew -p ${{ inputs.rootDir }} dockerize - - name: Setup Helm uses: azure/setup-helm@v3.5 with: @@ -62,7 +62,14 @@ runs: version: 'v1.28.2' - name: Create k8s Kind Cluster - uses: helm/kind-action@v1.5.0 + uses: helm/kind-action@v1.10.0 + with: + node_image: kindest/node:${{ inputs.k8sversion }} + + - name: Build docker images + shell: bash + run: |- + ./gradlew -p ${{ inputs.rootDir }} dockerize - name: Load images into KinD shell: bash diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml index 1ab1187e1..281ff66c4 100644 --- a/.github/workflows/deployment-test.yaml +++ b/.github/workflows/deployment-test.yaml @@ -77,6 +77,13 @@ jobs: test-hashicorp-postgres: runs-on: ubuntu-latest needs: test-prepare + strategy: + fail-fast: false + # this will verify that the official distribution of the Tractus-X EDC Helm chart runs on the last 3 Kubernetes versions + matrix: + k8s-version: ["v1.30.0", + "v1.29.4", + "v1.28.9"] steps: - name: Checkout uses: actions/checkout@v4 @@ -85,6 +92,7 @@ jobs: with: imagename: "edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault" rootDir: "." + k8sversion: ${{ matrix.k8s-version }} helm_command: |- helm install tx-prod charts/tractusx-connector \ -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \ From 724b40d4dc6b411515c5474355a3529fba4924de Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Fri, 17 May 2024 16:18:38 +0200 Subject: [PATCH 28/37] docs: switch upstream openapi spec fetch from SH to GP (#1317) --- .github/workflows/publish-swaggerhub.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-swaggerhub.yaml b/.github/workflows/publish-swaggerhub.yaml index 15594b614..484bddf81 100644 --- a/.github/workflows/publish-swaggerhub.yaml +++ b/.github/workflows/publish-swaggerhub.yaml @@ -83,9 +83,9 @@ jobs: ./gradlew resolve - name: Download upstream API specs - run: | - curl -X GET https://api.swaggerhub.com/apis/eclipse-edc-bot/management-api/${{ env.UPSTREAM_VERSION }}/swagger.yaml > resources/openapi/yaml/upstream-management-api.yaml - curl -X GET https://api.swaggerhub.com/apis/eclipse-edc-bot/control-api/${{ env.UPSTREAM_VERSION }}/swagger.yaml > resources/openapi/yaml/upstream-control-api.yaml + run: | + curl -X GET https://eclipse-edc.github.io/Connector/openapi/management-api/${{ env.UPSTREAM_VERSION }}/management-api.yaml > resources/openapi/yaml/upstream-management-api.yaml + curl -X GET https://eclipse-edc.github.io/Connector/openapi/control-api/${{ env.UPSTREAM_VERSION }}/control-api.yaml > resources/openapi/yaml/upstream-control-api.yaml - name: Merge API specs run: | From cfe729963d2dba22810812a72ed6702b3384f567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 09:56:40 +0200 Subject: [PATCH 29/37] chore(deps): bump aws from 2.25.50 to 2.25.55 (#1322) * chore(deps): bump aws from 2.25.50 to 2.25.55 Bumps `aws` from 2.25.50 to 2.25.55. Updates `software.amazon.awssdk:s3` from 2.25.50 to 2.25.55 Updates `software.amazon.awssdk:s3-transfer-manager` from 2.25.50 to 2.25.55 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3-transfer-manager dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore: deps file --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Enrico Risa --- DEPENDENCIES | 58 +++++++++++++++++++-------------------- gradle/libs.versions.toml | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index c3feab034..eae448774 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -631,58 +631,58 @@ maven/mavencentral/org.xmlunit/xmlunit-placeholders/2.9.1, Apache-2.0, approved, maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 maven/mavencentral/software.amazon.awssdk/annotations/2.25.48, Apache-2.0, approved, #13691 -maven/mavencentral/software.amazon.awssdk/annotations/2.25.50, Apache-2.0, approved, #13691 +maven/mavencentral/software.amazon.awssdk/annotations/2.25.55, Apache-2.0, approved, #13691 maven/mavencentral/software.amazon.awssdk/apache-client/2.25.48, Apache-2.0, approved, #13687 -maven/mavencentral/software.amazon.awssdk/apache-client/2.25.50, Apache-2.0, approved, #13687 +maven/mavencentral/software.amazon.awssdk/apache-client/2.25.55, Apache-2.0, approved, #13687 maven/mavencentral/software.amazon.awssdk/arns/2.25.48, Apache-2.0, approved, #13695 -maven/mavencentral/software.amazon.awssdk/arns/2.25.50, Apache-2.0, approved, #13695 +maven/mavencentral/software.amazon.awssdk/arns/2.25.55, Apache-2.0, approved, #13695 maven/mavencentral/software.amazon.awssdk/auth/2.25.48, Apache-2.0, approved, #13692 -maven/mavencentral/software.amazon.awssdk/auth/2.25.50, Apache-2.0, approved, #13692 +maven/mavencentral/software.amazon.awssdk/auth/2.25.55, Apache-2.0, approved, #13692 maven/mavencentral/software.amazon.awssdk/aws-core/2.25.48, Apache-2.0, approved, #13702 -maven/mavencentral/software.amazon.awssdk/aws-core/2.25.50, Apache-2.0, approved, #13702 +maven/mavencentral/software.amazon.awssdk/aws-core/2.25.55, Apache-2.0, approved, #13702 maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.48, Apache-2.0, approved, #13701 -maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.50, Apache-2.0, approved, #13701 +maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.25.55, Apache-2.0, approved, #13701 maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.48, Apache-2.0, approved, #13684 -maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.50, Apache-2.0, approved, #13684 +maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.25.55, Apache-2.0, approved, #13684 maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.48, Apache-2.0, approved, #13686 -maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.50, Apache-2.0, approved, #13686 +maven/mavencentral/software.amazon.awssdk/checksums-spi/2.25.55, Apache-2.0, approved, #13686 maven/mavencentral/software.amazon.awssdk/checksums/2.25.48, Apache-2.0, approved, #13677 -maven/mavencentral/software.amazon.awssdk/checksums/2.25.50, Apache-2.0, approved, #13677 +maven/mavencentral/software.amazon.awssdk/checksums/2.25.55, Apache-2.0, approved, #13677 maven/mavencentral/software.amazon.awssdk/crt-core/2.25.48, Apache-2.0, approved, #13705 -maven/mavencentral/software.amazon.awssdk/crt-core/2.25.50, Apache-2.0, approved, #13705 +maven/mavencentral/software.amazon.awssdk/crt-core/2.25.55, Apache-2.0, approved, #13705 maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.48, Apache-2.0, approved, #13681 -maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.50, Apache-2.0, approved, #13681 +maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.25.55, Apache-2.0, approved, #13681 maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.48, Apache-2.0, approved, #13696 -maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.50, Apache-2.0, approved, #13696 +maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.25.55, Apache-2.0, approved, #13696 maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.48, Apache-2.0, approved, #13704 -maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.50, Apache-2.0, approved, #13704 +maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.25.55, Apache-2.0, approved, #13704 maven/mavencentral/software.amazon.awssdk/http-auth/2.25.48, Apache-2.0, approved, #13682 -maven/mavencentral/software.amazon.awssdk/http-auth/2.25.50, Apache-2.0, approved, #13682 +maven/mavencentral/software.amazon.awssdk/http-auth/2.25.55, Apache-2.0, approved, #13682 maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.48, Apache-2.0, approved, #13706 -maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.50, Apache-2.0, approved, #13706 -maven/mavencentral/software.amazon.awssdk/iam/2.25.48, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/http-client-spi/2.25.55, Apache-2.0, approved, #13706 +maven/mavencentral/software.amazon.awssdk/iam/2.25.48, Apache-2.0, approved, clearlydefined maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.48, Apache-2.0, approved, #13685 -maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.50, Apache-2.0, approved, #13685 +maven/mavencentral/software.amazon.awssdk/identity-spi/2.25.55, Apache-2.0, approved, #13685 maven/mavencentral/software.amazon.awssdk/json-utils/2.25.48, Apache-2.0, approved, #13698 -maven/mavencentral/software.amazon.awssdk/json-utils/2.25.50, Apache-2.0, approved, #13698 +maven/mavencentral/software.amazon.awssdk/json-utils/2.25.55, Apache-2.0, approved, #13698 maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.48, Apache-2.0, approved, #13680 -maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.50, Apache-2.0, approved, #13680 +maven/mavencentral/software.amazon.awssdk/metrics-spi/2.25.55, Apache-2.0, approved, #13680 maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.48, Apache-2.0, approved, #13693 -maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.50, Apache-2.0, approved, #13693 +maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.25.55, Apache-2.0, approved, #13693 maven/mavencentral/software.amazon.awssdk/profiles/2.25.48, Apache-2.0, approved, #13697 -maven/mavencentral/software.amazon.awssdk/profiles/2.25.50, Apache-2.0, approved, #13697 +maven/mavencentral/software.amazon.awssdk/profiles/2.25.55, Apache-2.0, approved, #13697 maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.48, Apache-2.0, approved, #13679 -maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.50, Apache-2.0, approved, #13679 +maven/mavencentral/software.amazon.awssdk/protocol-core/2.25.55, Apache-2.0, approved, #13679 maven/mavencentral/software.amazon.awssdk/regions/2.25.48, Apache-2.0, approved, #13694 -maven/mavencentral/software.amazon.awssdk/regions/2.25.50, Apache-2.0, approved, #13694 -maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.50, Apache-2.0, approved, #13699 +maven/mavencentral/software.amazon.awssdk/regions/2.25.55, Apache-2.0, approved, #13694 +maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.25.55, Apache-2.0, approved, #13699 maven/mavencentral/software.amazon.awssdk/s3/2.25.48, Apache-2.0, approved, #13688 -maven/mavencentral/software.amazon.awssdk/s3/2.25.50, Apache-2.0, approved, #13688 +maven/mavencentral/software.amazon.awssdk/s3/2.25.55, Apache-2.0, approved, #13688 maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.48, Apache-2.0, approved, #13700 -maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.50, Apache-2.0, approved, #13700 -maven/mavencentral/software.amazon.awssdk/sts/2.25.48, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/sdk-core/2.25.55, Apache-2.0, approved, #13700 +maven/mavencentral/software.amazon.awssdk/sts/2.25.48, Apache-2.0, approved, clearlydefined maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.48, Apache-2.0, approved, #13703 -maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.50, Apache-2.0, approved, #13703 +maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.25.55, Apache-2.0, approved, #13703 maven/mavencentral/software.amazon.awssdk/utils/2.25.48, Apache-2.0, approved, #13689 -maven/mavencentral/software.amazon.awssdk/utils/2.25.50, Apache-2.0, approved, #13689 +maven/mavencentral/software.amazon.awssdk/utils/2.25.55, Apache-2.0, approved, #13689 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3804c2ea0..671265e97 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ edc = "0.6.4" apache-sshd = "2.12.1" assertj = "3.25.3" awaitility = "4.2.1" -aws = "2.25.50" +aws = "2.25.55" azure-identity = "1.12.1" bouncyCastle-jdk18on = "1.78.1" flyway = "10.12.0" From 9785be0ade231f0b827cd360aa322c95e303b900 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 10:12:12 +0200 Subject: [PATCH 30/37] chore(deps): bump flyway from 10.12.0 to 10.13.0 (#1311) * chore(deps): bump flyway from 10.12.0 to 10.13.0 Bumps `flyway` from 10.12.0 to 10.13.0. Updates `org.flywaydb:flyway-core` from 10.12.0 to 10.13.0 - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-10.12.0...flyway-10.13.0) Updates `org.flywaydb:flyway-database-postgresql` from 10.12.0 to 10.13.0 --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * chore: deps file --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Enrico Risa --- DEPENDENCIES | 4 ++-- gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index eae448774..485363d96 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -540,8 +540,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.12.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.12.0, NOASSERTION, restricted, clearlydefined +maven/mavencentral/org.flywaydb/flyway-core/10.13.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.13.0, , restricted, clearlydefined maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, 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.6, 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.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 671265e97..dc33d7b39 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ awaitility = "4.2.1" aws = "2.25.55" azure-identity = "1.12.1" bouncyCastle-jdk18on = "1.78.1" -flyway = "10.12.0" +flyway = "10.13.0" jackson = "2.17.1" jakarta-json = "2.0.1" jupiter = "5.10.2" From 924e99aeb54bfc5ed39ec420afcf588f254964ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 10:33:12 +0200 Subject: [PATCH 31/37] chore(deps): bump com.azure:azure-security-keyvault-secrets from 4.8.2 to 4.8.3 (#1310) * chore(deps): bump com.azure:azure-security-keyvault-secrets Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.8.2 to 4.8.3. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-security-keyvault-keys_4.8.2...azure-security-keyvault-keys_4.8.3) --- updated-dependencies: - dependency-name: com.azure:azure-security-keyvault-secrets dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore: deps file --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Enrico Risa --- DEPENDENCIES | 4 +--- edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 485363d96..9fdae9ca7 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -7,17 +7,15 @@ maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved, maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #13683 maven/mavencentral/com.azure/azure-core-http-netty/1.13.11, MIT AND Apache-2.0, approved, #7948 maven/mavencentral/com.azure/azure-core-http-netty/1.14.0, MIT AND Apache-2.0, approved, #13238 -maven/mavencentral/com.azure/azure-core-http-netty/1.14.2, MIT AND Apache-2.0, approved, #13238 maven/mavencentral/com.azure/azure-core-http-netty/1.15.0, MIT, approved, clearlydefined maven/mavencentral/com.azure/azure-core/1.45.1, MIT AND Apache-2.0, approved, #11845 maven/mavencentral/com.azure/azure-core/1.46.0, MIT AND Apache-2.0, approved, #13234 -maven/mavencentral/com.azure/azure-core/1.48.0, MIT AND Apache-2.0, approved, #14409 maven/mavencentral/com.azure/azure-core/1.49.0, MIT, approved, clearlydefined maven/mavencentral/com.azure/azure-identity/1.11.2, MIT AND Apache-2.0, approved, #13237 maven/mavencentral/com.azure/azure-identity/1.12.1, MIT AND Apache-2.0, approved, #14412 maven/mavencentral/com.azure/azure-json/1.1.0, MIT AND Apache-2.0, approved, #10547 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.7.3, MIT, approved, #10868 -maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.8.2, MIT, approved, #13690 +maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.8.3, MIT, approved, #13690 maven/mavencentral/com.azure/azure-storage-blob/12.25.2, MIT, approved, #13400 maven/mavencentral/com.azure/azure-storage-common/12.24.2, MIT, approved, #13402 maven/mavencentral/com.azure/azure-storage-internal-avro/12.10.2, MIT, approved, #13399 diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts index a6fcf2ea5..1ceea2167 100644 --- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts +++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { } } implementation(libs.edc.azure.identity) - implementation("com.azure:azure-security-keyvault-secrets:4.8.2") + implementation("com.azure:azure-security-keyvault-secrets:4.8.3") runtimeOnly(libs.edc.transaction.local) runtimeOnly(libs.edc.sql.pool) runtimeOnly(libs.edc.sql.accesstokendata) From 846ed09b19ed18c6a7bc065b55b54c07115a682c Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Wed, 22 May 2024 15:18:22 +0200 Subject: [PATCH 32/37] Update gradle.properties somehow, the last release did not bump the SNAPSHOT version corectly --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a74869c1e..62d5c3a7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.eclipse.tractusx.edc -version=0.7.1-SNAPSHOT +version=0.7.2-SNAPSHOT # configure the build: txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git From d3661109a82ecb705f066cb3a449f0259fa9c969 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Wed, 22 May 2024 16:39:55 +0200 Subject: [PATCH 33/37] chore: updates edc to 0.7.0 (#1323) * chore: updates edc to 0.7.0 * chore: deps file --- DEPENDENCIES | 425 +++++++++--------- .../tractusx-connector-azure-vault/README.md | 2 + .../templates/deployment-dataplane.yaml | 4 + .../values.yaml | 3 + charts/tractusx-connector/README.md | 2 + .../templates/deployment-dataplane.yaml | 4 + charts/tractusx-connector/values.yaml | 3 + docs/migration/Version_0.5.x_0.7.x.md | 49 ++ .../edc-controlplane-base/build.gradle.kts | 1 + ...ctorConfigurationServiceExtensionTest.java | 15 +- .../edr/edr-api-v2/build.gradle.kts | 1 + .../tractusx/edc/api/edr/v2/EdrCacheApi.java | 5 +- .../AbstractIatpConsumerPullTest.java | 2 +- .../tokenrefresh/e2e/RuntimeConfig.java | 10 +- gradle/libs.versions.toml | 3 +- .../src/test/resources/tenants.properties | 4 + 16 files changed, 305 insertions(+), 228 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 9fdae9ca7..53bce631c 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -108,6 +108,7 @@ maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.28, Apache-2.0, approved, clea maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.30.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.38, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.39.1, Apache-2.0, approved, #14830 maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/10.7.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/11.9.1, Apache-2.0, approved, #12667 maven/mavencentral/com.puppycrawl.tools/checkstyle/10.16.0, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #14689 @@ -135,9 +136,9 @@ maven/mavencentral/dev.failsafe/failsafe/3.3.2, Apache-2.0, approved, #9268 maven/mavencentral/info.picocli/picocli/4.7.5, Apache-2.0, approved, #4365 maven/mavencentral/io.github.classgraph/classgraph/4.8.154, MIT, approved, CQ22530 maven/mavencentral/io.github.classgraph/classgraph/4.8.165, MIT, approved, CQ22530 -maven/mavencentral/io.micrometer/micrometer-commons/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679 -maven/mavencentral/io.micrometer/micrometer-core/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11678 -maven/mavencentral/io.micrometer/micrometer-observation/1.12.5, Apache-2.0, approved, #11680 +maven/mavencentral/io.micrometer/micrometer-commons/1.13.0, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #14826 +maven/mavencentral/io.micrometer/micrometer-core/1.13.0, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #14827 +maven/mavencentral/io.micrometer/micrometer-observation/1.13.0, Apache-2.0, approved, #14829 maven/mavencentral/io.netty/netty-buffer/4.1.101.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-buffer/4.1.107.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-buffer/4.1.108.Final, Apache-2.0, approved, CQ21842 @@ -225,6 +226,7 @@ maven/mavencentral/io.rest-assured/rest-assured/5.4.0, Apache-2.0, approved, #12 maven/mavencentral/io.rest-assured/xml-path/5.4.0, Apache-2.0, approved, #12038 maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.21, Apache-2.0, approved, #5947 +maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.22, Apache-2.0, approved, #5947 maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.21, Apache-2.0, approved, #11362 maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.8, Apache-2.0, approved, #11362 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.21, Apache-2.0, approved, #5929 @@ -268,10 +270,10 @@ maven/mavencentral/javax.ws.rs/javax.ws.rs-api/2.1, (CDDL-1.1 OR GPL-2.0 WITH Cl maven/mavencentral/joda-time/joda-time/2.10.5, Apache-2.0, approved, clearlydefined maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636 maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.1, Apache-2.0, approved, #7164 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.12, Apache-2.0, approved, #7164 +maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.15, Apache-2.0, approved, #7164 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.11, Apache-2.0 AND BSD-3-Clause, approved, #7163 -maven/mavencentral/net.bytebuddy/byte-buddy/1.14.12, Apache-2.0 AND BSD-3-Clause, approved, #7163 +maven/mavencentral/net.bytebuddy/byte-buddy/1.14.15, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.java.dev.jna/jna-platform/5.13.0, Apache-2.0 OR LGPL-2.1-or-later, approved, #6707 maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390 maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #6709 @@ -334,210 +336,210 @@ maven/mavencentral/org.codehaus.plexus/plexus-utils/3.1.1, , approved, CQ16492 maven/mavencentral/org.codehaus.plexus/plexus-utils/3.3.0, , approved, CQ21066 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.2, BSD-2-Clause, approved, #2670 maven/mavencentral/org.eclipse.angus/angus-activation/1.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus -maven/mavencentral/org.eclipse.edc/accesstoken-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/accesstokendata-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/api-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/api-observability/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-index-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/auth-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/autodoc-processor/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/aws-s3-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/aws-s3-test/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/azure-blob-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/azure-test/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/boot/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/callback-static-endpoint/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/connector-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-definition-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-api-configuration/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-catalog/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-contract/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-policies-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-transform/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/core-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/credential-query-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-azure-storage/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-control-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-http/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-public-api-v2/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-api-configuration/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-client/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-signaling-transform/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/data-plane-util/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/did-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-http-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-api-configuration/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-version-http-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-index-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-store-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-store-receiver/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/edr-store-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/iam-mock/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-web/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-did/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-keypairs/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-participants/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-hub-store-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-issuers-configuration/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-service/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-client-configuration/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-embedded/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-client/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-sts-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jetty-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/junit-base/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/junit/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jws2020-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jwt-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jwt-verifiable-credentials/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keypair-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keypair-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keys-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/keys-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/ldp-verifiable-credentials/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/management-api-configuration/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/management-api-test-fixtures/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/management-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/micrometer-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/oauth2-client/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/oauth2-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/participant-context-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-definition-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-model/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/presentation-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/query-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/secrets-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-lease/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/state-machine-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/store-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/token-core/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/token-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-local/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-data-plane-signaling/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-process-api/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transform-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transform-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/util-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-data-address-http-data/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/vault-azure/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/vault-hashicorp/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credential-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credentials/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-presentation-lib/0.6.4, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/web-spi/0.6.4, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/accesstoken-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/accesstokendata-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/api-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/api-observability/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-index-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/auth-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/autodoc-processor/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/aws-s3-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/aws-s3-test/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/azure-blob-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/azure-test/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/callback-static-endpoint/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/connector-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-definition-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-api-configuration/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-catalog/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-contract/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-policies-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-transform/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/core-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/credential-query-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-azure-storage/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-control-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-http/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-public-api-v2/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-api-configuration/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-client/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-signaling-transform/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/data-plane-util/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/did-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-http-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-api-configuration/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-version-http-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-index-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-store-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-store-receiver/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/edr-store-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/iam-mock/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-did-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-did-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-did-web/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-did/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-keypairs/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-participants/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-hub-store-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-issuers-configuration/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-service/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-client-configuration/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-embedded/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-client/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-sts-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jetty-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/junit-base/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/junit/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jws2020-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jwt-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jwt-verifiable-credentials/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keypair-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keypair-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keys-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keys-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/ldp-verifiable-credentials/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api-configuration/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api-test-fixtures/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/micrometer-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/oauth2-client/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/oauth2-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/participant-context-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-definition-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-model/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-monitor-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-monitor-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-monitor-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/presentation-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/query-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/secrets-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-lease/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/state-machine-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/store-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/token-core/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/token-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-local/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-data-plane-signaling/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-process-api/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/util-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-data-address-http-data/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/vault-azure/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/vault-hashicorp/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credential-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credentials/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-presentation-lib/0.7.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/web-spi/0.7.0, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -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.eclipse.jetty.websocket/websocket-core-client/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.flywaydb/flyway-core/10.13.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.13.0, , restricted, clearlydefined maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish @@ -559,7 +561,7 @@ maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ114 maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined maven/mavencentral/org.hamcrest/hamcrest/2.1, BSD-3-Clause, approved, clearlydefined maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192 +maven/mavencentral/org.hdrhistogram/HdrHistogram/2.2.1, BSD-2-Clause AND CC0-1.0 AND CC0-1.0, approved, #14828 maven/mavencentral/org.jacoco/org.jacoco.agent/0.8.9, EPL-2.0, approved, CQ23285 maven/mavencentral/org.jacoco/org.jacoco.ant/0.8.9, EPL-2.0, approved, #1068 maven/mavencentral/org.jacoco/org.jacoco.core/0.8.9, EPL-2.0, approved, CQ23283 @@ -591,18 +593,19 @@ maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, BSD-2-Clause, approved, maven/mavencentral/org.mock-server/mockserver-client-java/5.15.0, Apache-2.0 AND LGPL-3.0-only, approved, #9324 maven/mavencentral/org.mock-server/mockserver-core/5.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.mock-server/mockserver-netty/5.15.0, Apache-2.0, approved, #9276 -maven/mavencentral/org.mockito/mockito-core/5.11.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #13505 +maven/mavencentral/org.mockito/mockito-core/5.12.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #14678 maven/mavencentral/org.mockito/mockito-core/5.2.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #7401 maven/mavencentral/org.mozilla/rhino/1.7.7.2, MPL-2.0 AND BSD-3-Clause AND ISC, approved, CQ16320 maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydefined maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713 maven/mavencentral/org.ow2.asm/asm-commons/9.5, BSD-3-Clause, approved, #7553 -maven/mavencentral/org.ow2.asm/asm-commons/9.6, BSD-3-Clause, approved, #10775 +maven/mavencentral/org.ow2.asm/asm-commons/9.7, BSD-3-Clause, approved, #14075 maven/mavencentral/org.ow2.asm/asm-tree/9.5, BSD-3-Clause, approved, #7555 -maven/mavencentral/org.ow2.asm/asm-tree/9.6, BSD-3-Clause, approved, #10773 +maven/mavencentral/org.ow2.asm/asm-tree/9.7, BSD-3-Clause, approved, #14073 maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029 maven/mavencentral/org.ow2.asm/asm/9.5, BSD-3-Clause, approved, #7554 maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776 +maven/mavencentral/org.ow2.asm/asm/9.7, BSD-3-Clause, approved, #14076 maven/mavencentral/org.postgresql/postgresql/42.7.2, BSD-2-Clause AND Apache-2.0, approved, #11681 maven/mavencentral/org.postgresql/postgresql/42.7.3, BSD-2-Clause AND Apache-2.0, approved, #11681 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332 diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 540dccf24..0469d2aa2 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -177,6 +177,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | dataplane.debug.enabled | bool | `false` | | | dataplane.debug.port | int | `1044` | | | dataplane.debug.suspendOnStart | bool | `false` | | +| dataplane.endpoints.control.path | string | `"/api/control"` | | +| dataplane.endpoints.control.port | int | `8084` | | | dataplane.endpoints.default.path | string | `"/api"` | | | dataplane.endpoints.default.port | int | `8080` | | | dataplane.endpoints.metrics.path | string | `"/metrics"` | | diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml index fbddb75bc..1f2619596 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml @@ -161,6 +161,10 @@ spec: value: {{ .Values.dataplane.endpoints.signaling.port | quote }} - name: "WEB_HTTP_SIGNALING_PATH" value: {{ .Values.dataplane.endpoints.signaling.path | quote }} + - name: "WEB_HTTP_CONTROL_PORT" + value: {{ .Values.dataplane.endpoints.control.port | quote }} + - name: "WEB_HTTP_CONTROL_PATH" + value: {{ .Values.dataplane.endpoints.control.path | quote }} - name: "WEB_HTTP_PUBLIC_PORT" value: {{ .Values.dataplane.endpoints.public.port | quote }} - name: "WEB_HTTP_PUBLIC_PATH" diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index 56c8bb9be..2e1adbbea 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -358,6 +358,9 @@ dataplane: signaling: port: 8083 path: /api/signaling + control: + port: 8084 + path: /api/control proxy: port: 8186 path: /proxy diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index 1e7eb58d7..8e3572fd2 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -174,6 +174,8 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.7.0 \ | dataplane.debug.enabled | bool | `false` | | | dataplane.debug.port | int | `1044` | | | dataplane.debug.suspendOnStart | bool | `false` | | +| dataplane.endpoints.control.path | string | `"/api/control"` | | +| dataplane.endpoints.control.port | int | `8084` | | | dataplane.endpoints.default.path | string | `"/api"` | | | dataplane.endpoints.default.port | int | `8080` | | | dataplane.endpoints.metrics.path | string | `"/metrics"` | | diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml index 1b633269b..16f2b8059 100644 --- a/charts/tractusx-connector/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml @@ -161,6 +161,10 @@ spec: value: {{ .Values.dataplane.endpoints.signaling.port | quote }} - name: "WEB_HTTP_SIGNALING_PATH" value: {{ .Values.dataplane.endpoints.signaling.path | quote }} + - name: "WEB_HTTP_CONTROL_PORT" + value: {{ .Values.dataplane.endpoints.control.port | quote }} + - name: "WEB_HTTP_CONTROL_PATH" + value: {{ .Values.dataplane.endpoints.control.path | quote }} - name: "WEB_HTTP_PUBLIC_PORT" value: {{ .Values.dataplane.endpoints.public.port | quote }} - name: "WEB_HTTP_PUBLIC_PATH" diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 2d434d70c..063e444ec 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -356,6 +356,9 @@ dataplane: signaling: port: 8083 path: /api/signaling + control: + port: 8084 + path: /api/control proxy: port: 8186 path: /proxy diff --git a/docs/migration/Version_0.5.x_0.7.x.md b/docs/migration/Version_0.5.x_0.7.x.md index 720ab185b..4586c30e1 100644 --- a/docs/migration/Version_0.5.x_0.7.x.md +++ b/docs/migration/Version_0.5.x_0.7.x.md @@ -236,11 +236,60 @@ this [test class](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc ## 5. EDC Management API +### 5.0 Policies + +Due to [#4192](https://github.com/eclipse-edc/Connector/issues/4192) and [#4179](https://github.com/eclipse-edc/Connector/issues/4179) + +The `action` and the `leftOperand` field are now represented as `@id` instead of `value` in JSON-LD. + +`action` from: + +```json + { + "odrl:permission": { + "odrl:action": { + "odrl:type": "http://www.w3.org/ns/odrl/2/use" + } + } +} +``` +to: + +```json +{ + "odrl:action": { + "@id": "odrl:use" + } +} +``` + +`leftOperand` from: + +```json +{ + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement" +} +``` + +to: + +```json +{ + "odrl:leftOperand": { + "@id": "cx-policy:FrameworkAgreement" + } +} +``` + +This is reflected in the `Catalog` as well as in `PolicyDefinition` API. + ### 5.1 Catalog - `counterPartyId` is a **required** property for the catalog request in Tractus-X EDC. It's not enforced currently ( backward compatibility) but if not provided, the IATP flows won't work and thus the catalog request will fail. + + ### 5.2 Transfer Process - `transferType` is a needed property for the transfer request to be working in tx-edc. `transferTypes` are the diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts index 915f73928..6febbd242 100644 --- a/edc-controlplane/edc-controlplane-base/build.gradle.kts +++ b/edc-controlplane/edc-controlplane-base/build.gradle.kts @@ -62,6 +62,7 @@ dependencies { runtimeOnly(libs.edc.api.management) runtimeOnly(libs.edc.api.controlplane) runtimeOnly(libs.edc.api.management.config) + runtimeOnly(libs.edc.api.core) runtimeOnly(libs.edc.api.observability) runtimeOnly(libs.edc.dsp) runtimeOnly(libs.edc.spi.jwt) diff --git a/edc-extensions/dataplane/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java b/edc-extensions/dataplane/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java index 549d23705..5d6efdd89 100644 --- a/edc-extensions/dataplane/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java +++ b/edc-extensions/dataplane/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java @@ -43,6 +43,7 @@ import static org.eclipse.tractusx.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension.PROPERTIES_SUFFIX; import static org.eclipse.tractusx.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension.PUBLIC_API_URL_PROPERTY; import static org.eclipse.tractusx.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension.SOURCE_TYPES_SUFFIX; +import static org.eclipse.tractusx.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension.TRANSFER_TYPES_SUFFIX; import static org.eclipse.tractusx.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension.URL_SUFFIX; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -57,16 +58,16 @@ class DataPlaneSelectorConfigurationServiceExtensionTest { private static final String S3_BUCKET = "s3-bucket"; private static final String BLOB_STORAGE = "blob-storage"; - private static final String LOCAL_FILE_SYSTEM = "local-file-system"; private static final String DATA_PLANE_INSTANCE_ID = "test-plane"; private static final String DATA_PLANE_INSTANCE_URL = "http://127.0.0.1:8080/test"; private static final String DATA_PLANE_INSTANCE_SOURCE_TYPES = "%s, %s".formatted(S3_BUCKET, BLOB_STORAGE); - private static final String DATA_PLANE_INSTANCE_DESTINATION_TYPES = LOCAL_FILE_SYSTEM; + private static final String DATA_PLANE_INSTANCE_TRANSFER_TYPES = "%s".formatted(S3_BUCKET); private static final String URL_KEY = "%s.%s".formatted(DATA_PLANE_INSTANCE_ID, URL_SUFFIX); private static final String SOURCE_TYPES_KEY = "%s.%s".formatted(DATA_PLANE_INSTANCE_ID, SOURCE_TYPES_SUFFIX); private static final String DESTINATION_TYPES_KEY = "%s.%s".formatted(DATA_PLANE_INSTANCE_ID, DESTINATION_TYPES_SUFFIX); + private static final String TRANSFER_TYPES_KEY = "%s.%s".formatted(DATA_PLANE_INSTANCE_ID, TRANSFER_TYPES_SUFFIX); private static final String PROPERTIES_KEY = "%s.%s".formatted(DATA_PLANE_INSTANCE_ID, PROPERTIES_SUFFIX); private final ServiceExtensionContext serviceExtensionContext = mock(); private final DataPlaneSelectorService dataPlaneSelectorService = mock(); @@ -106,12 +107,11 @@ void testInitialize() { .addInstance(argThat(dataPlaneInstance -> { var s3Source = DataAddress.Builder.newInstance().type(S3_BUCKET).build(); var blobSource = DataAddress.Builder.newInstance().type(BLOB_STORAGE).build(); - var fsSink = DataAddress.Builder.newInstance().type(LOCAL_FILE_SYSTEM).build(); return dataPlaneInstance.getId().equals(DATA_PLANE_INSTANCE_ID) && dataPlaneInstance.getUrl().toString().equals(DATA_PLANE_INSTANCE_URL) && - dataPlaneInstance.canHandle(s3Source, fsSink) && - dataPlaneInstance.canHandle(blobSource, fsSink); + dataPlaneInstance.canHandle(s3Source, S3_BUCKET) && + dataPlaneInstance.canHandle(blobSource, S3_BUCKET); })); } @@ -125,7 +125,7 @@ void testWarningOnPropertyMissing(String configKey, String configValue) { extension.initialize(serviceExtensionContext); // one warning config missing, one warning data plane instance skipped - verify(monitor, times(3)).warning(anyString()); + verify(monitor, times(2)).warning(anyString()); } @Test @@ -143,7 +143,8 @@ private Map getConfig() { { put(URL_KEY, DATA_PLANE_INSTANCE_URL); put(SOURCE_TYPES_KEY, DATA_PLANE_INSTANCE_SOURCE_TYPES); - put(DESTINATION_TYPES_KEY, DATA_PLANE_INSTANCE_DESTINATION_TYPES); + put(TRANSFER_TYPES_KEY, DATA_PLANE_INSTANCE_TRANSFER_TYPES); + put(DESTINATION_TYPES_KEY, S3_BUCKET); put(PROPERTIES_KEY, "{ \"%s\": \"%s\" }".formatted(PUBLIC_API_URL_PROPERTY, DATA_PLANE_INSTANCE_URL)); } }; diff --git a/edc-extensions/edr/edr-api-v2/build.gradle.kts b/edc-extensions/edr/edr-api-v2/build.gradle.kts index 4db499b1c..af362ab50 100644 --- a/edc-extensions/edr/edr-api-v2/build.gradle.kts +++ b/edc-extensions/edr/edr-api-v2/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { implementation(project(":spi:tokenrefresh-spi")) implementation(libs.edc.api.management) + implementation(libs.edc.api.core) implementation(libs.edc.lib.validator) implementation(libs.edc.spi.edrstore) implementation(libs.jakarta.rsApi) diff --git a/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java b/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java index dd429b1ef..0a4783503 100644 --- a/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java +++ b/edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/v2/EdrCacheApi.java @@ -31,7 +31,6 @@ import jakarta.json.JsonArray; import jakarta.json.JsonObject; import org.eclipse.edc.api.model.ApiCoreSchema; -import org.eclipse.edc.connector.api.management.configuration.ManagementApiSchema; import org.eclipse.edc.connector.controlplane.api.management.contractnegotiation.ContractNegotiationApi; import org.eclipse.edc.edr.spi.types.EndpointDataReferenceEntry; import org.eclipse.edc.web.spi.ApiErrorDetail; @@ -71,7 +70,7 @@ public interface EdrCacheApi { }, responses = { @ApiResponse(responseCode = "200", description = "The data address", - content = @Content(schema = @Schema(implementation = ManagementApiSchema.DataAddressSchema.class))), + content = @Content(schema = @Schema(implementation = ApiCoreSchema.DataAddressSchema.class))), @ApiResponse(responseCode = "400", description = "Request was malformed, e.g. id was null", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class)))), @ApiResponse(responseCode = "404", description = "An EDR data address with the given transfer process ID does not exist", @@ -95,7 +94,7 @@ public interface EdrCacheApi { }, responses = { @ApiResponse(responseCode = "200", description = "The data address", - content = @Content(schema = @Schema(implementation = ManagementApiSchema.DataAddressSchema.class))), + content = @Content(schema = @Schema(implementation = ApiCoreSchema.DataAddressSchema.class))), @ApiResponse(responseCode = "400", description = "Request was malformed, e.g. id was null", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class)))), @ApiResponse(responseCode = "404", description = "An EDR data address with the given transfer process ID does not exist", diff --git a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java index 0ec87e4a3..fa3da5a30 100644 --- a/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java +++ b/edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java @@ -335,7 +335,7 @@ public Stream provideArguments(ExtensionContext extensionCo return Stream.of( Arguments.of(frameworkPolicy(Map.of(CX_POLICY_NS + "Membership", "active")), "MembershipCredential"), Arguments.of(frameworkPolicy(Map.of(CX_POLICY_NS + "FrameworkAgreement.pcf", "active")), "PCF Use Case (legacy notation)"), - Arguments.of(frameworkPolicy(Map.of(CX_POLICY_NS + "FrameworkAgreement", "pcf")), "PCF Use Case (new notation)"), + Arguments.of(frameworkPolicy(Map.of(CX_POLICY_NS + "FrameworkAgreement", "Pcf")), "PCF Use Case (new notation)"), Arguments.of(frameworkPolicy(Map.of(CX_POLICY_NS + "Dismantler", "active")), "Dismantler Credential"), Arguments.of(frameworkPolicy(Map.of(CX_POLICY_NS + "Dismantler.activityType", "vehicleDismantle")), "Dismantler Cred (activity type)"), Arguments.of(frameworkPolicy(CX_POLICY_NS + "Dismantler.allowedBrands", Operator.IS_ANY_OF, List.of("Moskvich", "Tatra")), "Dismantler allowedBrands (IS_ANY_OF, one intersects)"), diff --git a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java index 1d4134ecd..57ed0daaf 100644 --- a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java +++ b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java @@ -35,7 +35,7 @@ public class RuntimeConfig { private final Endpoint publicApi = new Endpoint(URI.create("http://localhost:%d/public".formatted(getFreePort()))); - private final Endpoint signalingApi = new Endpoint(URI.create("http://localhost:%d/signaling".formatted(getFreePort()))); + private final Endpoint controlApi = new Endpoint(URI.create("http://localhost:%d/control".formatted(getFreePort()))); private final Endpoint refreshApi = publicApi; private final Endpoint defaultApi = new Endpoint(URI.create("http://localhost:%d/api".formatted(getFreePort()))); @@ -50,8 +50,8 @@ public Map baseConfig() { put("web.http.port", String.valueOf(defaultApi.url().getPort())); put("web.http.public.path", publicApi.url().getPath()); put("web.http.public.port", String.valueOf(publicApi.url().getPort())); - put("web.http.signaling.path", signalingApi.url().getPath()); - put("web.http.signaling.port", String.valueOf(signalingApi.url().getPort())); + put("web.http.control.path", controlApi.url().getPath()); + put("web.http.control.port", String.valueOf(controlApi.url().getPort())); put("edc.iam.issuer.id", "did:web:" + UUID.randomUUID()); put("edc.iam.sts.oauth.token.url", "http://sts.example.com/token"); put("edc.iam.sts.oauth.client.id", "test-clientid"); @@ -66,8 +66,8 @@ public Endpoint getPublicApi() { return publicApi; } - public Endpoint getSignalingApi() { - return signalingApi; + public Endpoint getControlApi() { + return controlApi; } public Endpoint getRefreshApi() { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dc33d7b39..d0e3180bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ format.version = "1.1" [versions] -edc = "0.6.4" +edc = "0.7.0" apache-sshd = "2.12.1" assertj = "3.25.3" awaitility = "4.2.1" @@ -68,6 +68,7 @@ edc-controlplane-callback-staticendpoint = { module = "org.eclipse.edc:callback- edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" } edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" } edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" } +edc-api-core = { module = "org.eclipse.edc:api-core", version.ref = "edc" } edc-api-management-test-fixtures = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" } edc-api-catalog = { module = "org.eclipse.edc:catalog-api", version.ref = "edc" } edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" } diff --git a/samples/multi-tenancy/src/test/resources/tenants.properties b/samples/multi-tenancy/src/test/resources/tenants.properties index 4e072948a..5100eb12d 100644 --- a/samples/multi-tenancy/src/test/resources/tenants.properties +++ b/samples/multi-tenancy/src/test/resources/tenants.properties @@ -22,6 +22,8 @@ edc.tenants.one.web.http.port=18181 edc.tenants.one.web.http.path=/api edc.tenants.one.web.http.protocol.port=18282 edc.tenants.one.web.http.protocol.path=/protocol +edc.tenants.one.web.http.control.port=18283 +edc.tenants.one.web.http.control.path=/control edc.tenants.one.tx.edc.iam.iatp.bdrs.server.url=http://bdrs.test.com edc.tenants.one.edc.iam.issuer.id=did:web:tenant1 edc.tenants.two.edc.any=any @@ -29,5 +31,7 @@ edc.tenants.two.web.http.port=28181 edc.tenants.two.web.http.path=/api edc.tenants.two.web.http.protocol.port=28282 edc.tenants.two.web.http.protocol.path=/protocol +edc.tenants.two.web.http.control.port=28283 +edc.tenants.two.web.http.control.path=/control edc.tenants.two.tx.edc.iam.iatp.bdrs.server.url=http://bdrs.test.com edc.tenants.two.edc.iam.issuer.id=did:web:tenant2 From d621224422c1661602a9fe09c8b65d4d6acfe842 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Wed, 22 May 2024 18:00:01 +0200 Subject: [PATCH 34/37] fix(ci): add Mocked EDC to automatic artefact release (#1324) --- .github/workflows/publish.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7da9f01dd..34ec2d3ca 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -78,7 +78,8 @@ jobs: { dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault }, { dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault }, { dir: edc-dataplane, img: edc-dataplane-azure-vault }, - { dir: edc-dataplane, img: edc-dataplane-hashicorp-vault } ] + { dir: edc-dataplane, img: edc-dataplane-hashicorp-vault }, + { dir: edc-tests/runtime, img: mock-connector }] permissions: contents: write steps: From a33c1a21552697a5c45472b57bff008b40946578 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Thu, 23 May 2024 10:34:46 +0200 Subject: [PATCH 35/37] chore: updates policies examples (#1326) --- docs/usage/management-api-walkthrough/02_policies.md | 4 ++-- docs/usage/management-api-walkthrough/07_edrs.md | 2 +- .../usage/management-api-walkthrough/08_contractagreements.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/usage/management-api-walkthrough/02_policies.md b/docs/usage/management-api-walkthrough/02_policies.md index 99915c3fe..106488721 100644 --- a/docs/usage/management-api-walkthrough/02_policies.md +++ b/docs/usage/management-api-walkthrough/02_policies.md @@ -53,7 +53,7 @@ Content-Type: application/json "constraint": { "leftOperand": "FrameworkAgreement", "operator": "eq", - "rightOperand": "pcf" + "rightOperand": "Pcf:" } } ] @@ -233,7 +233,7 @@ Agreement. The signing of the Agreement should be checked at the time of contrac "constraint": { "leftOperand": "FrameworkAgreement", "operator": "eq", - "rightOperand": "traceability" + "rightOperand": "Traceability:" } } ] diff --git a/docs/usage/management-api-walkthrough/07_edrs.md b/docs/usage/management-api-walkthrough/07_edrs.md index 28ea20968..64b55a9fe 100644 --- a/docs/usage/management-api-walkthrough/07_edrs.md +++ b/docs/usage/management-api-walkthrough/07_edrs.md @@ -60,7 +60,7 @@ Content-Type: application/json "or": { "leftOperand": "FrameworkAgreement", "operator": "eq", - "rightOperand": "pcf" + "rightOperand": "Pcf:" } } } diff --git a/docs/usage/management-api-walkthrough/08_contractagreements.md b/docs/usage/management-api-walkthrough/08_contractagreements.md index 0539ecb00..561ae6c05 100644 --- a/docs/usage/management-api-walkthrough/08_contractagreements.md +++ b/docs/usage/management-api-walkthrough/08_contractagreements.md @@ -31,7 +31,7 @@ A Contract Agreement looks like this: "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "pcf" + "odrl:rightOperand": "Pcf" } } }, From f207da4d6c5959b7406a961c4621a686da2ff203 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Thu, 23 May 2024 14:51:50 +0200 Subject: [PATCH 36/37] chore: manually bump the previous version --- charts/tractusx-connector-azure-vault/Chart.yaml | 4 ++-- charts/tractusx-connector-azure-vault/README.md | 4 ++-- charts/tractusx-connector-memory/Chart.yaml | 4 ++-- charts/tractusx-connector-memory/README.md | 4 ++-- charts/tractusx-connector/Chart.yaml | 4 ++-- charts/tractusx-connector/README.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/Chart.yaml b/charts/tractusx-connector-azure-vault/Chart.yaml index 12965ca6c..79fad04fd 100644 --- a/charts/tractusx-connector-azure-vault/Chart.yaml +++ b/charts/tractusx-connector-azure-vault/Chart.yaml @@ -41,12 +41,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.7.0" +appVersion: "0.7.1" home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector sources: - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 0469d2aa2..0ae063be0 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -1,6 +1,6 @@ # tractusx-connector-azure-vault -![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square) +![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included. @@ -44,7 +44,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev -helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.7.0 \ +helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.7.1 \ -f /tractusx-connector-azure-vault-test.yaml \ --set vault.azure.name=$AZURE_VAULT_NAME \ --set vault.azure.client=$AZURE_CLIENT_ID \ diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml index 8b18212ed..eb4ab3379 100644 --- a/charts/tractusx-connector-memory/Chart.yaml +++ b/charts/tractusx-connector-memory/Chart.yaml @@ -35,12 +35,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.7.0" +appVersion: "0.7.1" home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory sources: - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index 754a54cde..b6c361113 100644 --- a/charts/tractusx-connector-memory/README.md +++ b/charts/tractusx-connector-memory/README.md @@ -1,6 +1,6 @@ # tractusx-connector-memory -![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square) +![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please only use this for development or testing purposes, never in production workloads! @@ -41,7 +41,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev -helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.0 \ +helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.1 \ -f /tractusx-connector-memory-test.yaml \ --set vault.secrets="client-secret:$YOUR_CLIENT_SECRET" ``` diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml index 5d24a9893..2129ea80e 100644 --- a/charts/tractusx-connector/Chart.yaml +++ b/charts/tractusx-connector/Chart.yaml @@ -41,12 +41,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.7.0" +appVersion: "0.7.1" home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector sources: - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index 8e3572fd2..3997df6fd 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -1,6 +1,6 @@ # tractusx-connector -![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square) +![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included. @@ -44,7 +44,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev -helm install my-release tractusx-edc/tractusx-connector --version 0.7.0 \ +helm install my-release tractusx-edc/tractusx-connector --version 0.7.1 \ -f /tractusx-connector-test.yaml ``` From 292b53cf8e76f1adbfd7e8434c5305cd42f32772 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 23 May 2024 13:01:36 +0000 Subject: [PATCH 37/37] Prepare release 0.7.2 --- charts/tractusx-connector-azure-vault/Chart.yaml | 4 ++-- charts/tractusx-connector-azure-vault/README.md | 4 ++-- charts/tractusx-connector-memory/Chart.yaml | 4 ++-- charts/tractusx-connector-memory/README.md | 4 ++-- charts/tractusx-connector/Chart.yaml | 4 ++-- charts/tractusx-connector/README.md | 4 ++-- gradle.properties | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/Chart.yaml b/charts/tractusx-connector-azure-vault/Chart.yaml index 79fad04fd..c9653d591 100644 --- a/charts/tractusx-connector-azure-vault/Chart.yaml +++ b/charts/tractusx-connector-azure-vault/Chart.yaml @@ -41,12 +41,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.1 +version: 0.7.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.7.1" +appVersion: "0.7.2" home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector sources: - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 0ae063be0..73bbef67b 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -1,6 +1,6 @@ # tractusx-connector-azure-vault -![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square) +![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included. @@ -44,7 +44,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev -helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.7.1 \ +helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.7.2 \ -f /tractusx-connector-azure-vault-test.yaml \ --set vault.azure.name=$AZURE_VAULT_NAME \ --set vault.azure.client=$AZURE_CLIENT_ID \ diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml index eb4ab3379..1e0e29f6f 100644 --- a/charts/tractusx-connector-memory/Chart.yaml +++ b/charts/tractusx-connector-memory/Chart.yaml @@ -35,12 +35,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.1 +version: 0.7.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.7.1" +appVersion: "0.7.2" home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory sources: - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index b6c361113..e979c39b5 100644 --- a/charts/tractusx-connector-memory/README.md +++ b/charts/tractusx-connector-memory/README.md @@ -1,6 +1,6 @@ # tractusx-connector-memory -![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square) +![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please only use this for development or testing purposes, never in production workloads! @@ -41,7 +41,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev -helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.1 \ +helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.2 \ -f /tractusx-connector-memory-test.yaml \ --set vault.secrets="client-secret:$YOUR_CLIENT_SECRET" ``` diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml index 2129ea80e..c2c6abd07 100644 --- a/charts/tractusx-connector/Chart.yaml +++ b/charts/tractusx-connector/Chart.yaml @@ -41,12 +41,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.1 +version: 0.7.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.7.1" +appVersion: "0.7.2" home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector sources: - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index 3997df6fd..a76a0aa0a 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -1,6 +1,6 @@ # tractusx-connector -![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square) +![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included. @@ -44,7 +44,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev -helm install my-release tractusx-edc/tractusx-connector --version 0.7.1 \ +helm install my-release tractusx-edc/tractusx-connector --version 0.7.2 \ -f /tractusx-connector-test.yaml ``` diff --git a/gradle.properties b/gradle.properties index 62d5c3a7d..60a8856fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.eclipse.tractusx.edc -version=0.7.2-SNAPSHOT +version=0.7.2 # configure the build: txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git