chore(deps): bump edc-connector-version from 0.7.0 to 0.11.1 in /backend

DEPENDENCIES_BACKEND

@@ -1,6 +1,6 @@
 maven/mavencentral/ch.qos.logback/logback-classic/1.5.6, EPL-1.0 AND LGPL-2.1-only, approved, #15279
 maven/mavencentral/ch.qos.logback/logback-core/1.5.6, EPL-1.0 AND LGPL-2.1-only, approved, #15210
-maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #15200
+maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.1, Apache-2.0, approved, #15200
 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.17.1, Apache-2.0 AND MIT, approved, #13665
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2.0, approved, #13671
@@ -53,17 +53,19 @@ maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
 maven/mavencentral/org.awaitility/awaitility/4.2.1, Apache-2.0, approved, #14178
 maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
 maven/mavencentral/org.eclipse.angus/angus-activation/2.0.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus
-maven/mavencentral/org.eclipse.edc/boot-spi/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/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/policy-model/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/transform-spi/0.7.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/boot-spi/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/core-spi/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld-lib/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld-spi/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-model/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transform-spi/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/validator-lib/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/validator-spi/0.11.1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.parsson/parsson/1.1.7, EPL-2.0, approved, ee4j.parsson
 maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl
 maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl
 maven/mavencentral/org.glassfish.jaxb/txw2/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl
-maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, #17677
 maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/6.0.6.Final, LGPL-2.1-only, approved, #6962

README.md

@@ -14,8 +14,8 @@ Beside the dependencies provided in the Helm Chart, the following dependencies h
 
 | Application                                                                                                       | App Version | Chart Version |
 |-------------------------------------------------------------------------------------------------------------------|-------------|---------------|
-| [Tractus-X Connector](https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector)       | 0.8.0       | 0.8.0         |
-| [Digital Twin Registry](https://github.com/eclipse-tractusx/sldt-digital-twin-registry/tree/main/charts/registry) | 0.5.0       | 0.5.0         |
+| [Tractus-X Connector](https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector)       | 0.9.0       | 0.9.0         |
+| [Digital Twin Registry](https://github.com/eclipse-tractusx/sldt-digital-twin-registry/tree/main/charts/registry) | 0.7.0       | 0.7.0         |
 
 ## Overview of Implemented Standards
 

backend/pom.xml

@@ -47,7 +47,7 @@
         <postgresql.version>42.7.3</postgresql.version>
         <snakeyaml.version>2.2</snakeyaml.version>
         <springdoc.version>2.5.0</springdoc.version>
-        <edc-connector-version>0.7.0</edc-connector-version>
+        <edc-connector-version>0.11.1</edc-connector-version>
     </properties>
     <dependencies>
         <dependency>

local/docker-compose.yaml

@@ -86,7 +86,7 @@
       - "host.docker.internal:host-gateway" # Adjusts container's host file to allow for communication with docker-host machine
 
   dtr-customer:
-    image: tractusx/sldt-digital-twin-registry:0.5.0
+    image: tractusx/sldt-digital-twin-registry:0.7.0
     container_name: dtr-customer
     depends_on:
       postgres-all:
@@ -234,15 +234,15 @@
     extra_hosts:
       - "host.docker.internal:host-gateway" # Adjusts container's host file to allow for communication with docker-host machine
 
   puris-backend-supplier:
     image: puris-backend:dev
     container_name: supplier-backend
     depends_on:
       edc-supplier-control-plane:
         condition: service_started #service_healthy
       postgres-all:
         condition: service_healthy
       dtr-supplier:
         condition: service_healthy
     ports:
       - "127.0.0.1:8082:8082"
@@ -262,7 +262,7 @@
       - "host.docker.internal:host-gateway" # Adjusts container's host file to allow for communication with docker-host machine
 
   dtr-supplier:
-    image: tractusx/sldt-digital-twin-registry:0.5.0
+    image: tractusx/sldt-digital-twin-registry:0.7.0
     container_name: dtr-supplier
     depends_on:
       postgres-all:
@@ -322,7 +322,7 @@
     extra_hosts:
       - "host.docker.internal:host-gateway" # Adjusts container's host file to allow for communication with docker-host machine
 
   edc-supplier-data-plane:
     depends_on:
       postgres-all:
         condition: service_healthy

local/tractus-x-edc/config/customer/control-plane.properties

@@ -1,6 +1,6 @@
 # API
-web.http.default.port=8180
-web.http.default.path=/api
+web.http.port=8180
+web.http.path=/api
 # MANAGEMENT (replaced data in 0.3.0)
 web.http.management.port=8181
 web.http.management.path=/management
@@ -16,13 +16,16 @@ web.http.catalog.path=/catalog
 web.http.catalog.auth.type=tokenbased
 web.http.catalog.auth.key=${EDC_API_PW}
 
+# TX EDC 0.9.0, Upstream 0.11.0, enable with https://github.com/eclipse-tractusx/puris/issues/783
+#edc.policy.validation.enabled=true
+
 edc.participant.id=BPNL4444444444XX
 edc.component.id=customer-controlplane-component-id
 edc.api.auth.key=${EDC_API_PW}
 edc.dsp.callback.address=http://customer-control-plane:8184/api/v1/dsp
 edc.hostname=customer-control-plane
 # IATP
-tx.iam.iatp.bdrs.server.url=http://bdrs:8582/api/directory
+tx.edc.iam.iatp.bdrs.server.url=http://bdrs:8582/api/directory
 tx.iam.iatp.bdrs.validity=600
 # iatp / dim
 edc.iam.issuer.id=did:web:mock-util-service/customer
@@ -32,7 +35,7 @@ edc.iam.sts.oauth.client.id=${CUSTOMER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${CUSTOMER_OAUTH_SECRET_ALIAS}
 tx.edc.iam.sts.dim.url=http://mock-util-service:80/sts
 # configure one Credential service for all (else pulled from did, nevertheless done)
-tx.iam.iatp.credentialservice.url=http://mock-util-service:80
+tx.edc.iam.iatp.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving
 edc.iam.did.web.use.https=false
 # old MIW config (<0.7.0), can be ignored till MIW is back

local/tractus-x-edc/config/customer/data-plane.properties

@@ -5,6 +5,8 @@ web.http.path=/api
 web.http.control.port=8281
 web.http.control.path=/control
 # Public
+# note will be deprecated with upstream 0.12.0, tx edc 0.9.0 relies on 0.11.0
+#edc.dataplane.url.public=http://customer-data-plane:8285/api/public
 web.http.public.port=8285
 web.http.public.path=/api/public
 # new in 0.7.0 data plane signalling, replaced control
@@ -28,8 +30,10 @@ edc.datasource.default.user=${PG_USER}
 edc.datasource.default.password=${PG_PW}
 
 # token refresh
-edc.dataplane.token.expiry=300
-edc.dataplane.token.expiry.tolerance=10
+# Optional endpoint for an OAuth2 token refresh. Default endpoint is `<PUBLIC_API>/token`
+tx.edc.dataplane.token.refresh.endpoint=http://customer-data-plane:8285/api/public
+tx.edc.dataplane.token.expiry=300
+tx.edc.dataplane.token.expiry.tolerance=10
 # optional endpoint
 #edc.dataplane.token.refresh.endpoint=
 edc.transfer.proxy.token.signer.privatekey.alias=${CUSTOMER_PRIVATE_KEY_ALIAS}
@@ -40,7 +44,7 @@ edc.participant.id=BPNL4444444444XX
 edc.iam.sts.oauth.token.url=http://keycloak:8080/realms/miw_test/protocol/openid-connect/token
 edc.iam.sts.oauth.client.id=${CUSTOMER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${CUSTOMER_OAUTH_SECRET_ALIAS}
-edc.iam.sts.dim.url=http://mock-util-service:80/sts
+tx.edc.iam.sts.dim.url=http://mock-util-service:80/sts
 # configure one Credential service for all (else pulled from did): https://github.com/eclipse-tractusx/tractusx-edc/blob/d7d3586ffc4ef03c858e38fde6bfa8687efa50c9/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java#L50
 tx.iam.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving in catalog request

local/tractus-x-edc/config/supplier/control-plane.properties

@@ -1,6 +1,6 @@
 # API
-web.http.default.port=9180
-web.http.default.path=/api
+web.http.port=9180
+web.http.path=/api
 # MANAGEMENT (replaced data in 0.3.0)
 web.http.management.port=9181
 web.http.management.path=/management
@@ -16,14 +16,17 @@ web.http.catalog.path=/catalog
 web.http.catalog.auth.type=tokenbased
 web.http.catalog.auth.key=${EDC_API_PW}
 
+# TX EDC 0.9.0, Upstream 0.11.0, enable with https://github.com/eclipse-tractusx/puris/issues/783
+edc.policy.validation.enabled=false
+
 JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:1044
 edc.participant.id=BPNL1234567890ZZ
 edc.component.id=supplier-controlplane-component-id
 edc.api.auth.key=${EDC_API_PW}
 edc.dsp.callback.address=http://supplier-control-plane:9184/api/v1/dsp
 edc.hostname=supplier-control-plane
 # IATP
-tx.iam.iatp.bdrs.server.url=http://bdrs:8582/api/directory
+tx.edc.iam.iatp.bdrs.server.url=http://bdrs:8582/api/directory
 tx.iam.iatp.bdrs.validity=600
 # iatp / dim
 edc.iam.issuer.id=did:web:mock-util-service/supplier
@@ -33,7 +36,7 @@ edc.iam.sts.oauth.client.id=${SUPPLIER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${SUPPLIER_OAUTH_SECRET_ALIAS}
 tx.edc.iam.sts.dim.url=http://mock-util-service:80/sts
 # configure one Credential service for all (else pulled from did, nevertheless done)
-tx.iam.iatp.credentialservice.url=http://mock-util-service:80
+tx.edc.iam.iatp.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving
 edc.iam.did.web.use.https=false
 # old MIW config (<0.7.0), can be ignored till MIW is back

local/tractus-x-edc/config/supplier/data-plane.properties

@@ -5,6 +5,8 @@ web.http.path=/api
 web.http.control.port=9281
 web.http.control.path=/control
 # Public
+# note will be deprecated with upstream 0.12.0, tx edc 0.9.0 relies on 0.11.0
+#edc.dataplane.url.public=http://supplier-data-plane:9285/api/public
 web.http.public.port=9285
 web.http.public.path=/api/public
 # new in 0.7.0 data plane signalling, replaced control
@@ -28,8 +30,10 @@ edc.datasource.default.user=${PG_USER}
 edc.datasource.default.password=${PG_PW}
 
 # token refresh
-edc.dataplane.token.expiry=300
-edc.dataplane.token.expiry.tolerance=10
+# Optional endpoint for an OAuth2 token refresh. Default endpoint is `<PUBLIC_API>/token`
+tx.edc.dataplane.token.refresh.endpoint=http://supplier-data-plane:9285/api/public
+tx.edc.dataplane.token.expiry=300
+tx.edc.dataplane.token.expiry.tolerance=10
 # optional endpoint
 #edc.dataplane.token.refresh.endpoint=
 edc.transfer.proxy.token.signer.privatekey.alias=${SUPPLIER_PRIVATE_KEY_ALIAS}
@@ -40,7 +44,7 @@ edc.participant.id=BPNL1234567890ZZ
 edc.iam.sts.oauth.token.url=http://keycloak:8080/realms/miw_test/protocol/openid-connect/token
 edc.iam.sts.oauth.client.id=${SUPPLIER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${SUPPLIER_OAUTH_SECRET_ALIAS}
-edc.iam.sts.dim.url=http://mock-util-service:80/sts
+tx.edc.iam.sts.dim.url=http://mock-util-service:80/sts
 # configure one Credential service for all (else pulled from did): https://github.com/eclipse-tractusx/tractusx-edc/blob/d7d3586ffc4ef03c858e38fde6bfa8687efa50c9/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java#L50
 tx.iam.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving in catalog request

local/tractus-x-edc/docker-compose.yaml

@@ -20,14 +20,14 @@
 #
 
 services:
   control-plane:
-    image: tractusx/edc-controlplane-postgresql-hashicorp-vault:0.8.0
+    image: tractusx/edc-controlplane-postgresql-hashicorp-vault:0.9.0-rc2
     volumes:
       - ./config/default/opentelemetry.properties:/app/opentelemetry.properties
       - ./config/default/logging.properties:/app/logging.properties
 
   data-plane:
-    image: tractusx/edc-dataplane-hashicorp-vault:0.8.0
+    image: tractusx/edc-dataplane-hashicorp-vault:0.9.0-rc2
     volumes:
       - ./config/default/opentelemetry.properties:/app/opentelemetry.properties
       - ./config/default/logging.properties:/app/logging.properties