Bump EDC to 0.8.1 (#1469)

* build(deps): bump EDC to 0.8.1 * build(deps): bump EDC to 0.8.1
eclipse-tractusx · Jul 29, 2024 · 2be7d26 · 2be7d26
1 parent 984d523
commit 2be7d26
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 236 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts
@@ -20,6 +20,7 @@
 
 plugins {
     `java-library`
+    id(libs.plugins.swagger.get().pluginId)
 }
 
 dependencies {

diff --git a/...n/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_5__Add_Profiles.sql b/...n/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_5__Add_Profiles.sql
@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2024 Contributors to the Eclipse Foundation
+--
+--  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
+--
+--  SPDX-License-Identifier: Apache-2.0
+--
+--  Contributors:
+--       Contributors to the Eclipse Foundation - initial API and implementation
+--
+
+-- add columns
+ALTER TABLE edc_policydefinitions ADD COLUMN profiles JSON;
diff --git a/...alog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/FederatedCatalogTest.java b/...alog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/FederatedCatalogTest.java
@@ -76,13 +76,12 @@ void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
             await().pollInterval(ASYNC_POLL_INTERVAL)
                     .atMost(ASYNC_TIMEOUT)
                     .untilAsserted(() -> {
-                        // act
                         CONSUMER.getFederatedCatalog()
-                                .log().ifError()
+                                .log().ifValidationFails()
                                 .statusCode(200)
                                 .contentType(JSON)
                                 .body("size()", is(1))
-                                .body("[0].'http://www.w3.org/ns/dcat#dataset'.'@id'", equalTo("test-asset"));
+                                .body("[0].'dcat:dataset'.'@id'", equalTo("test-asset"));
                     });
         }
     }

diff --git a/...res/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PgRuntimeExtension.java b/...res/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PgRuntimeExtension.java
@@ -103,7 +103,7 @@ private void createDatabase() {
         try (var connection = DriverManager.getConnection(baseJdbcUrl() + "postgres", postgreSqlContainer.getUsername(), postgreSqlContainer.getPassword())) {
             connection.createStatement().execute(String.format("create database %s;", postgreSqlContainer.getDatabaseName()));
         } catch (SQLException ignored) {
-
+            // ignored
         }
     }
 }
diff --git a/...time/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java b/...time/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java
@@ -80,13 +80,14 @@ public AssetService mockAssetService(ServiceExtensionContext context) {
     @Provider
     public CatalogService mockCatalogService() {
         return new CatalogService() {
+
             @Override
-            public CompletableFuture<StatusResult<byte[]>> requestCatalog(String counterPartyId, String counterPartyAddress, String protocol, QuerySpec querySpec) {
+            public CompletableFuture<StatusResult<byte[]>> requestCatalog(String s, String s1, String s2, QuerySpec querySpec, String... strings) {
                 return null;
             }
 
             @Override
-            public CompletableFuture<StatusResult<byte[]>> requestDataset(String id, String counterPartyId, String counterPartyAddress, String protocol) {
+            public CompletableFuture<StatusResult<byte[]>> requestDataset(String s, String s1, String s2, String s3) {
                 return null;
             }
         };
@@ -117,4 +118,4 @@ public TransferProcessService mockTransferProcessService() {
         return new TransferProcessServiceStub(new ResponseQueue(recordedRequests, monitor));
     }
 
-}
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.8.0"
-fc = "0.8.1-20240719-SNAPSHOT"
+edc = "0.8.1"
+fc = "0.8.1"
 assertj = "3.26.3"
 awaitility = "4.2.1"
 aws = "2.26.25"