Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master for release #3465

Merged
merged 53 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
32f06ec
Bump axios from 1.7.2 to 1.7.4 in /github-actions/scan
dependabot[bot] Aug 14, 2024
cfe8c0c
Merge pull request #3417 from mercedes-benz/master
sven-dmlr Sep 6, 2024
d346267
Bump actions/setup-java from 4.2.2 to 4.3.0
dependabot[bot] Sep 9, 2024
e20de7f
Gha feature 3357 enable pull request hook in GitHub action workflow (…
hamidonos Sep 10, 2024
f50215d
Feature migrate usage in system test to new open api module #3239 (#3…
hamidonos Sep 16, 2024
3ce15dc
Bump gradle/actions from 4.0.1 to 4.1.0
dependabot[bot] Sep 16, 2024
989bf95
Bump peter-evans/create-pull-request from 6.1.0 to 7.0.3
dependabot[bot] Sep 16, 2024
2d7f65a
helm chart extended by env variables #3427
sven-dmlr Sep 17, 2024
42641e3
Merge pull request #3426 from mercedes-benz/dependabot/github_actions…
sven-dmlr Sep 18, 2024
fd0cbf5
Merge pull request #3425 from mercedes-benz/dependabot/github_actions…
sven-dmlr Sep 18, 2024
b8f13d2
Merge pull request #3421 from mercedes-benz/dependabot/github_actions…
sven-dmlr Sep 18, 2024
dfaff27
Merge pull request #3361 from mercedes-benz/dependabot/npm_and_yarn/g…
sven-dmlr Sep 18, 2024
633b312
3357 add main, master, develop and hotfix to job execution in gradle.…
hamidonos Sep 18, 2024
c1c4a22
fix if statement in github-action-scan.yml & gradle.yml
hamidonos Sep 18, 2024
d35616d
Merge pull request #3435 from mercedes-benz/gha_feature-3357-fix-wron…
sven-dmlr Sep 19, 2024
e59b5fa
Merge pull request #3428 from mercedes-benz/feature-3427-webui-env-vi…
sven-dmlr Sep 19, 2024
0326e67
Trigger build workflows based on changed files #3439
sven-dmlr Sep 19, 2024
bf2de3c
pr suggestion added #3439
sven-dmlr Sep 19, 2024
4b5118f
pr suggestion added #3439
sven-dmlr Sep 19, 2024
cfe60ff
target scan action only #3439
sven-dmlr Sep 19, 2024
97370d5
forced gradle.yml to be included #3439
sven-dmlr Sep 19, 2024
f2d5844
forced gradle.yml to be included #3439
sven-dmlr Sep 19, 2024
eb2ed70
forced gradle.yml to be included #3439
sven-dmlr Sep 19, 2024
5c7e07e
forced gradle.yml to be included #3439
sven-dmlr Sep 19, 2024
23c0ceb
added the other trigger patterns #3439
sven-dmlr Sep 19, 2024
30ba024
Skip run when triggered by a tag #3439
sven-dmlr Sep 20, 2024
252c484
on push: limit to main branches #3439
sven-dmlr Sep 23, 2024
f60f820
Merge pull request #3440 from mercedes-benz/feature-3439-trigger-buil…
sven-dmlr Sep 23, 2024
b425523
Bump peter-evans/create-pull-request from 7.0.3 to 7.0.5
dependabot[bot] Sep 23, 2024
ac82c70
Update README.adoc
haerter-tss Sep 24, 2024
67959c3
Update README.adoc
haerter-tss Sep 24, 2024
aec8801
Merge pull request #3449 from mercedes-benz/feature-3448-improve-gha-…
haerter-tss Sep 24, 2024
672c48f
build GitHub actions index.js automatically (#3424)
hamidonos Sep 24, 2024
9edeb79
Merge pull request #3444 from mercedes-benz/dependabot/github_actions…
sven-dmlr Sep 24, 2024
d055f25
fixed windows client exclude handling #3447
sven-dmlr Sep 24, 2024
e62bcb0
Merge pull request #3452 from mercedes-benz/feature-3447-windows-Clie…
sven-dmlr Sep 25, 2024
3efdae7
removed community branch mention #3358
sven-dmlr Sep 25, 2024
c1e7fe4
Merge pull request #3454 from mercedes-benz/feature-3358-remove-commu…
sven-dmlr Sep 25, 2024
a7b9779
client shall not follow symlinks #3367
sven-dmlr Sep 25, 2024
a3c2087
added support for Pro*C file extensions #3271
sven-dmlr Sep 25, 2024
4c74671
Merge pull request #3456 from mercedes-benz/feature-3367-client-shall…
sven-dmlr Sep 25, 2024
42495ed
Merge pull request #3457 from mercedes-benz/feature-3271-client-suppo…
sven-dmlr Sep 25, 2024
5c58d0c
warn on -addScmHistory but no secretScan #3392
sven-dmlr Sep 25, 2024
0233408
PR suggestion text added #3392
sven-dmlr Sep 26, 2024
5586340
Merge pull request #3458 from mercedes-benz/feature-3392-client-warni…
sven-dmlr Sep 26, 2024
eb80dca
client: label functionality added #3459
sven-dmlr Sep 26, 2024
40479ec
client: label functionality docs updated #3459
sven-dmlr Sep 26, 2024
7f9978f
fixed flaky test #3459
sven-dmlr Sep 27, 2024
7810e5e
code indentation improved #3459
sven-dmlr Sep 27, 2024
659f2f7
getting started guide updated #3464
sven-dmlr Sep 27, 2024
96acbf5
fix case when no config json exists #3459
sven-dmlr Sep 27, 2024
6b95e10
empty list handling improved #3459
sven-dmlr Sep 27, 2024
2dfb09c
Merge pull request #3462 from mercedes-benz/feature-3459-client-listJ…
sven-dmlr Sep 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/documentation-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: Update documentation - Create pull request
if: (inputs.publish-documentation != '') && (github.ref_name == env.ACTIONS_SECHUB_DOC_RELEASE_BRANCH)
id: pr_release_documentation
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-documentation
branch-suffix: short-commit-hash
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/github-action-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@ name: Build SecHub GHA (scan)
on:
push:
branches:
- 'gha_*'
- 'develop'
- 'hotfix'
- 'main'
- 'master'
paths:
- '.github/workflows/github-action-scan.yml'
- 'github-actions/scan/**'
pull_request:
paths:
- '.github/workflows/github-action-scan.yml'
- 'github-actions/scan/**'
# enable manual triggering of workflow
workflow_dispatch:

Expand Down Expand Up @@ -64,7 +74,7 @@ jobs:
key: ${{ runner.os }}-pds-${{ env.pds_version }}

- name: Set up JDK 17 (to run servers)
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin
Expand Down
33 changes: 25 additions & 8 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,46 @@ name: Java & Go CI

on:
push:
branches-ignore:
# We do NOT build github action development branches here (because no Java or Go code is changed)
- 'gha_*'
# We ignore everything where tag starts with v* - this is done by release build!
tags-ignore:
- v*
branches:
- 'develop'
- 'hotfix'
- 'main'
- 'master'
paths:
- '**'
- '!docs/**'
- '!github-actions/**'
- '!sechub-doc/**'
- '!sechub-website/**'
- '.github/workflows/gradle.yml'
pull_request:
paths:
- '**'
- '!docs/**'
- '!github-actions/**'
- '!sechub-doc/**'
- '!sechub-website/**'
- '.github/workflows/gradle.yml'

# enable manual triggering of workflow
workflow_dispatch:

jobs:
build:
# Skip run when triggered by a tag
if: ${{ github.ref_type != 'tag' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:

# Build
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-client-server-pds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
- name: Create pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
# -----------------------------------------
- name: Create pull request for release documentation
id: pr_release_documentation
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-documentation
branch-suffix: short-commit-hash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-github-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Create pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- name: Create pull request for SecHub Github Action release
id: pr_gha-release
if: steps.github-actions_commit.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-github-action
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-pds-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -73,7 +73,7 @@ jobs:
- name: Create pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-webui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -91,7 +91,7 @@ jobs:
- name: Create pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-wrapper-checkmarx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -63,7 +63,7 @@ jobs:
- name: Create a pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-wrapper-owaspzap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -64,7 +64,7 @@ jobs:
- name: Create a pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-wrapper-prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -63,7 +63,7 @@ jobs:
- name: Create a pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -63,7 +63,7 @@ jobs:
- name: Create a pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-wrapper-xray.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
with:
cache-read-only: false

Expand All @@ -63,7 +63,7 @@ jobs:
- name: Create a pull request for SPDX license headers
id: pr_spdx_headers
if: steps.apply-headers.outputs.commits != ''
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
with:
branch: release-spdx-headers
branch-suffix: short-commit-hash
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ If you are new to contributing in Github, [First Contributions](https://github.c
## Create a fork
If you would like to contribute code you can do so through Mercedes-Benz GitHub by forking the repository and sending a pull request.

0. Make sure that an [issue on Github](https://github.com/mercedes-benz/sechub/issues) exists for your contribution
1. Fork the repository at `https://github.com/mercedes-benz/sechub.git` via web UI
2. Create a branch (e.g. "feature-868-rename-to-sechub-api-java") in your forked repository
3. Make your changes in this branch
4. Create a pull request from your fork via github.com web ui into our `community` branch (not `develop`!)
4. Create a pull request from your fork via github.com web ui into our `develop` branch

Inside the description it's a good way to mention the related issues with "closes #${issue number}" - this will automatically link the issue and the pull request inside the WebUI.<br>
It also will close the linked issue automatically when the pull request is merged!
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ plugins {
id 'org.asciidoctor.jvm.pdf' version '3.3.2'

// open api
id 'org.openapi.generator' version '7.7.0'
id 'org.openapi.generator' version '7.8.0'

// spring
id 'org.springframework.boot' version '3.2.2' apply false
Expand Down
1 change: 1 addition & 0 deletions github-actions/scan/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
runtime/
dist/
Loading
Loading