Merge branch 'main' into feature/639-handle-policy-expiration

.github/workflows/e2e-tests-xray_frontend.yml

@@ -102,7 +102,7 @@ jobs:
           node-version: 20.x
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v6.6.1 # use the explicit version number
+        uses: cypress-io/github-action@v6.7.0 # use the explicit version number
         with:
           start: npm run start:auth:e2ea
           wait-on: "http://localhost:4200"
@@ -165,7 +165,7 @@ jobs:
  #         node-version: 18.x
 #
  #     - name: Cypress run all tests
-  #       uses: cypress-io/github-action@v6.6.1 # use the explicit version number
+  #       uses: cypress-io/github-action@v6.7.0 # use the explicit version number
  #       with:
  #         start: npm start
  #         wait-on: "http://localhost:4200"
@@ -228,7 +228,7 @@ jobs:
  #       run: npx playwright install --with-deps webkit
 #
  #     - name: Cypress run all tests
-  #       uses: cypress-io/github-action@v6.6.1 # use the explicit version number
+  #       uses: cypress-io/github-action@v6.7.0 # use the explicit version number
  #       with:
  #         start: npm start:auth:e2ea
  #         wait-on: "http://localhost:4200"

.github/workflows/pull-request_backend.yml

@@ -25,6 +25,7 @@ env:
   GHCR_REGISTRY: ghcr.io
   JAVA_VERSION: 17
   DOCKER_HUB_REGISTRY_NAMESPACE: tractusx
+  BACKEND_IMAGE_DOCKER_HUB: traceability-foss
 
 jobs:
   Check-Changelog-update:
@@ -114,16 +115,16 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
-      - name: Verify Sonar Scan
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND  }}
-          SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION }}
-          SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY_BACKEND }}
-        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=/home/runner/work/tx-traceability-foss/tx-traceability-foss/tx-coverage/target/site/jacoco-aggregate/jacoco.xml -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY_BACKEND }} -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}
+   #   - name: Verify Sonar Scan
+   #     env:
+     #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+    #      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND  }}
+   #       SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION }}
+     #     SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY_BACKEND }}
+     #   run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=/home/runner/work/traceability-foss/tx-traceability-foss/tx-coverage/target/site/jacoco-aggregate/jacoco.xml -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY_BACKEND }} -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}
 
   Publish-docker-image:
-    needs: [ "Test-and-Sonar" ]
+   # needs: [ "Test-and-Sonar" ]
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -142,18 +143,41 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-
       - name: Login to GHCR Registry
+        env:
+          DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+        if: env.DOCKER_HUB_USER == ''
         uses: docker/login-action@v3
         with:
           registry: ${{ env.GHCR_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build & Push docker image for GHCR ${{ env.GHCR_REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }}
+        env:
+          DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+        if: env.DOCKER_HUB_USER == ''
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: ${{ env.GHCR_REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }}
 
+      - name: Login to Docker Hub
+        env:
+          DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+        if: env.DOCKER_HUB_USER != ''
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Build & push docker image for Docker Hub ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.BACKEND_IMAGE_DOCKER_HUB }}:${{ github.event.pull_request.head.sha }}
+        env:
+          DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+        if: env.DOCKER_HUB_USER != ''
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.BACKEND_IMAGE_DOCKER_HUB }}:${{ github.event.pull_request.head.sha }}

.github/workflows/release.yaml

@@ -91,14 +91,6 @@ jobs:
         with:
           body: ${{ env.CHANGELOG }}
 
-  trigger-jira:
-    needs:
-      - release
-    uses: ./.github/workflows/jira-publish-release.yaml
-    with:
-      version: ${{ github.ref_name }}
-    secrets: inherit
-
   publish-to-swaggerhub:
     name: "Publish OpenAPI spec to Swaggerhub"
     permissions:

.github/workflows/trivy.yml

@@ -72,7 +72,7 @@ jobs:
         run: docker build -t localhost:5000/traceability-foss:fe_${{ github.sha }} -f ./frontend/Dockerfile .
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.20.0
+        uses: aquasecurity/trivy-action@0.22.0
         with:
           trivyignores: "./.github/workflows/.trivyignore"
           image-ref: 'localhost:5000/traceability-foss:fe_${{ github.sha }}'
@@ -132,7 +132,7 @@ jobs:
           ref: ${{needs.prepare-env.outputs.check_sha}}
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@0.20.0
+        uses: aquasecurity/trivy-action@0.22.0
         with:
           trivyignores: "./.github/workflows/.trivyignore"
           scan-type: "config"
@@ -178,7 +178,7 @@ jobs:
           tags: localhost:5000/traceability-foss:trivy
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.20.0
+        uses: aquasecurity/trivy-action@0.22.0
         with:
           image-ref: localhost:5000/traceability-foss:trivy
           trivyignores: "./.github/workflows/.trivyignore"

CHANGELOG.md

@@ -7,16 +7,37 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_
 ## [UNRELEASED - DD.MM.YYYY]
+### Changed
+- #965 Implement proxy functionality of the IRS policy store
+
+### Added
+- #832 added policymanagement list view, creator and editor
+- #737 Added concept: Contract table -> parts link action
+- XXX Added interceptor to EdcRestTemplates to log requests
 
 ### Removed
 
 - XXX Removed EdcNotifiactionMockServiceImpl class and replaced with mocks
+- #1033 removed action jira-publish-release workflow
+
+### Changed
+
+- XXX updated JsonSchemaTest now the test pulls the latest version of the json file
+
+### Added
+
+- #1017 added file for CC BY 4.0 license for TRG 7
+
+### Changed
+
+- #1017 updated contributing, notice, and readme files for TRG 7
 
 ## [11.0.2 - 29.05.2024]
 ### Added
 - #1010 Made submodel path configurable
 - #838 Added User experience > Table design section in arc42 documentation
 
+
 ### Changed
 - #1010 Updated IRS Helm Version from 5.1.6 to 5.1.7
 

COMPATIBILITY_MATRIX.md

@@ -1,5 +1,5 @@
 # Compatibility matrix Trace-X
-## Trace-X version [[11.0.2](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.2] - 2024-05-29
+## Trace-X version [11.0.2](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.2) - 2024-05-29
 
 ### Catena-X Release?
 
@@ -27,7 +27,7 @@
 | Aspect Model     | SingleLevelBomAsPlanned      | 3.0.0                | -        |
 
 
-## Trace-X version [[11.0.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.1] - 2024-05-22
+## Trace-X version [11.0.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.1) - 2024-05-22
 
 ### Catena-X Release?