Merge pull request #190 from catenax-ng/main

Merge latest changes from main

.github/workflows/eclipse-dash.yml

@@ -9,20 +9,9 @@ on:
       - '**/*.txt'
   pull_request:
     branches: main
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-      - 'api/**'
-      - 'api-tests/**'
-      - 'charts/**'
-      - 'ci/**'
-      - 'docs/**'
-      - 'dev/**'
-      - 'testdata-transform/**'
-      - 'testing/**'
-      - 'uml-diagrams/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
+    paths:
+      - '**/pom.xml'
+      - 'pom.xml'
 
 jobs:
   build:
@@ -47,6 +36,12 @@ jobs:
         run: |
           mvn --batch-mode --update-snapshots verify -Ddash.fail=true -DskipTests
 
+      - name: Ensure DEPENDENCIES file is reflecting the current state
+        run: |
+          mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES-gen
+          diff DEPENDENCIES DEPENDENCIES-gen
+          
+
       - name: upload results
         if: always()
         uses: actions/upload-artifact@v3

.github/workflows/helm-test.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-        fetch-depth: 0
+          fetch-depth: 0
 
       - name: Kubernetes KinD Cluster
         uses: container-tools/kind-action@v1
@@ -23,7 +23,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: kind-registry:5000/app-dashboard:testing
+          tags: kind-registry:5000/irs-api:testing
 
       - name: Set up Helm
         uses: azure/setup-helm@v3
@@ -45,9 +45,15 @@ jobs:
           if [[ -n "$changed" ]]; then
              echo "::set-output name=changed::true"
           fi
+
       - name: Run chart-testing (lint)
         run: ct lint --validate-maintainers=false --target-branch ${{ github.event.repository.default_branch }}
 
       - name: Run chart-testing (install)
-        run: ct install --charts charts/irs
+        run: |
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo add minio https://charts.min.io/
+          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+          helm repo add grafana https://grafana.github.io/helm-charts
+          ct install --charts charts/irs
         if: steps.list-changed.outputs.changed == 'true'

.github/workflows/int-setup-testdata.yml

@@ -28,7 +28,6 @@ on:
         required: false
         type: string
 
-
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/owasp.yml

@@ -8,20 +8,10 @@ on:
       - '**/*.txt'
   pull_request:
     branches: main
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-      - 'api/**'
-      - 'api-tests/**'
-      - 'charts/**'
-      - 'ci/**'
-      - 'docs/**'
-      - 'dev/**'
-      - 'testdata-transform/**'
-      - 'testing/**'
-      - 'uml-diagrams/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
+    paths:
+      - '**/pom.xml'
+      - 'pom.xml'
+      - 'ci/owasp-suppressions.xml'
   schedule:
     - cron: '0 0 * * *' # Once a day
 

.github/workflows/spectral.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Check out the repository
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Run Spectral
       - uses: stoplightio/spectral-action@latest

.github/workflows/swagger-editor-validate.yml

@@ -15,7 +15,7 @@ jobs:
     name: Swagger Editor Validator Remote
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Validate OpenAPI definition
         uses: char0n/swagger-editor-validate@v1
         with:

.github/workflows/tavern.yml

@@ -16,6 +16,11 @@ on:
         description: Global Asset ID to use for the tests
         default: 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454'
         required: true
+      execution-ticket:
+        type: string
+        description: JIRA execution ticket to safe results in.
+        default: 'TRI-910'
+        required: true
   schedule:
     - cron: '0 1 * * 1-5' # At 01:00 on every day-of-week from Monday through Friday.
 
@@ -44,6 +49,7 @@ jobs:
           KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_ID }}
           KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_SECRET }}
           GLOBAL_ASSET_ID: ${{ github.event.inputs.global-asset-id || 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454' }}
+          TEST_EXECUTION_TICKET: ${{ github.event.inputs.execution-ticket || 'TRI-910' }}
         run: |
           python -m pytest api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml
 
@@ -58,5 +64,4 @@ jobs:
           curl -H "Content-Type: multipart/form-data" \
           -u $JIRA_USERNAME:$JIRA_PASSWORD \
           -F 'file=@result.xml' \
-          "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey=TRI-910"
-          
+          "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey=$TEST_EXECUTION_TICKET"

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Known knowns
 - PLACEHOLDER REMOVE IF EMPTY: risks that were introduced or discovered in the release and are known but not resolved
 
+## [2.3.1] - 2023-03-07
+### Changed
+- Updated Spring Boot dependency to 3.0.3
+
 ## [2.3.0] - 2023-02-21
 ### Added
 - Introduced new endpoint ``/irs/aspectmodels`` which will list all available aspect models (from semantic hub or locally provided files if present)
@@ -158,7 +162,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Unresolved
 - **Select Aspects you need**  You are able to select the needed aspects for which you want to collect the correct endpoint information.
 
-[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.3.0...HEAD
+[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.3.1...HEAD
+[2.3.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.0.0...2.1.0