Merge branch 'main' into merge-main-dev

eclipse-tractusx · Aug 25, 2023 · 12bafe9 · 12bafe9
2 parents eb7eb64 + 372290b
commit 12bafe9
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 204 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,6 +24,7 @@ on:
     tags:
       - 'v*.*.*'
       - '!v*.*.*-RC*'
+      - '!v*.*.*-iam'
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/release_iam-seeding.yml b/.github/workflows/release_iam-seeding.yml
@@ -22,7 +22,7 @@ name: Release IAM Seeding
 on:
   push:
     tags:
-      - 'iam-v*.*.*'
+      - 'v*.*.*-iam'
   workflow_dispatch:
 
 env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/NOTICE.md b/NOTICE.md
@@ -42,6 +42,11 @@ This project uses and has modified the following code:
 * Licence Path: https://github.com/lvermeulen/Keycloak.Net/blob/main/LICENSE
 * Source URL: https://github.com/lvermeulen/Keycloak.Net
 
+This project uses the following image content:
+
+* Image: Catena-X Logo
+* Source URL: https://catena-x.net
+
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

diff --git a/docker/notice-provisioning-service.md b/docker/notice-provisioning-service.md
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.6.0</VersionPrefix>
-    <VersionSuffix>RC8</VersionSuffix>
+    <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/mailing/Mailing.Template/Images/Catena-X long.license b/src/mailing/Mailing.Template/Images/Catena-X long.license