Merge branch 'feature-345-summary-in-reports' of https://github.com/z…

…igfridus/sechub into feature-345-summary-in-reports
mercedes-benz · Apr 27, 2023 · 6b4f0a3 · 6b4f0a3
2 parents d4d1a83 + e120a14
commit 6b4f0a3
Show file tree

Hide file tree

Showing 81 changed files with 1,848 additions and 357 deletions.
diff --git a/.github/workflows/create-pds-tools-release.yml b/.github/workflows/create-pds-tools-release.yml
@@ -61,7 +61,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@v4.2.4
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           branch: release-spdx-headers
           branch-suffix: short-commit-hash

diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml
@@ -110,7 +110,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@v4.2.4
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           branch: release-spdx-headers
           branch-suffix: short-commit-hash
@@ -262,7 +262,7 @@ jobs:
       # -----------------------------------------
       - name: Create pull request for release documentation
         id: pr_release_documentation
-        uses: peter-evans/create-pull-request@v4.2.4
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           branch: release-documentation
           branch-suffix: short-commit-hash

diff --git a/.github/workflows/release-checkmarx-wrapper.yml b/.github/workflows/release-checkmarx-wrapper.yml
@@ -55,7 +55,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@v4.2.4
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           branch: release-spdx-headers
           branch-suffix: short-commit-hash

diff --git a/.github/workflows/release-owaspzap-wrapper.yml b/.github/workflows/release-owaspzap-wrapper.yml
@@ -56,7 +56,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@v4.2.4
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           branch: release-spdx-headers
           branch-suffix: short-commit-hash

diff --git a/.gitignore b/.gitignore
@@ -61,5 +61,8 @@ java-gen/
 copy/
 !copy/README.adoc
 
+*.deb
+*.apk
+
 # Node
 node_modules/
diff --git a/build.gradle b/build.gradle
@@ -31,14 +31,14 @@ plugins {
     id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 
     // open api
-    id 'org.openapi.generator' version '6.4.0'
+    id 'org.openapi.generator' version '6.5.0'
 
     // spring
-    id 'org.springframework.boot' version '2.7.8' apply false
+    id 'org.springframework.boot' version '2.7.11' apply false
 
     // spotless code formatter
     // (see https://github.com/diffplug/spotless)
-    id 'com.diffplug.spotless' version '6.16.0'
+    id 'com.diffplug.spotless' version '6.18.0'
 
     // versions plugin for checking new available library versions etc. 
     // (see https://github.com/ben-manes/gradle-versions-plugin)

diff --git a/...sus/src/test/java/com/mercedesbenz/sechub/adapter/nessus/NessusAdapterV1WireMockTest.java b/...sus/src/test/java/com/mercedesbenz/sechub/adapter/nessus/NessusAdapterV1WireMockTest.java
@@ -305,9 +305,9 @@ private void simulateServerRepsonseForFileExportStatus(String sessionToken, int
         ;
         stubFor(get(
                 urlEqualTo(history.rememberGET(apiURLSupport.assertCheck(expectedCheckIndex).nextURL("/scans/" + scanId + "/export/" + fileId + "/status"))))
-                        // .inScenario(chain.getScenario()).whenScenarioStateIs(chain.getStateBefore())
-                        .withHeader("X-Cookie", equalTo("token=" + sessionToken)).withHeader("Content-Type", equalTo(APPLICATION_JSON))
-                        .willReturn(aResponse().withStatus(HttpStatus.OK.value()).withHeader("Content-Type", APPLICATION_JSON).withBody(resultExport))
+                // .inScenario(chain.getScenario()).whenScenarioStateIs(chain.getStateBefore())
+                .withHeader("X-Cookie", equalTo("token=" + sessionToken)).withHeader("Content-Type", equalTo(APPLICATION_JSON))
+                .willReturn(aResponse().withStatus(HttpStatus.OK.value()).withHeader("Content-Type", APPLICATION_JSON).withBody(resultExport))
 //                    ).
 //                willSetStateTo(chain.getStateAfter())
         );

diff --git a/docs/latest/client-download.html b/docs/latest/client-download.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-   <meta http-equiv="refresh" content="0; URL=https://github.com/mercedes-benz/sechub/releases/download/v0.35.0-client/sechub-cli-0.35.0.zip">
+   <meta http-equiv="refresh" content="0; URL=https://github.com/mercedes-benz/sechub/releases/download/v0.35.1-client/sechub-cli-0.35.1.zip">
    <title>Main Page</title>
 </head>
 <body></body>

diff --git a/docs/latest/images/diagram_target_architecture.svg b/docs/latest/images/diagram_target_architecture.svg
diff --git a/docs/latest/images/event_overview_uc_admin_unassigns_user_from_project.svg b/docs/latest/images/event_overview_uc_admin_unassigns_user_from_project.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,5 +61,8 @@ java-gen/ @@
     copy/
     !copy/README.adoc
+    *.deb
+    *.apk
     # Node
     node_modules/