feat: upgrade to TX EDC 0.7

.github/workflows/build.yml

@@ -90,12 +90,12 @@
           submodules: recursive
 
       # Setup build environment
       - uses: ./.github/actions/setup-java
 
       # Enable deployment access (on main branch and version tags only)
       - name: Login to GitHub Container Registry
         if: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' ||  startsWith(github.ref, 'refs/tags/v')) }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ steps.set-docker-repo.outputs.REGISTRY }}
           # Use existing DockerHub credentials present as secrets
@@ -139,7 +139,7 @@
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Agent Plane Hashicorp Container Build and push
         uses: docker/build-push-action@v5
         with:
           context: agent-plane/agentplane-hashicorp
           file: agent-plane/agentplane-hashicorp/src/main/docker/Dockerfile
@@ -151,7 +151,7 @@
       # Important step to push image description to DockerHub - since this is version independent, we always take it from main
       - name: Update Docker Hub description for Agent Plane Hashicorp
         if: ${{ steps.set-docker-repo.outputs.REPO == 'docker.io' && github.ref == 'refs/heads/main' }}
         uses: peter-evans/dockerhub-description@v3
         with:
           readme-filepath: agent-plane/agentplane-hashicorp/README.md
           username: ${{ secrets.DOCKER_HUB_USER }}
@@ -161,7 +161,7 @@
       # Create SemVer or ref tags dependent of trigger event
       - name: Docker Meta Agent Plane Azure Vault
         id: meta-azr
         uses: docker/metadata-action@v5
         with:
           images: |
             ${{ steps.set-docker-repo.outputs.REPO }}/agentplane-azure-vault
@@ -177,7 +177,7 @@
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Agent Plane Azure Vault Container Build and push
         uses: docker/build-push-action@v5
         with:
           context: agent-plane/agentplane-azure-vault/.
           file: agent-plane/agentplane-azure-vault/src/main/docker/Dockerfile

.github/workflows/helm-chart-lint.yml

@@ -62,7 +62,7 @@
           fetch-depth: 0
 
       - name: Set up Helm
         uses: azure/setup-helm@v3
         with:
           version: v3.10.3
 
@@ -71,7 +71,7 @@
           python-version: 3.9
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed

.github/workflows/trivy.yml

@@ -104,7 +104,7 @@
       # Enable repository access (on main branch and version tags only)
       - name: Login to GitHub Container Registry
         if: ${{ ( github.ref == 'refs/heads/main' ||  startsWith(github.ref, 'refs/tags/v')) }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ steps.set-docker-repo.outputs.REGISTRY }}
           # Use existing DockerHub credentials present as secrets
@@ -132,6 +132,6 @@
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: success() && steps.imageCheck.outcome != 'failure'
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: "trivy-results-${{ matrix.image }}.sarif"

agent-plane/agent-plane-protocol/pom.xml

@@ -304,7 +304,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>netty-nio-client</artifactId>
-            <version>2.20.94</version>
+            <version>2.20.153</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -343,12 +343,6 @@
          <artifactId>mockito-core</artifactId>
          <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-            <version>${jakarta.validation.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.edc</groupId>
             <artifactId>jersey-core</artifactId>

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/TupleSet.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.jena.ext.com.google.common.collect.ArrayListMultimap;
+import com.github.jsonldjava.shaded.com.google.common.collect.ArrayListMultimap;
 
 /**
  * Implementation of a compact representation of
@@ -33,7 +33,7 @@
  */
 public class TupleSet {
 
-    ArrayListMultimap<String,String> bindings=ArrayListMultimap.create();
+    ArrayListMultimap<String,String> bindings= ArrayListMultimap.create();
     List<TupleSet> explodes=new ArrayList<>();
 
     /**

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/http/transfer/AgentSource.java

@@ -85,7 +85,7 @@ protected StreamResult<Stream<Part>> openMatchmaking() {
         // Agent call, we translate from KA-MATCH to KA-TRANSFER
         String skill=null;
         String graph=null;
-        String asset= request.getSourceDataAddress().getProperties().get(AgentSourceHttpParamsDecorator.ASSET_PROP_ID);
+        String asset= String.valueOf(request.getSourceDataAddress().getProperties().get(AgentSourceHttpParamsDecorator.ASSET_PROP_ID));
         if(asset!=null && asset.length() > 0) {
             Matcher graphMatcher= AgentExtension.GRAPH_PATTERN.matcher(asset);
             if(graphMatcher.matches()) {

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/http/transfer/AgentSourceHttpParamsDecorator.java

@@ -141,13 +141,13 @@ public HttpRequestParams.Builder decorate(DataFlowRequest request, HttpDataAddre
         Map<String,List<String>> queryParams=parseParams("?"+getRequestQueryParams(address,request));
 
         if(isTransferRequest(request)) {
-            if(!address.getProperty(BASE_URL).endsWith(SLASH)) {
-                params.baseUrl(address.getProperty(BASE_URL)+SLASH);
+            if(!address.getStringProperty(BASE_URL).endsWith(SLASH)) {
+                params.baseUrl(address.getStringProperty(BASE_URL)+SLASH);
             }
         } else {
             // we need to annotate the base url "pure" because we do not directly hit the endpoint
             params.baseUrl("https://w3id.org/catenax");
-            params.header(DataspaceServiceExecutor.TARGET_URL_SYMBOL.getSymbol(), address.getProperty(BASE_URL));
+            params.header(DataspaceServiceExecutor.TARGET_URL_SYMBOL.getSymbol(), address.getStringProperty(BASE_URL));
 
             // there is the case where a KA-BIND protocol call is
             // one-to-one routed through the transfer plane ... in which case
@@ -165,7 +165,7 @@ public HttpRequestParams.Builder decorate(DataFlowRequest request, HttpDataAddre
                 queryParams.remove(QUERY_PARAM);
                 mergeParams(queryParams,bodyParams);
             }
-            String accept=address.getProperty(ACCEPT_HEADER,null);
+            String accept=address.getStringProperty(ACCEPT_HEADER,null);
             List<String> cxAccepts=queryParams.getOrDefault(CX_ACCEPT_PARAM,List.of());
             queryParams.remove(CX_ACCEPT_PARAM);
             if(accept==null) {

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/sparql/DataspaceServiceExecutor.java

@@ -323,7 +323,7 @@ public QueryIterator createExecution(OpService opOriginal, String serviceURL, Se
                 }
             }
             // the asset type should be annotated in the rdf type property
-            assetType=endpoint.getProperties().getOrDefault("http://www.w3.org/1999/02/22-rdf-syntax-ns#type",assetType);
+            assetType=String.valueOf(endpoint.getProperties().getOrDefault("http://www.w3.org/1999/02/22-rdf-syntax-ns#type",assetType));
 
             // put the endpoint information into a new service operator
             // and cater for the EDC public api slash problem

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/sparql/SparqlQueryProcessor.java

@@ -189,7 +189,7 @@ protected void executeAction(AgentHttpAction action) {
      * @param targetProperties a set of address properties of the asset to invoke
      * @return simulated ok response
      */
-    public Response execute(Request request, String skill, String graph, Map<String,String> targetProperties) {
+    public Response execute(Request request, String skill, String graph, Map<String,Object> targetProperties) {
 
         // wrap jakarta into java.servlet
         HttpServletContextAdapter contextAdapter=new HttpServletContextAdapter(request);
@@ -208,12 +208,14 @@ public Response execute(Request request, String skill, String graph, Map<String,
         action.getContext().set(DataspaceServiceExecutor.AUTH_CODE_SYMBOL,targetProperties.getOrDefault(DataspaceServiceExecutor.AUTH_CODE_SYMBOL.getSymbol(),null));
         action.getContext().set(ARQConstants.sysOptimizerFactory,optimizerFactory);
         if(targetProperties.containsKey(DataspaceServiceExecutor.ALLOW_SYMBOL.getSymbol())) {
-            action.getContext().set(DataspaceServiceExecutor.ALLOW_SYMBOL,Pattern.compile(targetProperties.get(DataspaceServiceExecutor.ALLOW_SYMBOL.getSymbol())));
+            action.getContext().set(DataspaceServiceExecutor.ALLOW_SYMBOL,
+                    Pattern.compile(String.valueOf(targetProperties.get(DataspaceServiceExecutor.ALLOW_SYMBOL.getSymbol()))));
         } else {
             action.getContext().set(DataspaceServiceExecutor.ALLOW_SYMBOL,config.getServiceAssetAllowPattern());
         }
         if(targetProperties.containsKey(DataspaceServiceExecutor.DENY_SYMBOL.getSymbol())) {
-            action.getContext().set(DataspaceServiceExecutor.DENY_SYMBOL,Pattern.compile(targetProperties.get(DataspaceServiceExecutor.DENY_SYMBOL.getSymbol())));
+            action.getContext().set(DataspaceServiceExecutor.DENY_SYMBOL,
+                    Pattern.compile(String.valueOf(targetProperties.get(DataspaceServiceExecutor.DENY_SYMBOL.getSymbol()))));
         } else {
             action.getContext().set(DataspaceServiceExecutor.DENY_SYMBOL,config.getServiceAssetDenyPattern());
         }

pom.xml

@@ -37,24 +37,23 @@
         <maven.compiler.target>11</maven.compiler.target>
         <skipTests>false</skipTests>
 
-        <junit.version>5.9.3</junit.version>
+        <junit.version>5.10.1</junit.version>
         <mockito.version>5.4.0</mockito.version>
-        <tx.edc.version>0.5.0</tx.edc.version>
-        <edc.version>0.1.3</edc.version>
+        <tx.edc.version>0.6.0-rc1</tx.edc.version>
+        <edc.version>0.3.1</edc.version>
         <failsafe.version>3.3.2</failsafe.version>
         <okhttp.version>4.11.0</okhttp.version>
-        <okio.version>3.4.0</okio.version>
-        <slf4j.version>2.0.7</slf4j.version>
+        <okio.version>3.6.0</okio.version>
+        <slf4j.version>2.0.9</slf4j.version>
         <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
-        <jakarta.validation.version>3.0.2</jakarta.validation.version>
-        <com.nimbusds.version>9.31</com.nimbusds.version>
+        <com.nimbusds.version>9.35</com.nimbusds.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <jetty-jakarta-servlet-api.version>5.0.2</jetty-jakarta-servlet-api.version>
-        <org.apache.jena.version>4.8.0</org.apache.jena.version>
-        <com.azure.azure-identity.version>1.9.1</com.azure.azure-identity.version>
-        <com.azure.azure-security-keyvault-secrets.version>4.6.2</com.azure.azure-security-keyvault-secrets.version>
-        <org.yaml.snakeyaml.version>2.0</org.yaml.snakeyaml.version>
-        <net.minidev.jsonsmart.version>2.4.11</net.minidev.jsonsmart.version>
+        <org.apache.jena.version>4.9.0</org.apache.jena.version>
+        <com.azure.azure-identity.version>1.10.1</com.azure.azure-identity.version>
+        <com.azure.azure-security-keyvault-secrets.version>4.6.5</com.azure.azure-security-keyvault-secrets.version>
+        <org.yaml.snakeyaml.version>2.2</org.yaml.snakeyaml.version>
+        <net.minidev.jsonsmart.version>2.5.0</net.minidev.jsonsmart.version>
 
         <!-- Source characteristics -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>