From c0d63fe0a303d9092450ece5d5707adaa3c89287 Mon Sep 17 00:00:00 2001
From: Kamil Czaja <kamil.czaja@sovity.de>
Date: Fri, 13 Dec 2024 16:02:05 +0100
Subject: [PATCH 1/2] chore: release prep 10.5.0

---
 CHANGELOG.md                                  | 38 ++++++++++++++++---
 docs/api/sovity-edc-api-wrapper.yaml          |  4 +-
 .../java/de/sovity/edc/e2e/DatasetTest.java   |  8 ++--
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13930bef8..11d0081ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,37 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 #### Minor Changes
 
-- Only return `Datasets` with valid `Offers` ([#1065](https://github.com/sovity/edc-ce/issues/1065))
+#### Patch Changes
+
+### Deployment Migration Notes
+
+#### Compatible Versions
+
+- Connector Backend Docker Images:
+  - Dev EDC: `ghcr.io/sovity/edc-dev:{VERSION}`
+  - sovity EDC CE: `ghcr.io/sovity/edc-ce:{VERSION}`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:{VERSION}`
+- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{UI_VERSION}`
+
+## [10.5.0] - 2024-12-13
+
+### Overview
+
+MDS Patch Update
+
+### Detailed Changes
+
+#### Minor Changes
+
+- Catalog now only returns `Datasets` with valid `Offers` ([#1065](https://github.com/sovity/edc-ce/issues/1065))
 
 #### Patch Changes
 
-- Fix issues with the Create Data Offer Endpoint ([PR#1055](https://github.com/sovity/edc-ce/pull/1055))
+- EDC UI:
+  - Fix wrong placeholders for On Request data offer type
+    ([#878](https://github.com/sovity/edc-ui/issues/878))
+  - Rearrange Sidebar Navigation Groups
+    ([#836](https://github.com/sovity/edc-ui/issues/836))
 
 ### Deployment Migration Notes
 
@@ -26,10 +52,10 @@ _No special deployment migration steps required_
 #### Compatible Versions
 
 - Connector Backend Docker Images:
-  - Dev EDC: `ghcr.io/sovity/edc-dev:{{ VERSION }}`
-  - sovity EDC CE: `ghcr.io/sovity/edc-ce:{{ VERSION }}`
-  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:{{ VERSION }}`
-- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}`
+  - Dev EDC: `ghcr.io/sovity/edc-dev:10.5.0`
+  - sovity EDC CE: `ghcr.io/sovity/edc-ce:10.5.0`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:10.5.0`
+- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:4.1.8`
 
 ## [10.4.4] - 2024-12-09
 
diff --git a/docs/api/sovity-edc-api-wrapper.yaml b/docs/api/sovity-edc-api-wrapper.yaml
index a6400de63..83cd6cf1a 100644
--- a/docs/api/sovity-edc-api-wrapper.yaml
+++ b/docs/api/sovity-edc-api-wrapper.yaml
@@ -623,11 +623,11 @@ components:
     DataSourceType:
       type: string
       description: Supported Data Source Types by UiDataSource
+      default: CUSTOM
       enum:
       - HTTP_DATA
       - ON_REQUEST
       - CUSTOM
-      default: CUSTOM
     SecretValue:
       type: object
       properties:
@@ -835,6 +835,7 @@ components:
     UiDataSourceHttpDataMethod:
       type: string
       description: Supported HTTP Methods by UiDataSource
+      default: GET
       enum:
       - GET
       - POST
@@ -842,7 +843,6 @@ components:
       - PATCH
       - DELETE
       - OPTIONS
-      default: GET
     UiDataSourceOnRequest:
       required:
       - contactEmail
diff --git a/tests/src/test/java/de/sovity/edc/e2e/DatasetTest.java b/tests/src/test/java/de/sovity/edc/e2e/DatasetTest.java
index 7849715eb..3bca281c6 100644
--- a/tests/src/test/java/de/sovity/edc/e2e/DatasetTest.java
+++ b/tests/src/test/java/de/sovity/edc/e2e/DatasetTest.java
@@ -51,7 +51,7 @@ void canRetrieveOfferedDataset(
         // act & assert
         prepareDatasetApiCall(
                 consumerConnector,
-                providerConfig.getProtocolApiUrl(),
+                providerConfig.getProtocolEndpoint().getUri().toString(),
                 assetId)
                 .then()
                 .statusCode(200)
@@ -73,7 +73,7 @@ void canNotRetrieveNotOfferedDataset(
         // act & assert
         prepareDatasetApiCall(
                 consumerConnector,
-                providerConfig.getProtocolApiUrl(),
+                providerConfig.getProtocolEndpoint().getUri().toString(),
                 assetId)
                 .then()
                 .statusCode(502);
@@ -96,14 +96,14 @@ void canNotRetrieveNotOfferedDatasetIfValidOfferAvailable(
         // act & assert
         prepareDatasetApiCall(
                 consumerConnector,
-                providerConfig.getProtocolApiUrl(),
+                providerConfig.getProtocolEndpoint().getUri().toString(),
                 notOfferedAssetId)
                 .then()
                 .statusCode(502);
 
         prepareDatasetApiCall(
                 consumerConnector,
-                providerConfig.getProtocolApiUrl(),
+                providerConfig.getProtocolEndpoint().getUri().toString(),
                 offeredAssetId)
                 .then()
                 .statusCode(200)

From 9ef0bd4cf94b59f72ba3c1fe837b1f76ec92f231 Mon Sep 17 00:00:00 2001
From: Kamil Czaja <kamil.czaja@sovity.de>
Date: Fri, 13 Dec 2024 16:06:57 +0100
Subject: [PATCH 2/2] chore: bumped image versions in .env

---
 .env | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index b4154be21..5c991a034 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # Env variables for docker-compose.yaml
-EDC_IMAGE=ghcr.io/sovity/edc-dev:10.4.3
-TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:10.4.3
-EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:4.1.6
+EDC_IMAGE=ghcr.io/sovity/edc-dev:10.5.0
+TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:10.5.0
+EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:4.1.8
 EDC_UI_ACTIVE_PROFILE=sovity-open-source