Merge pull request #39 from catenax-ng/release/1.9.8

docs|chore: prepare release branch for final tagging
eclipse-tractusx · Sep 4, 2023 · ea5e8f2 · ea5e8f2
2 parents 90dea54 + 431ce6e
commit ea5e8f2
Show file tree

Hide file tree

Showing 34 changed files with 47,908 additions and 47,295 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,23 +25,21 @@ on:
   push:
     branches:
       - main
-      - 'releases/**'
+      - 'release/*'
+    tags:
+      - 'v*.*.*'
+      - 'v*.*.*-*'
   # Runs automatically on all code-related PRs to main and release branches
   pull_request:
     branches:
       - main
-      - 'releases/**'
+      - 'release/*'
     paths-ignore:
       - 'charts/**'
       - 'docs/**'
       - '**/*.md'
-  # Can be scheduled on all branches and version tags
+  # Manual workflow trigger
   workflow_dispatch:
-    tags:
-      - 'v*.*.*'
-      - 'v*.*.*-*'
-    branches:
-      - '*'
 
 # the docker registry and namespace
 env:
@@ -73,7 +71,7 @@ jobs:
       # Setup build environment
       - uses: ./.github/actions/setup-java
 
-      # Enabled deployment access (if either running on main or a version tag on eclipse-tractusx) 
+      # Enabled deployment access (if either running on main or a version tag on eclipse-tractusx)
       - name: Login to GitHub Container Registry
         if: ${{ github.repository == 'eclipse-tractusx/knowledge-agents-edc' && ( github.ref == 'refs/heads/main' ||  startsWith(github.ref, 'refs/tags/v')) }}
         uses: docker/login-action@v2
@@ -82,7 +80,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-      # Run Maven Deploy (if either running on main or a version tag on eclipse-tractusx) 
+      # Run Maven Deploy (if either running on main or a version tag on eclipse-tractusx)
       - name: Deploy Java via Maven
         if: ${{ github.repository == 'eclipse-tractusx/knowledge-agents-edc' && ( github.ref == 'refs/heads/main' ||  startsWith(github.ref, 'refs/tags/v')) }}
         run: |
@@ -107,15 +105,15 @@ jobs:
         with:
           images: |
             ${{ env.IMAGE_NAMESPACE }}/agentplane-hashicorp
-          # Automatically prepare image tags; See action docs for more examples. 
+          # Automatically prepare image tags; See action docs for more examples.
           # semver patter will generate tags like these for example :1 :1.2 :1.2.3
           tags: |
             type=sha,event=branch
             type=sha,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.9.5-SNAPSHOT,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.9.8,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Agent Plane Hashicorp Container Build and push
@@ -133,7 +131,7 @@ jobs:
         if: ${{ github.repository == 'eclipse-tractusx/knowledge-agents-edc'  && github.ref == 'refs/heads/main' }}
         uses: peter-evans/dockerhub-description@v3
         with:
-          readme-filepath: agent-plane/agentplane-hashicorp/README.md 
+          readme-filepath: agent-plane/agentplane-hashicorp/README.md
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
           repository: ${{ env.IMAGE_NAMESPACE }}/agentplane-hashicorp
@@ -145,15 +143,15 @@ jobs:
         with:
           images: |
             ${{ env.IMAGE_NAMESPACE }}/agentplane-azure-vault
-          # Automatically prepare image tags; See action docs for more examples. 
+          # Automatically prepare image tags; See action docs for more examples.
           # semver patter will generate tags like these for example :1 :1.2 :1.2.3
           tags: |
             type=sha,event=branch
             type=sha,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.9.5-SNAPSHOT,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.9.8,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Agent Plane Azure Vault Container Build and push
@@ -171,7 +169,7 @@ jobs:
         if: ${{ github.repository == 'eclipse-tractusx/knowledge-agents-edc'  && github.ref == 'refs/heads/main' }}
         uses: peter-evans/dockerhub-description@v3
         with:
-          readme-filepath: agent-plane/agentplane-azure-vault/README.md 
+          readme-filepath: agent-plane/agentplane-azure-vault/README.md
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
           repository: ${{ env.IMAGE_NAMESPACE }}/agentplane-azure-vault
diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml
@@ -25,14 +25,14 @@ on:
   push:
     branches:
       - main
-      - 'releases/**'
+      - 'release/*'
     paths:
       - .github/workflows/**
       - charts/**
   pull_request:
     branches:
       - main
-      - 'releases/**'
+      - 'release/*'
     paths:
       - .github/workflows/**
       - charts/**
@@ -76,11 +76,11 @@ jobs:
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
-          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+          changed=$(ct list-changed --target-branch ${{ github.base_ref || github.ref_name }})
           if [[ -n "$changed" ]]; then
             echo "CHART_CHANGED=true" >> $GITHUB_ENV
           fi
 
       # run chart linting
       - name: Run chart-testing (lint)
-        run: ct lint --target-branch ${{ github.event.repository.default_branch }} --config charts/config/chart-testing-config.yaml
+        run: ct lint --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml
diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
@@ -22,17 +22,14 @@ name: Release Charts
 on:
   # May be invoked manually
   workflow_dispatch:
-    branches:
-      - main
-      - 'releases/**'
   # Or by pushing to the chart dir of some dev/ release branch
   push:
     # prevent unnecessary GH action runs for files outside of charts folder
     paths:
       - 'charts/**'
     branches:
       - main
-      - 'releases/**'
+      - 'release/*'
 
 jobs:
   release:
@@ -60,4 +57,4 @@ jobs:
       - name: Run chart-releaser
         uses: helm/[email protected]
         env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -24,11 +24,11 @@ on:
   push:
     branches: 
      - main
-     - 'releases/**'
+     - 'release/*'
   pull_request:
     branches: 
       - main
-      - 'releases/**'
+      - 'release/*'
 
   workflow_dispatch:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@ All notable changes to this product will be documented in this file.
 
 # Released
 
-## [1.9.5] - 
+## [1.9.8] - 
 
 ### Added
 

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -213,8 +213,8 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.15, EPL-2.0 OR Apache-2.
 maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.9.5-20230831.070321-5, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.9.5-20230831.070252-7, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.9.8, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.9.8, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.5.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edc-dataplane-azure-vault/0.5.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edc-dataplane-base/0.5.0, Apache-2.0, approved, automotive.tractusx

diff --git a/NOTICE.md b/NOTICE.md
@@ -59,21 +59,21 @@ You may recreate an up-to-date DEPENDENCIES file by invoking
 ```
 
 We provide Software-Bill-Of-Material (SBOM) documents for each KA-EDC module for each release:
-* [EDC Common JWT Auth](common/auth-jwt/auth-jwt-1.9.5-SNAPSHOT-sbom.json)
-* [EDC Data Plane Agent Protocols](agent-plane/agent-plane-protocol/agent-plane-protocol-1.9.5-SNAPSHOT-sbom.json)
-* [EDC Agent Plane (Hashicorp Vault)](agent-plane/agent-plane-hashicorp/agent-plane-hashicorp-1.9.5-SNAPSHOT-sbom.json)
-* [EDC Agent Plane (Azure Vault)](agent-plane/agent-plane-azure-vault/agent-plane-azure-vault-1.9.5-SNAPSHOT-sbom.json)
+* [EDC Common JWT Auth](common/auth-jwt/auth-jwt-1.9.8-sbom.json)
+* [EDC Data Plane Agent Protocols](agent-plane/agent-plane-protocol/agent-plane-protocol-1.9.8-sbom.json)
+* [EDC Agent Plane (Hashicorp Vault)](agent-plane/agent-plane-hashicorp/agent-plane-hashicorp-1.9.8-sbom.json)
+* [EDC Agent Plane (Azure Vault)](agent-plane/agent-plane-azure-vault/agent-plane-azure-vault-1.9.8-sbom.json)
 
 You may recreate up-to-date SBOMs by invoking
 
 ```shell
-./mvnw package -DskipTests
+./mvnw org.cyclonedx:cyclonedx-maven-plugin:makeBom -DoutputName=\${project.artifactId}-\${project.version}-sbom
 ```
 Afterwards, you find the current documents under:
-* [EDC Common JWT Auth](common/auth-jwt/target/auth-jwt-1.9.5-SNAPSHOT-sbom.json)
-* [EDC Data Plane Agent Protocols](agent-plane/agent-plane-protocol/target/agent-plane-protocol-1.9.5-SNAPSHOT-sbom.json)
-* [EDC Agent Plane (Hashicorp Vault)](agent-plane/agent-plane-hashicorp/target/agent-plane-hashicorp-1.9.5-SNAPSHOT-sbom.json)
-* [EDC Agent Plane (Azure Vault)](agent-plane/agent-plane-azure-vault/target/agent-plane-azure-vault-1.9.5-SNAPSHOT-sbom.json)
+* [EDC Common JWT Auth](common/auth-jwt/target/auth-jwt-1.9.8-sbom.json)
+* [EDC Data Plane Agent Protocols](agent-plane/agent-plane-protocol/target/agent-plane-protocol-1.9.8-sbom.json)
+* [EDC Agent Plane (Hashicorp Vault)](agent-plane/agent-plane-hashicorp/target/agent-plane-hashicorp-1.9.8-sbom.json)
+* [EDC Agent Plane (Azure Vault)](agent-plane/agent-plane-azure-vault/target/agent-plane-azure-vault-1.9.8-sbom.json)
 
 The KA-EDC build and runtime platform is relying on:
 * [Java Runtime Environment (JRE >=11 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java-Laufzeitumgebung)

diff --git a/agent-plane/README.md b/agent-plane/README.md
@@ -66,10 +66,10 @@ mvn package -Pwith-docker-image
 Alternatively, after a successful build, you can invoke docker yourself 
 
 ```console
-docker build -t tractusx/agentplane-azure-vault:1.9.5-SNAPSHOT -f agentplane-azure-vault/src/main/docker/Dockerfile .
+docker build -t tractusx/agentplane-azure-vault:1.9.8 -f agentplane-azure-vault/src/main/docker/Dockerfile .
 ```
 
 ```console
-docker build -t tractusx/agentplane-hashicorp:1.9.5-SNAPSHOT -f agentplane-hashicorp/src/main/docker/Dockerfile .
+docker build -t tractusx/agentplane-hashicorp:1.9.8 -f agentplane-hashicorp/src/main/docker/Dockerfile .
 ```
 
diff --git a/agent-plane/agent-plane-protocol/README.md b/agent-plane/agent-plane-protocol/README.md
@@ -63,7 +63,7 @@ Add the following dependency to your data-plane artifact pom:
         <dependency>
             <groupId>org.eclipse.tractusx.agents.edc</groupId>
             <artifactId>agent-plane-protocol</artifactId>
-            <version>1.9.5-SNAPSHOT</version>
+            <version>1.9.8</version>
         </dependency>
 ```