Merge pull request #133 from catenax-ng/release-2.1.11

build: create new release
eclipse-tractusx · May 3, 2024 · 9d93b21 · 9d93b21
2 parents c3861c7 + 62c0927
commit 9d93b21
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
@@ -39,8 +39,8 @@ on:
         type: string
       upgrade_from:
         description: 'SD Factory chart version to upgrade from'
-        # SD Factory version from 3.2 release
-        default: '2.1.7'
+        # SD Factory version from 24.03 release
+        default: '2.1.10'
         required: false
         type: string
 
@@ -101,6 +101,6 @@ jobs:
       - name: Run helm upgrade
         run: |
           helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
-          helm install sdf tractusx/sdfactory --version ${{ github.event.inputs.upgrade_from || '2.1.7' }}
+          helm install sdf tractusx/sdfactory --version ${{ github.event.inputs.upgrade_from || '2.1.10' }}
           helm upgrade sdf charts/sdfactory
         if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [2.1.11] - 2024-05-02
 ### Fixed
 - Fixed the CVE-2024-22259 and CVE-2024-22257 security issue
+- Upgraded base image due to vulnerability
 
 ### Changed
 - unused configuration entries in application.yml are not mandatory (e.g. `app.usersDetails.custodianWallet`

diff --git a/DOCKER_NOTICE.md b/DOCKER_NOTICE.md
@@ -12,7 +12,7 @@ __SD Factory__
 
 **Used base image**
 
-- [eclipse-temurin:17.0.8.1_1-jdk](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.11_9-jdk](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin

diff --git a/Dockerfile b/Dockerfile
@@ -28,7 +28,7 @@ RUN mvn clean install -Dmaven.test.skip=true
 
 RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar)
 
-FROM eclipse-temurin:17.0.8.1_1-jdk
+FROM eclipse-temurin:17.0.11_9-jdk
 
 ARG DEPENDENCY=/sdfactory/target/dependency
 

diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ further processing.
 ## Software Version
 
 ```shell
-Software version: 2.1.10
-Helm Chart version: 2.1.16
+Software version: 2.1.11
+Helm Chart version: 2.1.17
 ```
 
 

diff --git a/charts/sdfactory/Chart.yaml b/charts/sdfactory/Chart.yaml
@@ -38,11 +38,11 @@ sources:
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: "2.1.16"
+version: "2.1.17"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 
-appVersion: "2.1.10"
+appVersion: "2.1.11"
diff --git a/charts/sdfactory/README.md b/charts/sdfactory/README.md
@@ -1,6 +1,6 @@
 # sdfactory
 
-![Version: 2.1.16](https://img.shields.io/badge/Version-2.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.10](https://img.shields.io/badge/AppVersion-2.1.10-informational?style=flat-square)
+![Version: 2.1.17](https://img.shields.io/badge/Version-2.1.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.11](https://img.shields.io/badge/AppVersion-2.1.11-informational?style=flat-square)
 
 Helm Charts for SD Factory application. Self-Description Factory component is responsible for the creation of Self Descriptions.
 

diff --git a/charts/sdfactory/values-beta.yaml b/charts/sdfactory/values-beta.yaml
@@ -36,7 +36,6 @@ ingress:
       hosts:
         - sdfactory.beta.demo.catena-x.net
 
-
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian-beta#jwkSetUri>"

diff --git a/charts/sdfactory/values-dev.yaml b/charts/sdfactory/values-dev.yaml
@@ -36,7 +36,6 @@ ingress:
       hosts:
         - sdfactory.dev.demo.catena-x.net
 
-
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian-dev#jwkSetUri>"

diff --git a/charts/sdfactory/values-int.yaml b/charts/sdfactory/values-int.yaml
@@ -36,7 +36,6 @@ ingress:
       hosts:
         - sdfactory.int.demo.catena-x.net
 
-
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian#jwkSetUri>"

diff --git a/charts/sdfactory/values-pen.yaml b/charts/sdfactory/values-pen.yaml
@@ -36,7 +36,6 @@ ingress:
       hosts:
         - sdfactory-pen.int.demo.catena-x.net
 
-
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian-pen#jwkSetUri>"

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
     </parent>
     <groupId>com.tsystems</groupId>
     <artifactId>sd-factory</artifactId>
-    <version>2.1.10</version>
+    <version>2.1.11</version>
     <description>Self-Description Hub Prototype</description>
     <packaging>jar</packaging>
     <properties>
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,6 @@ ingress: @@
           hosts:
             - sdfactory.beta.demo.catena-x.net
     sdfactory:
       secret:
         jwkSetUri: "<path:essential-services/data/custodian-beta#jwkSetUri>"
@@ Expand Down @@