chore: prepare release (#413)

sovity · Feb 15, 2024 · 796ac76 · 796ac76
2 parents ae069bf + 0d22a3b
commit 796ac76
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 28 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
 # Config for docker-compose.yaml
-BROKER_IMAGE=ghcr.io/sovity/broker-server-dev:3.2.0
-EDC_IMAGE=ghcr.io/sovity/edc-dev:7.1.1
-EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:2.3.1
+BROKER_IMAGE=ghcr.io/sovity/broker-server-dev:3.3.0
+EDC_IMAGE=ghcr.io/sovity/edc-dev:7.2.0
+EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:2.4.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,15 +14,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Major
 
 #### Minor
-- Add new MDS fields and migrate existing MDS asset keys to mobilityDCAT-AP 
+
+#### Patch
+
+### Deployment Migration Notes
+
+#### Compatible Versions
+
+## [v3.3.0] - 2024-02-14
+
+### Overview
+
+MDS bugfix and feature release
+
+### Detailed Changes
+
+#### Minor
+- Assets now have new MDS fields
 
 ### Deployment Migration Notes
 
+_No special deployment migration steps required_
+
 #### Compatible Versions
 
-- Broker Backend Docker Image: `ghcr.io/sovity/broker-server-ce:{{ CE_VERSION }}`
-- Broker UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI_VERSION }}`
-- Sovity EDC CE: {{ CE Release Link }}
+- Broker Backend Docker Image: `ghcr.io/sovity/broker-server-ce:3.3.0`
+- Broker UI Docker Image: `ghcr.io/sovity/edc-ui:2.4.0`
+- Sovity EDC CE: [`7.2.0`](https://github.com/sovity/edc-extensions/releases/tag/v7.2.0)
 
 ## [v3.2.0] - 2024-01-18
 

diff --git a/...oker-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/CatalogApiTest.java b/...oker-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/CatalogApiTest.java
@@ -214,28 +214,28 @@ void testAvailableFilters_noFilter() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd1 = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category-1",
-                Prop.Mobility.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
-                Prop.Mobility.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2",
-                Prop.Mobility.DATA_MODEL, "my-data-model",
-                Prop.Mobility.GEO_REFERENCE_METHOD, "my-geo-ref"
+                Prop.Mds.DATA_CATEGORY, "my-category-1",
+                Prop.Mds.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
+                Prop.Mds.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2",
+                Prop.Mds.DATA_MODEL, "my-data-model",
+                Prop.Mds.GEO_REFERENCE_METHOD, "my-geo-ref"
             ));
 
             var assetJsonLd2 = getAssetJsonLd("my-asset-2", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category-1",
-                Prop.Mobility.TRANSPORT_MODE, "my-transport-mode-2",
-                Prop.Mobility.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2"
+                Prop.Mds.DATA_CATEGORY, "my-category-1",
+                Prop.Mds.TRANSPORT_MODE, "my-transport-mode-2",
+                Prop.Mds.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2"
             ));
 
             var assetJsonLd3 = getAssetJsonLd("my-asset-3", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category-1",
-                Prop.Mobility.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
-                Prop.Mobility.DATA_SUBCATEGORY, "my-subcategory-1"
+                Prop.Mds.DATA_CATEGORY, "my-category-1",
+                Prop.Mds.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
+                Prop.Mds.DATA_SUBCATEGORY, "my-subcategory-1"
             ));
 
             var assetJsonLd4 = getAssetJsonLd("my-asset-4", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category-1",
-                Prop.Mobility.TRANSPORT_MODE, ""
+                Prop.Mds.DATA_CATEGORY, "my-category-1",
+                Prop.Mds.TRANSPORT_MODE, ""
             ));
 
             createOrganizationMetadata(dsl, "MDSL123456AA", "Test Org");
@@ -348,12 +348,12 @@ void testAvailableFilters_withFilter() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd1 = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category",
-                Prop.Mobility.DATA_SUBCATEGORY, "my-subcategory"
+                Prop.Mds.DATA_CATEGORY, "my-category",
+                Prop.Mds.DATA_SUBCATEGORY, "my-subcategory"
             ));
 
             var assetJsonLd2 = getAssetJsonLd("my-asset-2", Map.of(
-                Prop.Mobility.DATA_SUBCATEGORY, "my-other-subcategory"
+                Prop.Mds.DATA_SUBCATEGORY, "my-other-subcategory"
             ));
 
             createConnector(dsl, today, "https://my-connector/api/dsp");

diff --git a/...er-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/ConnectorApiTest.java b/...er-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/ConnectorApiTest.java
@@ -63,7 +63,7 @@ void testQueryConnectors() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category",
+                Prop.Mds.DATA_CATEGORY, "my-category",
                 Prop.Dcterms.TITLE, "My Asset 1"
             ));
 
@@ -89,7 +89,7 @@ void testQueryConnectorDetails() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category",
+                Prop.Mds.DATA_CATEGORY, "my-category",
                 Prop.Dcterms.TITLE, "My Asset 1"
             ));
 

diff --git a/...ver/src/test/java/de/sovity/edc/ext/brokerserver/services/api/DataOfferDetailApiTest.java b/...ver/src/test/java/de/sovity/edc/ext/brokerserver/services/api/DataOfferDetailApiTest.java
@@ -63,12 +63,12 @@ void testQueryDataOfferDetails() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd1 = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category",
+                Prop.Mds.DATA_CATEGORY, "my-category",
                 Prop.Dcterms.TITLE, "My Asset 1"
             ));
 
             var assetJsonLd2 = getAssetJsonLd("my-asset-2", Map.of(
-                Prop.Mobility.DATA_CATEGORY, "my-category-2",
+                Prop.Mds.DATA_CATEGORY, "my-category-2",
                 Prop.Dcterms.TITLE, "My Asset 2"
             ));
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ sovityBrokerServerGroup=de.sovity.broker
 sovityBrokerServerVersion=0.0.1-SNAPSHOT
 
 # Sovity EDC Extensions (for common api model)
-sovityEdcExtensionsVersion=0.0.1-SNAPSHOT
+sovityEdcExtensionsVersion=7.2.0
 sovityEdcExtensionGroup=de.sovity.edc.ext
 sovityEdcGroup=de.sovity.edc