Skip to content

Commit 426b7c9

Browse files
de-jcupde-jcup
committed
Merge branch 'develop' into feature-3521-templates-and-assets
2 parents c2c6f1b + ab9dd5f commit 426b7c9

File tree

286 files changed

+7766
-8626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+7766
-8626
lines changed

‎.github/workflows/_build+publish-pds-solution.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "pds-version '${{ inputs.pds-version }}'"
3838
3939
- name: Checkout git repository
40-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
40+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4141

4242
- name: Docker login to ghcr.io
4343
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567

‎.github/workflows/documentation-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
fi
3232
3333
- name: Git checkout
34-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3535
with:
3636
fetch-tags: true
3737
fetch-depth: 0
3838

3939
- name: Set up JDK 17
40-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
40+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4141
with:
4242
java-version: 17
4343
distribution: temurin
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
go-version: 1.21.6
5454

55-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
55+
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
5656
with:
5757
path: |
5858
~/.cache/go-build

‎.github/workflows/github-action-scan.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
working-directory: github-actions/scan
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3232

3333
- name: Use Node.js
34-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
34+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
3535
with:
3636
node-version: 22
3737

@@ -72,20 +72,20 @@ jobs:
7272
7373
- name: Cache SecHub server download
7474
# Cache V4 release: 13aacd865c20de90d75de3b17ebe84f7a17d57d2
75-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
75+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
7676
with:
7777
path: ./build/sechub-runtime/server/${{ env.sechub_server_version }}/
7878
key: ${{ runner.os }}-sechub-server-${{ env.sechub_server_version }}
7979

8080
- name: Cache PDS download
8181
# Cache V4 release: 13aacd865c20de90d75de3b17ebe84f7a17d57d2
82-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
82+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
8383
with:
8484
path: ./build/sechub-runtime/pds/${{ env.pds_version }}/
8585
key: ${{ runner.os }}-sechub-pds-${{ env.pds_version }}
8686

8787
- name: Set up JDK 17 (to run servers)
88-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
88+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
8989
with:
9090
java-version: 17
9191
distribution: temurin

‎.github/workflows/gradle.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
if: ${{ github.ref_type != 'tag' }}
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
38+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3939

4040
- name: Set up JDK 17
41-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
41+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4242
with:
4343
java-version: 17
4444
distribution: temurin
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
go-version: 1.21.6
5555

56-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
56+
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
5757
with:
5858
path: |
5959
~/.cache/go-build

‎.github/workflows/publish-libraries.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout master
20-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2121
with:
2222
ref: master
2323
# Create temporary local tags, so we build documentation for this tag...
@@ -28,7 +28,7 @@ jobs:
2828

2929
# Build
3030
- name: Set up JDK 17
31-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
31+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
3232
with:
3333
java-version: 17
3434
distribution: temurin

‎.github/workflows/release-client-server-pds.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
exit 1
6868
6969
- name: Checkout master
70-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
70+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
7171
with:
7272
ref: master
7373
fetch-tags: true
@@ -91,7 +91,7 @@ jobs:
9191
# Setup + Caching
9292
# ----------------------
9393
- name: Set up JDK 17
94-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
94+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
9595
with:
9696
java-version: 17
9797
distribution: temurin
@@ -107,7 +107,7 @@ jobs:
107107
go-version: 1.21.6
108108

109109
- name: Set up Go caching
110-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
110+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
111111
id: go-cache
112112
with:
113113
path: |

‎.github/workflows/release-github-action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ jobs:
4141
exit 1
4242
4343
- name: Checkout master
44-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4545
with:
4646
ref: master
4747

4848
# ----------------------
4949
# Setup + Caching
5050
# ----------------------
5151
- name: Use Node.js
52-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
52+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
5353
with:
5454
node-version: 22
5555

‎.github/workflows/release-pds-tools.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
exit 1
3333
3434
- name: Checkout master
35-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3636
with:
3737
ref: master
3838

@@ -47,7 +47,7 @@ jobs:
4747
# Setup + Caching
4848
# ----------------------
4949
- name: Set up JDK 17
50-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
50+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
5151
with:
5252
java-version: 17
5353
distribution: temurin

‎.github/workflows/release-web-server.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
exit 1
4646
4747
- name: Checkout master
48-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4949
with:
5050
ref: master
5151

@@ -58,7 +58,7 @@ jobs:
5858
# Setup + Caching
5959
# ----------------------
6060
- name: Set up JDK 17
61-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
61+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
6262
with:
6363
java-version: 17
6464
distribution: temurin

‎.github/workflows/release-web-ui.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
exit 1
4646
4747
- name: Checkout master
48-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4949
with:
5050
ref: master
5151

@@ -58,7 +58,7 @@ jobs:
5858
# Node.js is needed for building
5959
# ------------------------------
6060
- name: Use Node.js
61-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
61+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
6262
with:
6363
node-version: 22
6464

@@ -109,10 +109,10 @@ jobs:
109109
run: |
110110
cd sechub-web-ui && \
111111
npm install && \
112-
npx nuxi generate && \
113-
cd .output/public && \
112+
npm run build && \
113+
cd dist && \
114114
echo '${{ inputs.web-ui-version }}' > sechub-web-ui_version.txt && \
115-
zip -r ../../../$WEB_UI_RELEASE_ZIPFILE *
115+
zip -r ../../$WEB_UI_RELEASE_ZIPFILE *
116116
117117
- name: Collect GIT status
118118
if: always()
@@ -137,7 +137,7 @@ jobs:
137137
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
138138
with:
139139
name: sechub-web-ui_htdocs
140-
path: sechub-web-ui/.output/
140+
path: sechub-web-ui/dist/
141141
retention-days: 7
142142

143143
- name: Create Web-UI release
@@ -202,7 +202,7 @@ jobs:
202202
VERSION_TAG="${WEB_UI_VERSION}"
203203
echo "# Building image $DOCKER_REGISTRY:$VERSION_TAG"
204204
echo " from $ACTIONS_BASE_IMAGE_DEBIAN"
205-
cp -r sechub-web-ui/.output sechub-web-ui-solution/docker/copy
205+
cp -r sechub-web-ui/dist sechub-web-ui-solution/docker/copy
206206
cd sechub-web-ui-solution
207207
export BASE_IMAGE="$ACTIONS_BASE_IMAGE_DEBIAN"
208208
export BUILD_TYPE=copy

‎.github/workflows/release-wrapper-checkmarx.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
echo "Checkmarx-wrapper '${{ inputs.checkmarx-wrapper-version }}' - Milestone '${{ inputs.checkmarx-wrapper-milestone-number }}'"
2525
2626
- name: Checkout branch master
27-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2828
with:
2929
ref: master
3030

@@ -37,7 +37,7 @@ jobs:
3737
# Setup + Caching
3838
# ----------------------
3939
- name: Set up JDK 17
40-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
40+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4141
with:
4242
java-version: 17
4343
distribution: temurin

‎.github/workflows/release-wrapper-owaspzap.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
echo "OWASP-ZAP Wrapper '${{ inputs.owaspzap-wrapper-version }}' - Milestone '${{ inputs.owaspzap-wrapper-milestone-number }}'"
2626
2727
- name: Checkout branch master
28-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2929
with:
3030
ref: master
3131

@@ -38,7 +38,7 @@ jobs:
3838
# Setup + Caching
3939
# ----------------------
4040
- name: Set up JDK 17
41-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
41+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4242
with:
4343
java-version: 17
4444
distribution: temurin

‎.github/workflows/release-wrapper-prepare.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
echo "Prepare-wrapper '${{ inputs.prepare-wrapper-version }}' - Milestone '${{ inputs.prepare-wrapper-milestone-number }}'"
2525
2626
- name: Checkout branch master
27-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2828
with:
2929
ref: master
3030

@@ -37,7 +37,7 @@ jobs:
3737
# Setup + Caching
3838
# ----------------------
3939
- name: Set up JDK 17
40-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
40+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4141
with:
4242
java-version: 17
4343
distribution: temurin

‎.github/workflows/release-wrapper-validation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
echo "Secret-Validation-wrapper '${{ inputs.secretvalidation-wrapper-version }}' - Milestone '${{ inputs.secretvalidation-wrapper-milestone-number }}'"
2525
2626
- name: Checkout branch master
27-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2828
with:
2929
ref: master
3030

@@ -37,7 +37,7 @@ jobs:
3737
# Setup + Caching
3838
# ----------------------
3939
- name: Set up JDK 17
40-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
40+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4141
with:
4242
java-version: 17
4343
distribution: temurin

‎.github/workflows/release-wrapper-xray.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
echo "Xray-wrapper '${{ inputs.xray-wrapper-version }}' - Milestone '${{ inputs.xray-wrapper-milestone-number }}'"
2525
2626
- name: Checkout branch master
27-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2828
with:
2929
ref: master
3030

@@ -37,7 +37,7 @@ jobs:
3737
# Setup + Caching
3838
# ----------------------
3939
- name: Set up JDK 17
40-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
40+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4141
with:
4242
java-version: 17
4343
distribution: temurin

‎apply-headers.sh

+4
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ applySPDXonSecondLine "sh" "# $SPDX_TEXT"
9797
applySPDXonFirstLine "sql" "-- $SPDX_TEXT"
9898
applySPDXonFirstLine "yaml" "# $SPDX_TEXT"
9999
applySPDXonFirstLine "yml" "# $SPDX_TEXT"
100+
applySPDXonFirstLine "ts" "// $SPDX_TEXT"
101+
applySPDXonFirstLine "d.ts" "// $SPDX_TEXT"
102+
applySPDXonFirstLine "vue" "<!-- $SPDX_TEXT -->"
103+
100104

101105
# for plantuml we do no longer apply automatically, because a comment before
102106
# a @startUml is problematic

‎build.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,16 @@ allprojects {
113113
task prepareGitPush(dependsOn: spotlessApply){
114114

115115
}
116+
117+
/*
118+
* Adds the -parameters compiler argument to every Gradle 'JavaCompile' task
119+
* This instructs the Java compiler to include method parameter names in the compiled .class files
120+
* This is required for the reflection based frameworks or libraries to work properly (e.g. Spring)
121+
*/
122+
tasks.withType(JavaCompile).configureEach {
123+
options.compilerArgs << "-parameters"
124+
}
125+
116126
}
117127

118128

‎github-actions/scan/src/client-version-helper.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
import axios from 'axios';
24
import { load } from 'cheerio';
35
import * as core from '@actions/core';

‎github-actions/scan/src/json-helper.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
import * as core from '@actions/core';
24

35
/**

‎github-actions/scan/src/platform-helper.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
import * as os from 'os';
24

35
export function getPlatform() {

‎gradle/projects.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ projectType = [
4141
project(':sechub-integrationtest'),
4242
project(':sechub-developertools'),
4343
project(':sechub-test'),
44-
44+
project(':sechub-testframework-spring'),
4545
project(':sechub-storage-sharedvolume-spring'),
4646

4747
/* next projects added as spring boot projects only, because otherwise we get the (older)

0 commit comments

Comments
 (0)