Merge pull request #3618 from mercedes-benz/develop

Merge `develop` into `master` for web-ui release
mercedes-benz · Nov 15, 2024 · 7fc2643 · 7fc2643
2 parents 74789e2 + 3c26b94
commit 7fc2643
Show file tree

Hide file tree

Showing 286 changed files with 7,747 additions and 8,607 deletions.
diff --git a/.github/workflows/_build+publish-pds-solution.yml b/.github/workflows/_build+publish-pds-solution.yml
@@ -37,7 +37,7 @@ jobs:
           echo "pds-version '${{ inputs.pds-version }}'"
 
       - name: Checkout git repository
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Docker login to ghcr.io
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567

diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml
@@ -31,13 +31,13 @@ jobs:
           fi
 
       - name: Git checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-tags: true
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin
@@ -52,7 +52,7 @@ jobs:
         with:
           go-version: 1.21.6
 
-      - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
+      - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: |
             ~/.cache/go-build

diff --git a/.github/workflows/github-action-scan.yml b/.github/workflows/github-action-scan.yml
@@ -28,10 +28,10 @@ jobs:
         working-directory: github-actions/scan
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Use Node.js
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
         with:
           node-version: 22
 
@@ -72,20 +72,20 @@ jobs:
 
       - name: Cache SecHub server download    
         # Cache V4 release: 13aacd865c20de90d75de3b17ebe84f7a17d57d2
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a 
         with:
           path: ./build/sechub-runtime/server/${{ env.sechub_server_version }}/
           key: ${{ runner.os }}-sechub-server-${{ env.sechub_server_version }}
 
       - name: Cache PDS download    
         # Cache V4 release: 13aacd865c20de90d75de3b17ebe84f7a17d57d2
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a 
         with:
           path: ./build/sechub-runtime/pds/${{ env.pds_version }}/
           key: ${{ runner.os }}-sechub-pds-${{ env.pds_version }}
 
       - name: Set up JDK 17 (to run servers)
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -35,10 +35,10 @@ jobs:
     if: ${{ github.ref_type != 'tag' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin
@@ -53,7 +53,7 @@ jobs:
         with:
           go-version: 1.21.6
 
-      - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
+      - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         with:
           path: |
             ~/.cache/go-build

diff --git a/.github/workflows/publish-libraries.yml b/.github/workflows/publish-libraries.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
       # Create temporary local tags, so we build documentation for this tag...
@@ -28,7 +28,7 @@ jobs:
 
       # Build
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-client-server-pds.yml b/.github/workflows/release-client-server-pds.yml
@@ -67,7 +67,7 @@ jobs:
           exit 1
 
       - name: Checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
           fetch-tags: true
@@ -91,7 +91,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin
@@ -107,7 +107,7 @@ jobs:
           go-version: 1.21.6
 
       - name: Set up Go caching
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
         id: go-cache
         with:
           path: |

diff --git a/.github/workflows/release-github-action.yml b/.github/workflows/release-github-action.yml
@@ -41,15 +41,15 @@ jobs:
           exit 1
 
       - name: Checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
       # ----------------------
       # Setup + Caching
       # ----------------------
       - name: Use Node.js
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
         with:
           node-version: 22
 

diff --git a/.github/workflows/release-pds-tools.yml b/.github/workflows/release-pds-tools.yml
@@ -32,7 +32,7 @@ jobs:
           exit 1
 
       - name: Checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -47,7 +47,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-web-server.yml b/.github/workflows/release-web-server.yml
@@ -45,7 +45,7 @@ jobs:
           exit 1
 
       - name: Checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -58,7 +58,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-web-ui.yml b/.github/workflows/release-web-ui.yml
@@ -45,7 +45,7 @@ jobs:
           exit 1
 
       - name: Checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -58,7 +58,7 @@ jobs:
       # Node.js is needed for building
       # ------------------------------
       - name: Use Node.js
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
         with:
           node-version: 22
 
@@ -109,8 +109,8 @@ jobs:
         run: |
           cd sechub-web-ui && \
           npm install && \
-          npx nuxi generate && \
-          cd .output/public && \
+          npm run build && \
+          cd dist && \
           echo '${{ inputs.web-ui-version }}' > sechub-web-ui_version.txt && \
           zip -r ../../../$WEB_UI_RELEASE_ZIPFILE *
 
@@ -137,7 +137,7 @@ jobs:
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: sechub-web-ui_htdocs
-          path: sechub-web-ui/.output/
+          path: sechub-web-ui/dist/
           retention-days: 7
 
       - name: Create Web-UI release
@@ -202,7 +202,7 @@ jobs:
           VERSION_TAG="${WEB_UI_VERSION}"
           echo "# Building image $DOCKER_REGISTRY:$VERSION_TAG"
           echo "  from $ACTIONS_BASE_IMAGE_DEBIAN"
-          cp -r sechub-web-ui/.output sechub-web-ui-solution/docker/copy
+          cp -r sechub-web-ui/dist sechub-web-ui-solution/docker/copy
           cd sechub-web-ui-solution
           export BASE_IMAGE="$ACTIONS_BASE_IMAGE_DEBIAN"
           export BUILD_TYPE=copy

diff --git a/.github/workflows/release-wrapper-checkmarx.yml b/.github/workflows/release-wrapper-checkmarx.yml
@@ -24,7 +24,7 @@ jobs:
           echo "Checkmarx-wrapper '${{ inputs.checkmarx-wrapper-version }}' - Milestone '${{ inputs.checkmarx-wrapper-milestone-number }}'"
 
       - name: Checkout branch master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -37,7 +37,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-wrapper-owaspzap.yml b/.github/workflows/release-wrapper-owaspzap.yml
@@ -25,7 +25,7 @@ jobs:
           echo "OWASP-ZAP Wrapper '${{ inputs.owaspzap-wrapper-version }}' - Milestone '${{ inputs.owaspzap-wrapper-milestone-number }}'"
 
       - name: Checkout branch master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -38,7 +38,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-wrapper-prepare.yml b/.github/workflows/release-wrapper-prepare.yml
@@ -24,7 +24,7 @@ jobs:
           echo "Prepare-wrapper '${{ inputs.prepare-wrapper-version }}' - Milestone '${{ inputs.prepare-wrapper-milestone-number }}'"
 
       - name: Checkout branch master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -37,7 +37,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
@@ -24,7 +24,7 @@ jobs:
           echo "Secret-Validation-wrapper '${{ inputs.secretvalidation-wrapper-version }}' - Milestone '${{ inputs.secretvalidation-wrapper-milestone-number }}'"
 
       - name: Checkout branch master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -37,7 +37,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/.github/workflows/release-wrapper-xray.yml b/.github/workflows/release-wrapper-xray.yml
@@ -24,7 +24,7 @@ jobs:
           echo "Xray-wrapper '${{ inputs.xray-wrapper-version }}' - Milestone '${{ inputs.xray-wrapper-milestone-number }}'"
 
       - name: Checkout branch master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: master
 
@@ -37,7 +37,7 @@ jobs:
       # Setup + Caching
       # ----------------------
       - name: Set up JDK 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: 17
           distribution: temurin

diff --git a/apply-headers.sh b/apply-headers.sh
@@ -97,6 +97,10 @@ applySPDXonSecondLine "sh" "# $SPDX_TEXT"
 applySPDXonFirstLine "sql" "-- $SPDX_TEXT"
 applySPDXonFirstLine "yaml" "# $SPDX_TEXT"
 applySPDXonFirstLine "yml" "# $SPDX_TEXT"
+applySPDXonFirstLine "ts" "// $SPDX_TEXT"
+applySPDXonFirstLine "d.ts" "// $SPDX_TEXT"
+applySPDXonFirstLine "vue" "<!-- $SPDX_TEXT -->"
+
 
 # for plantuml we do no longer apply automatically, because a comment before
 # a @startUml is problematic

diff --git a/build.gradle b/build.gradle
@@ -113,6 +113,16 @@ allprojects {
     task prepareGitPush(dependsOn: spotlessApply){
 
     }
+
+    /*
+     * Adds the -parameters compiler argument to every Gradle 'JavaCompile' task
+     * This instructs the Java compiler to include method parameter names in the compiled .class files
+     * This is required for the reflection based frameworks or libraries to work properly (e.g. Spring)
+     */
+    tasks.withType(JavaCompile).configureEach {
+        options.compilerArgs << "-parameters"
+    }
+
 }
 
 

diff --git a/github-actions/scan/src/client-version-helper.ts b/github-actions/scan/src/client-version-helper.ts
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 import axios from 'axios';
 import { load } from 'cheerio';
 import * as core from '@actions/core';

diff --git a/github-actions/scan/src/json-helper.ts b/github-actions/scan/src/json-helper.ts
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 import * as core from '@actions/core';
 
 /**

diff --git a/github-actions/scan/src/platform-helper.ts b/github-actions/scan/src/platform-helper.ts
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 import * as os from 'os';
 
 export function getPlatform() {

diff --git a/gradle/projects.gradle b/gradle/projects.gradle
@@ -41,7 +41,7 @@ projectType = [
                     project(':sechub-integrationtest'),
                     project(':sechub-developertools'),
                     project(':sechub-test'),
-
+                    project(':sechub-testframework-spring'),
                     project(':sechub-storage-sharedvolume-spring'),
 
                     /* next projects added as spring boot projects only, because otherwise we get the (older)