chore: update for edc 0.15.1 and tx 0.12.0

Author: eschrewe

edc-controlplane/edc-controlplane-construct-x/con-x-controlplane-postgresql-hashicorp-vault/build.gradle.kts

@@ -26,16 +26,17 @@ plugins {
 }
 
 dependencies {
-    val edcVersion = "0.14.1"
-    val txVersion = "0.11.2"
+    val edcVersion = "0.15.1"
+    val txVersion = "0.12.0"
     implementation("org.eclipse.edc:controlplane-dcp-bom:$edcVersion")
     implementation("org.eclipse.edc:controlplane-feature-sql-bom:$edcVersion")
 
     implementation("org.eclipse.edc:vault-hashicorp:$edcVersion")
+
     implementation("org.eclipse.tractusx.edc:agreements:$txVersion")
     implementation("org.eclipse.tractusx.edc:retirement-evaluation-store-sql:$txVersion")
     implementation("org.eclipse.tractusx.edc:control-plane-migration:$txVersion")
-    implementation("org.eclipse.tractusx.edc:tx-dcp:${txVersion}")
+    implementation("org.eclipse.tractusx.edc:tx-dcp:$txVersion")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

edc-controlplane/edc-controlplane-construct-x/local/README.md

@@ -17,7 +17,7 @@ It will start the following containers on your local machine:
 
 Before anything else, please make sure you have the docker images for con-x-controlplane-postgresql-hashicorp-vault in your local docker repository, see [here](../con-x-controlplane-postgresql-hashicorp-vault/README.md) and [here](../../../edc-dataplane/edc-dataplane-construct-x/con-x-dataplane-postgresql-hashicorp-vault/README.md). 
 
-Beyond that, you need to obtain the docker images needed to run the identity hub and the issuer services. In order to do so, please checckout this [repository](https://github.com/FraunhoferISST/dev-identity-services) and clone it onto your local machine. The upper section of this [README](https://github.com/FraunhoferISST/dev-identity-services/blob/main/runtimes/dev/README.md) informs 
+Beyond that, you need to obtain the docker images needed to run the identity hub and the issuer services. In order to do so, please check out this [repository](https://github.com/FraunhoferISST/dev-identity-services) and clone it onto your local machine. The upper section of this [README](https://github.com/FraunhoferISST/dev-identity-services/blob/main/runtimes/dev/README.md) informs 
 you about the steps necessary to create the docker images. 
 
 

edc-controlplane/edc-controlplane-construct-x/local/docker-compose.yaml

@@ -65,7 +65,6 @@ services:
   shared-postgres:
     container_name: shared-postgres
     image: postgres:16.4-alpine
-    pull_policy: if_not_present
     environment:
       - POSTGRES_USER=admin
       - POSTGRES_PASSWORD=password
@@ -82,7 +81,6 @@ services:
   shared-vault:
     container_name: shared-vault
     image: vault:1.13.3
-    pull_policy: if_not_present
     command: server -dev -dev-root-token-id=vaultsecret0123456789 -dev-listen-address=0.0.0.0:8200
     environment:
       VAULT_ADDR: http://0.0.0.0:8200
@@ -101,7 +99,6 @@ services:
   vault-init:
     container_name: vault-init
     image: alpine:3.19
-    pull_policy: if_not_present
     depends_on:
       shared-vault:
         condition: service_healthy
@@ -243,8 +240,8 @@ services:
     depends_on:
         shared-postgres:
           condition: service_healthy
-        shared-vault:
-          condition: service_healthy
+        vault-init:
+          condition: service_completed_successfully
     entrypoint: [ "java", "-jar", "edc-runtime.jar", "--log-level=DEBUG" ]
     ports:
       - "5005:5005"   # Debugger
@@ -288,8 +285,8 @@ services:
     depends_on:
       shared-postgres:
         condition: service_healthy
-      shared-vault:
-        condition: service_healthy
+      vault-init:
+        condition: service_completed_successfully
     entrypoint: [ "java", "-jar", "edc-runtime.jar", "--log-level=DEBUG" ]
     ports:
       - "5008:5005"   # Debugger
@@ -347,22 +344,21 @@ services:
     depends_on:
         shared-postgres:
           condition: service_healthy
-        shared-vault:
-          condition: service_healthy
+        vault-init:
+          condition: service_completed_successfully
     entrypoint: [ "java", "-jar", "edc-runtime.jar", "--log-level=DEBUG" ]
     ports:
       - "5006:5005"   # Debugger
       - "39000:9000"  # Default port
       - "39010:9010"  # Management API
       - "39020:9020" # DSP API
-
     networks:
       - con-x-test-network
 
   provider-dataplane:
     container_name: provider-dataplane
     image: con-x-dataplane-postgresql-hashicorp-vault:latest
-    pull_policy: if_not_present
+    pull_policy: never
     environment:
       - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005
       - web.http.public.port=9500
@@ -390,12 +386,11 @@ services:
       - edc.iam.sts.oauth.token.url=http://provider-idhub:9292/api/sts/token
       - edc.iam.sts.oauth.client.id=did:web:provider-idhub:user:provider
       - edc.iam.issuer.id=did:web:provider-idhub:user:provider
-
     depends_on:
       shared-postgres:
         condition: service_healthy
-      shared-vault:
-        condition: service_healthy
+      vault-init:
+        condition: service_completed_successfully
     entrypoint: [ "java", "-jar", "edc-runtime.jar", "--log-level=DEBUG" ]
     ports:
       - "5007:5005"   # Debugger

edc-dataplane/edc-dataplane-construct-x/con-x-dataplane-postgresql-hashicorp-vault/build.gradle.kts

@@ -30,14 +30,16 @@ configurations.all {
 }
 
 dependencies {
-    val edcVersion = "0.14.1"
-    val txVersion = "0.11.2"
+    val edcVersion = "0.15.1"
+    val txVersion = "0.12.0"
     implementation("org.eclipse.edc:dataplane-base-bom:$edcVersion")
-    implementation("org.eclipse.edc:dataplane-feature-sql-bom:${edcVersion}")
-    implementation("org.eclipse.edc:vault-hashicorp:${edcVersion}")
+    implementation("org.eclipse.edc:dataplane-feature-sql-bom:$edcVersion")
+    implementation("org.eclipse.edc:vault-hashicorp:$edcVersion")
+
+    implementation("org.eclipse.edc:participant-context-config-core:${edcVersion}")
 
     implementation("org.eclipse.tractusx.edc:dataplane-public-api-v2:$txVersion")
-    implementation("org.eclipse.tractusx.edc:dataplane-util:${txVersion}")
+    implementation("org.eclipse.tractusx.edc:dataplane-util:$txVersion")
 }