Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies

# Conflicts: # CHANGELOG.md
sovity · Jul 16, 2024 · a91c94c · a91c94c
2 parents 6e27fc6 + 329bfc4
commit a91c94c
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 297 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,5 @@
 # Env variables for docker-compose.yaml
-EDC_IMAGE=ghcr.io/sovity/edc-dev:8.1.0
-TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:8.1.0
-EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:3.2.2
+EDC_IMAGE=ghcr.io/sovity/edc-dev:9.0.0
+TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:9.0.0
+EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:4.0.0
 EDC_UI_ACTIVE_PROFILE=sovity-open-source
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
@@ -32,14 +32,15 @@ Feel free to edit this release checklist in-progress depending on what tasks nee
     - [ ] Add a clean `Unreleased` version.
     - [ ] Add the version to the old section.
     - [ ] Add the current date to the old version.
+    - [ ] Add all relevant changelog entries from the newer EDC UI release(s), merge and reword them.
+    - [ ] Add all deployment migration notes from the newer EDC UI release(s), merge and reword them.
     - [ ] Check the commit history for commits that might be product-relevant and thus should be added to the
           changelog. Maybe they were forgotten.
     - [ ] Write or review the `Deployment Migration Notes` section, check the commit history for changed / added
           configuration properties.
+    - [ ] Reorder, reword or combine changelog entries from a product perspective for consistency.
     - [ ] Write or review a release summary.
     - [ ] Write or review the compatible versions section.
-    - [ ] Add a link to the EDC UI Release to the "EDC UI" section.
-    - [ ] Add a link to the EDC UI Release Deployment Migration Notes from the Deployment Migration section if the EDC UI has Deployment Migration Notes.
     - [ ] Remove empty sections from the patch notes.
   - [ ] Replace the existing `docker-compose.yaml` with `docker-compose-dev.yaml`.
   - [ ] Set the version for `EDC_IMAGE` of

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,15 +13,47 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 - The `UiPolicy` model has been adjusted to support complex expressions including `AND`, `OR` and `XOR`.
   - Removed the "Policy Definition Create" endpoint from the incomplete Use Case API in favor of the UI Endpoint with the `UiPolicy` model, which is more robust.
-- The Broker has been removed in favor of the Authority Portal and the new Deployment Unit, the "Data Catalog Crawler":
+
+#### Minor Changes
+
+#### 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 }}`
+  - Dev Catalog Crawler: `ghcr.io/sovity/catalog-crawler-dev:{{ VERSION }}`
+  - Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:{{ VERSION }}`
+- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}`
+
+## [9.0.0] - 2024-07-15
+
+### Overview
+
+MDS 2.2 intermediate release
+
+### Detailed Changes
+
+#### Major Changes
+
+- API Wrapper UI API: Data sources are now well-typed.
+- The Broker has been removed in favor of the Authority Portal:
+  - A new Deployment Unit, the ["Data Catalog Crawler"](extensions/catalog-crawler/README.md), has been added. 
   - Each "Data Catalog Crawler" connects to an existing Authority Portal Deployment's DB.
   - Each "Data Catalog Crawler" is responsible for crawling exactly one environment.
   - The Data Catalog functionality of the Broker has been integrated into the Authority Portal.
-- API Wrapper UI API: Moved to well-typed data sources, breaking changes to the asset model and API.
 
 #### Minor Changes
 
-- Add the SovityMessenger extension
+- Additional ToS check during contract negotiation via the UI.
+- "On Request" Data Offers
+  - Full support in the API Wrapper UI API
+  - Create support in the Connector UI. Full support in the UI is still in progress.
+- Added the `sovity-messenger` extension for easy Connector-to-Connector messages.
 
 #### Patch Changes
 
@@ -30,14 +62,23 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 ### Deployment Migration Notes
 
 - Connector:
-  - The database migration system has been moved from multiple migration history tables to a single one. Although this
-    process has been extensively tested in the enterprise edition already, it should be tested once more on a copy of a productive connector.
+  - The database migration system has been moved from multiple migration history tables to a single one.
 - Broker:
   - The broker has been removed. For Authority Portal users, please check out the new 
     [Data Catalog Crawler Productive Deployment Guide](docs/deployment-guide/goals/catalog-crawler-production/README.md). 
   - Any previous broker deployment's database is not required anymore.
   - Please care that only some environment variables look similar. It is recommended to create fresh deployments.
 
+#### Compatible Versions
+
+- Connector Backend Docker Images:
+  - Dev EDC: `ghcr.io/sovity/edc-dev:9.0.0`
+  - sovity EDC CE: `ghcr.io/sovity/edc-ce:9.0.0`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:9.0.0`
+  - Dev Catalog Crawler: `ghcr.io/sovity/catalog-crawler-dev:9.0.0`
+  - Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:9.0.0`
+- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:4.0.0`
+
 ## [8.1.0] - 2024-06-14
 
 ### Overview

diff --git a/SUMMARY.md b/SUMMARY.md
@@ -19,8 +19,6 @@
 * [Deployment Goal: Local Demo](./docs/deployment-guide/goals/local-demo)
 * [Deployment Goal: Development](./docs/deployment-guide/goals/development)
 * [Deployment Goal: Production](./docs/deployment-guide/goals/production)
-    * [Productive Deployment Guide](./docs/deployment-guide/goals/production)
-    * [Productive Deployment Guide 4.2.0 / MS8 / MDS 1.2](docs/deployment-guide/goals/production/4.2.0/README.md)
 
 ## Developer Documentation
 

diff --git a/docs/deployment-guide/goals/catalog-crawler-production/README.md b/docs/deployment-guide/goals/catalog-crawler-production/README.md
@@ -51,5 +51,5 @@ EDC_OAUTH_CERTIFICATE_ALIAS: 1
 EDC_OAUTH_PRIVATE_KEY_ALIAS: 1
 ```
 
-All pre-configured config values for either the catalog crawler can be found
+Additional available configuration options can be found
 in [launcher/.env.catalog-crawler](../../../../launchers/.env.catalog-crawler).
diff --git a/docs/deployment-guide/goals/development/README.md b/docs/deployment-guide/goals/development/README.md
@@ -16,7 +16,7 @@ the [docker-compose-dev.yaml](../../../../docker-compose-dev.yaml), execute:
 <thead>
 <tr>
 <th>Launch two sovity EDC CE Connectors</th>
-<th>Launch two MDS EDC CE</th>
+<th>Launch two MDS EDC CE Connectors</th>
 </tr>
 </thead>
 <tbody>

diff --git a/docs/deployment-guide/goals/local-demo/4.2.0/README.md b/docs/deployment-guide/goals/local-demo/4.2.0/README.md
diff --git a/docs/deployment-guide/goals/local-demo/README.md b/docs/deployment-guide/goals/local-demo/README.md
@@ -1,8 +1,6 @@
 Deployment Goal: Local Demo
 ========
 
-> This is for our latest version. There is another guide for [4.2.0](4.2.0/README.md).
-
 > On how to deploy a productive connector with joining an existing Data Space, please refer
 > to our [Productive Deployment Guide](../production/README.md).
 
@@ -15,7 +13,7 @@ start [docker-compose.yaml](../../../../docker-compose.yaml) file.
 <thead>
 <tr>
 <th>Launch two sovity EDC CE Connectors</th>
-<th>Launch two MDS EDC CE</th>
+<th>Launch two MDS EDC CE Connectors</th>
 </tr>
 </thead>
 <tbody>

diff --git a/docs/deployment-guide/goals/production/4.2.0/README.md b/docs/deployment-guide/goals/production/4.2.0/README.md