Fix: Release/0.12.0 (#165)

* fix: update Transformer Constructors #139 (#157)

* fix: update Transformer Constructors #139

* fix: add needed extensions for connector build, bump restassured version #139

* fix: set version-tag to non Snapshot version

* fix: remove dependencie

Author: janpmeyer

e2e-tests/src/test/java/com/huawei/cloud/fixtures/HuaweiParticipant.java

@@ -56,6 +56,7 @@ public Config controlPlaneConfig() {
                 put("web.http.public.port", String.valueOf(getFreePort()));
                 put("edc.dsp.callback.address", controlPlaneProtocol.get().toString());
                 put("edc.connector.name", name);
+                put("edc.hostname", name);
                 put("edc.component.id", "connector-test");
                 put("edc.dataplane.token.validation.endpoint", "http://token-validation.com");
                 put("edc.dpf.selector.url", "http://does-this-matter.com");

e2e-tests/src/test/java/com/huawei/cloud/tests/ObsTransferEndToEndTest.java

@@ -14,7 +14,6 @@
 
 package com.huawei.cloud.tests;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huawei.cloud.fixtures.HuaweiParticipant;
 import com.huawei.cloud.obs.ObsBucketSchema;
 import com.huawei.cloud.obs.TestFunctions;
@@ -24,12 +23,12 @@
 import jakarta.json.JsonObject;
 import org.eclipse.edc.connector.api.signaling.transform.from.JsonObjectFromDataFlowStartMessageTransformer;
 import org.eclipse.edc.connector.api.signaling.transform.to.JsonObjectToDataFlowResponseMessageTransformer;
-import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
 import org.eclipse.edc.spi.result.Failure;
+import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.transfer.DataFlowStartMessage;
 import org.eclipse.edc.spi.types.domain.transfer.FlowType;
@@ -57,6 +56,7 @@
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.junit.testfixtures.TestUtils.getFileFromResourceName;
+import static org.mockito.Mockito.mock;
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 @Testcontainers
@@ -109,7 +109,7 @@ public class ObsTransferEndToEndTest {
     private String providerEndpoint;
 
     private final TypeTransformerRegistry registry = new TypeTransformerRegistryImpl();
-    private ObjectMapper mapper;
+    private final TypeManager typeManager = mock();
 
     @BeforeEach
     void setup() {
@@ -120,9 +120,8 @@ void setup() {
         consumerClient = TestFunctions.createClient(CONSUMER_AK, CONSUMER_SK, consumerEndpoint);
 
         var builderFactory = Json.createBuilderFactory(Map.of());
-        mapper = JacksonJsonLd.createObjectMapper();
-        registry.register(new JsonObjectFromDataFlowStartMessageTransformer(builderFactory, mapper));
-        registry.register(new JsonObjectFromDataAddressDspaceTransformer(builderFactory, mapper));
+        registry.register(new JsonObjectFromDataFlowStartMessageTransformer(builderFactory, typeManager, "test"));
+        registry.register(new JsonObjectFromDataAddressDspaceTransformer(builderFactory, typeManager, "test"));
         registry.register(new JsonObjectToDataAddressDspaceTransformer());
         registry.register(new JsonObjectToDataFlowResponseMessageTransformer());
     }

gradle.properties

@@ -13,7 +13,7 @@
 #
 
 group=com.huawei.cloud
-version=0.12.0-SNAPSHOT
+version=0.12.0
 # configure the build:
 # used for publishing artifacts and plugins
 hcScmConnection=scm:git:[email protected]:huawei-dataspace-components/components.git

gradle/libs.versions.toml

@@ -3,10 +3,10 @@ format.version = "1.1"
 
 [versions]
 awaitility = "4.2.2"
-edc = "0.12.0-SNAPSHOT"
+edc = "0.12.0"
 failsafe = "3.3.2"
 junit = "5.11.3"
-restAssured = "5.4.0"
+restAssured = "5.5.1"
 testcontainers = "1.20.3"
 huawei-obs = "3.24.12"
 huawei-iam = "3.1.130"
@@ -19,8 +19,10 @@ edc-api-controlplane = { module = "org.eclipse.edc:control-plane-api", version.r
 edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
 edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
+edc-common-core = { module = "org.eclipse.edc:common-core", version.ref = "edc" }
 edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 edc-control-api-configuration = { module = "org.eclipse.edc:control-api-configuration", version.ref = "edc" }
+edc-control-transfer = { module = "org.eclipse.edc:control-plane-transfer", version.ref = "edc" }
 edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
 edc-core-controlplane = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
 edc-core-controlplane-apiclient = { module = "org.eclipse.edc:control-plane-api-client", version.ref = "edc" }
@@ -38,6 +40,7 @@ edc-controlplane-spi = { module = "org.eclipse.edc:control-plane-spi", version.r
 edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
 edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
+edc-query-lib = { module = "org.eclipse.edc:query-lib", version.ref = "edc" }
 edc-spi-contract = { module = "org.eclipse.edc:contract-spi", version.ref = "edc" }
 edc-spi-policy = { module = "org.eclipse.edc:policy-spi", version.ref = "edc" }
 edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }