chore: Prepare release (#463)

.env

@@ -1,4 +1,4 @@
 # Config for docker-compose.yaml
-BROKER_IMAGE=ghcr.io/sovity/broker-server-dev:4.0.0
-EDC_IMAGE=ghcr.io/sovity/edc-dev:7.2.2
+BROKER_IMAGE=ghcr.io/sovity/broker-server-dev:4.1.0
+EDC_IMAGE=ghcr.io/sovity/edc-dev:7.3.0
 EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:3.0.0

CHANGELOG.md

@@ -25,6 +25,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Broker UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI_VERSION }}`
 - Sovity EDC CE: {{ CE Release Link }}
 
+## [v4.1.0] - 2024-04-02
+
+### Overview
+
+Pull changes from EDC CE 7.3.0 into the broker.
+
+### Detailed Changes
+
+#### Minor
+
+- Bumped EDC version to 7.3.0:
+  - Broker UI: Support for UIAsset's `customJsonAsString` and `customJsonLdAsString`, along with their private counterparts.
+
+### Deployment Migration Notes
+
+#### Compatible Versions
+
+- Broker Backend Docker Image: `ghcr.io/sovity/broker-server-ce:4.1.0`
+- Broker UI Docker Image: `ghcr.io/sovity/edc-ui:3.0.0`
+- Sovity EDC CE: [`7.3.0`](https://github.com/sovity/edc-extensions/releases/tag/v7.3.0)
+
 ## [v4.0.0] - 2024-03-22
 
 ### Overview

extensions/broker-server/src/test/java/de/sovity/edc/ext/brokerserver/services/refreshing/ConnectorUpdaterTest.java

@@ -124,12 +124,12 @@ void testConnectorUpdate() {
             assertThat(asset.getHttpDatasourceHintsProxyPath()).isFalse();
             assertThat(asset.getHttpDatasourceHintsProxyQueryParams()).isFalse();
             assertThat(asset.getHttpDatasourceHintsProxyBody()).isFalse();
-            assertThat(asset.getAdditionalProperties())
-                    .containsExactlyEntriesOf(Map.of("http://unknown/a", "x"));
-            assertThat(dataOffer.getAsset().getAdditionalJsonProperties())
-                    .containsExactlyEntriesOf(Map.of("http://unknown/b", "{\"http://unknown/c\":\"y\"}"));
-            assertThat(dataOffer.getAsset().getPrivateProperties()).isEmpty();
-            assertThat(dataOffer.getAsset().getPrivateJsonProperties()).isEmpty();
+            assertThat(asset.getCustomJsonAsString())
+                    .isEqualTo("{\"a\":\"x\"}");
+            assertThat(dataOffer.getAsset().getCustomJsonLdAsString())
+                    .isEqualTo("{\"http://unknown/b\":{\"http://unknown/c\":\"y\"}}");
+            assertThat(dataOffer.getAsset().getPrivateCustomJsonAsString()).isNull();
+            assertThat(dataOffer.getAsset().getPrivateCustomJsonLdAsString()).isEqualTo("{}");
             var policy = contractOffer.getContractPolicy();
             assertThat(policy.getConstraints()).hasSize(1);
             AssertionUtils.assertEqualUsingJson(policy.getConstraints().get(0), createAfterYesterdayConstraint());
@@ -191,10 +191,10 @@ private String createAsset() {
                 Prop.Edc.METHOD, "GET",
                 Prop.Edc.BASE_URL, "http://some.url"
             ))
-            .additionalProperties(Map.of("http://unknown/a", "x"))
-            .additionalJsonProperties(Map.of("http://unknown/b", "{\"http://unknown/c\":\"y\"}"))
-            .privateProperties(Map.of("http://unknown/a-private", "x-private"))
-            .privateJsonProperties(Map.of("http://unknown/b-private", "{\"http://unknown/c-private\":\"y-private\"}"))
+            .customJsonAsString("{\"a\":\"x\"}")
+            .customJsonLdAsString("{\"http://unknown/b\":{\"http://unknown/c\":\"y\"}}")
+            .privateCustomJsonAsString("{\"a-private\":\"x-private\"}")
+            .privateCustomJsonLdAsString("{\"http://unknown/b-private\":{\"http://unknown/c-private\":\"y-private\"}}")
             .build()).getId();
     }
 }

gradle.properties

@@ -3,7 +3,7 @@ sovityBrokerServerGroup=de.sovity.broker
 sovityBrokerServerVersion=0.0.1-SNAPSHOT
 
 # Sovity EDC Extensions (for common api model)
-sovityEdcExtensionsVersion=7.2.2
+sovityEdcExtensionsVersion=7.3.0
 sovityEdcExtensionGroup=de.sovity.edc.ext
 sovityEdcGroup=de.sovity.edc