From 8a581224d1fb3792433c9e6d13e74d4cb2b8a190 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Wed, 14 Aug 2024 16:47:31 +0200
Subject: [PATCH 1/8] build-verioning added #3359

---
 .../workflows/release-wrapper-validation.yml  |  6 ++--
 buildSrc/src/main/groovy/VersionData.groovy   | 18 +++++++----
 gradle/build-versioning.gradle                | 32 +++++++++++++++----
 sechub-wrapper-secret-validator/build.gradle  |  2 +-
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index efdf0dc445..cca3f07fc9 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -30,8 +30,8 @@ jobs:
 
       # Create temporary local tags, so we build documentation for this tag...
       # The final tag on git server side will be done automatically by the release when the draft is saved as "real" release
-      - name: Tag Secretscan Validation Wrapper version v${{ inputs.validation-wrapper-version }}-validation-wrapper (temporarily)
-        run: git tag v${{ inputs.validation-wrapper-version }}-validation-wrapper
+      - name: Tag Secretscan Validation Wrapper version v${{ inputs.validation-wrapper-version }}-secretvalidation-wrapper (temporarily)
+        run: git tag v${{ inputs.validation-wrapper-version }}-secretvalidation-wrapper
 
       # ----------------------
       # Setup + Caching
@@ -130,7 +130,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:
-          tag_name: v${{ inputs.validation-wrapper-version }}-validation-wrapper
+          tag_name: v${{ inputs.validation-wrapper-version }}-secretvalidation-wrapper
           commitish: master
           release_name: Secretscan Validation Wrapper Version ${{ inputs.validation-wrapper-version }}
           body: |
diff --git a/buildSrc/src/main/groovy/VersionData.groovy b/buildSrc/src/main/groovy/VersionData.groovy
index e03b7c56bc..84dcb85027 100644
--- a/buildSrc/src/main/groovy/VersionData.groovy
+++ b/buildSrc/src/main/groovy/VersionData.groovy
@@ -9,8 +9,9 @@ class VersionData{
     private static final String ID_WEBUI = "webui"
     private static final String ID_WRAPPER_CHECKMARX = "checkmarx wrapper"
     private static final String ID_WRAPPER_OWASPZAP = "owasp-zap wrapper"
-    private static final String ID_WRAPPER_XRAY= "xray wrapper"
     private static final String ID_WRAPPER_PREPARE= "prepare wrapper"
+    private static final String ID_WRAPPER_SECRETVALIDATION= "secretvalidation wrapper"
+    private static final String ID_WRAPPER_XRAY= "xray wrapper"
 
     private StringBuilder debugInfo = new StringBuilder();
 
@@ -28,10 +29,11 @@ class VersionData{
         initialize(ID_PDS_TOOLS,"PDS-Tools")
         initialize(ID_SERVER,   "Server")
         initialize(ID_WEBUI,    "WebUI")
-        initialize(ID_WRAPPER_CHECKMARX, "Checkmarx Wrapper")
-        initialize(ID_WRAPPER_OWASPZAP,  "OWASP-ZAP Wrapper")
-        initialize(ID_WRAPPER_XRAY,      "Xray Wrapper")
-        initialize(ID_WRAPPER_PREPARE,   "Prepare Wrapper")
+        initialize(ID_WRAPPER_CHECKMARX,        "Checkmarx Wrapper")
+        initialize(ID_WRAPPER_OWASPZAP,         "OWASP-ZAP Wrapper")
+        initialize(ID_WRAPPER_PREPARE,          "Prepare Wrapper")
+        initialize(ID_WRAPPER_SECRETVALIDATION, "SecretValidation Wrapper")
+        initialize(ID_WRAPPER_XRAY,             "Xray Wrapper")
     }
 
     public class VersionInfo{
@@ -43,7 +45,7 @@ class VersionData{
         String shortVersionForDocs
 
         public String describe(){
-            return text.padLeft(17)+": "+shortVersion+" ("+fullVersion+") docs: "+shortVersionForDocs
+            return text.padLeft(24)+": "+shortVersion+" ("+fullVersion+") docs: "+shortVersionForDocs
         }
 
     }
@@ -127,6 +129,10 @@ class VersionData{
         return map.get(ID_WRAPPER_PREPARE).getShortVersion()
     }
 
+    public String getSecretvalidationWrapperVersion(){
+        return map.get(ID_WRAPPER_SECRETVALIDATION).getShortVersion()
+    }
+
     public String getDebugInfo(){
 
         return "Debug info:\ncontainingAtLeastOneDirtyReleaseVersion=$containingAtLeastOneDirtyReleaseVersion\ncontainingAtLeastOneRealReleaseVersion=$containingAtLeastOneRealReleaseVersion\n\n$debugInfo";
diff --git a/gradle/build-versioning.gradle b/gradle/build-versioning.gradle
index 4aaafad08a..4a027c178e 100644
--- a/gradle/build-versioning.gradle
+++ b/gradle/build-versioning.gradle
@@ -46,14 +46,15 @@ def buildVersionFiles(){
     // We use "v${major}.${minor}.${hotfix}-${type}" pattern for tag names
     def clientVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-client") }
     def librariesVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-libraries") }
-    def checkmarxWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-checkmarx-wrapper") }
-    def owaspzapWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-owaspzap-wrapper") }
-    def xrayWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-xray-wrapper") }
-    def prepareWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-prepare-wrapper") }
     def pdsVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-pds") }
     def pdsToolsVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-pds-tools") }
     def serverVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-server") }
     def webuiVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-webui") }
+    def checkmarxWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-checkmarx-wrapper") }
+    def owaspzapWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-owaspzap-wrapper") }
+    def prepareWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-prepare-wrapper") }
+    def secretvalidationWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-secretvalidation-wrapper") }
+    def xrayWrapperVersionCommitTag = versionCommitTags.find{ it.name.endsWith("-xray-wrapper") }
 
     def unstagedChanges = git.status().unstaged
     def stagedChanges = git.status().staged
@@ -240,7 +241,23 @@ def buildVersionFiles(){
     def latestPrepareWrapperVersion = latestPrepareWrapperTag - 'v'
     latestPrepareWrapperVersion = latestPrepareWrapperVersion - "-prepare-wrapper"
 
-    def latestWrapperVersionInfo = versionData.defineVersion("Prepare Wrapper",buildVersionString(prepareWrapperVersionCommitTag, hasChanged, buildNumber),latestPrepareWrapperVersion)
+    def prepareWrapperVersionInfo = versionData.defineVersion("Prepare Wrapper",buildVersionString(prepareWrapperVersionCommitTag, hasChanged, buildNumber),latestPrepareWrapperVersion)
+
+    // ----------------------------
+    // - Secret Validation wrapper
+    // ----------------------------
+
+    // Get latest tagged secretvalidation-wrapper version
+    def latestSecretValidationWrapperTagCmd = [
+      'sh',
+      '-c',
+      'git tag -l --sort=-creatordate | grep -e \'^v.*-secretvalidation-wrapper$\' | head -1'
+    ]
+    def latestSecretValidationWrapperTag = latestSecretValidationWrapperTagCmd.execute().text.trim()
+    def latestSecretValidationWrapperVersion = latestSecretValidationWrapperTag - 'v'
+    latestSecretValidationWrapperVersion = latestSecretValidationWrapperVersion - "-secretvalidation-wrapper"
+
+    def secretvalidationWrapperVersionInfo = versionData.defineVersion("SecretValidation Wrapper",buildVersionString(secretvalidationWrapperVersionCommitTag, hasChanged, buildNumber),latestSecretValidationWrapperVersion)
 
 
     // ------------------------
@@ -269,8 +286,9 @@ def buildVersionFiles(){
     println(librariesVersionInfo.describe())
     println(checkmarxWrapperVersionInfo.describe())
     println(owaspzapWrapperVersionInfo.describe())
+    println(prepareWrapperVersionInfo.describe())
+    println(secretvalidationWrapperVersionInfo.describe())
     println(xrayWrapperVersionInfo.describe())
-    println(latestWrapperVersionInfo.describe())
 
     TimeDuration td = TimeCategory.minus( stop, start )
     println("\nTime elapsed to build versions: "+td)
@@ -322,6 +340,8 @@ def buildVersionString(commitTag, boolean hasChanged, buildNumber){
         calcversion = calcversion - "-webui"
         calcversion = calcversion - "-checkmarx-wrapper"
         calcversion = calcversion - "-owaspzap-wrapper"
+        calcversion = calcversion - "-prepare-wrapper"
+        calcversion = calcversion - "-secretvalidation-wrapper"
         calcversion = calcversion - "-xray-wrapper"
         // remove leading 'v'
         calcversion = calcversion - 'v'
diff --git a/sechub-wrapper-secret-validator/build.gradle b/sechub-wrapper-secret-validator/build.gradle
index dc4bd23da1..347c5aeec1 100644
--- a/sechub-wrapper-secret-validator/build.gradle
+++ b/sechub-wrapper-secret-validator/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     testImplementation spring_boot_dependency.mockito_core
 }
 
-// TODO Jan 2024-07-17: version = versionData.getSecretValidatorWrapperVersion()
+version = versionData.getSecretvalidationWrapperVersion()
 
 compileJava {
 

From 492e3cb10897c74ece831ba5f8f9b7c1031eb5e5 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 09:34:49 +0200
Subject: [PATCH 2/8] release job part1 #3359

---
 .../workflows/release-wrapper-validation.yml  | 74 ++++++++++---------
 .../gitleaks/docker/scripts/gitleaks.sh       | 15 ++--
 sechub-wrapper-secret-validator/build.gradle  |  6 +-
 3 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index cca3f07fc9..a55e258ec1 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -7,31 +7,33 @@ on:
       actor-email:
         description: Insert your email address here. It will be used in the generated pull requests
         required: true
-      validation-wrapper-version:
-        description: Secretscan-Validation-wrapper Version (e.g. 1.0.0)
+      secretvalidation-wrapper-version:
+        description: Secret-Validation-wrapper Version (e.g. 1.0.0)
         required: true
-      validation-wrapper-milestone-number:
-        description: Secretscan-Validation-wrapper Milestone number (e.g. 153)
+      secretvalidation-wrapper-milestone-number:
+        description: Secret-Validation-wrapper Milestone number (e.g. 153)
         required: true
 jobs:
   release-version:
-    name: Create Secretscan-Validation-wrapper release
+    name: Create Secret-Validation-wrapper release
     runs-on: ubuntu-latest
     steps:
       - name: "Show Inputs"
         run: |
           echo "actor-email: '${{ inputs.actor-email }}'"
-          echo "Secretscan-Validation-wrapper '${{ inputs.validation-wrapper-version }}' - Milestone '${{ inputs.validation-wrapper-milestone-number }}'"
+          echo "Secret-Validation-wrapper '${{ inputs.secretvalidation-wrapper-version }}' - Milestone '${{ inputs.secretvalidation-wrapper-milestone-number }}'"
 
       - name: Checkout branch master
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
-          ref: master
+          # ref: master
+          # temporary: development branch - please remove before merging!
+          ref: feature-3359-validation-wrapper-release-and-integration
 
       # Create temporary local tags, so we build documentation for this tag...
       # The final tag on git server side will be done automatically by the release when the draft is saved as "real" release
-      - name: Tag Secretscan Validation Wrapper version v${{ inputs.validation-wrapper-version }}-secretvalidation-wrapper (temporarily)
-        run: git tag v${{ inputs.validation-wrapper-version }}-secretvalidation-wrapper
+      - name: Tag Secret-Validation Wrapper version v${{ inputs.secretvalidation-wrapper-version }}-secretvalidation-wrapper (temporarily)
+        run: git tag v${{ inputs.secretvalidation-wrapper-version }}-secretvalidation-wrapper
 
       # ----------------------
       # Setup + Caching
@@ -68,11 +70,11 @@ jobs:
           branch: release-spdx-headers
           branch-suffix: short-commit-hash
           delete-branch: true
-          title: '0 - Before validation-wrapper release: Add missing SPDX license headers [auto-generated]'
+          title: '0 - Before secretvalidation-wrapper release: Add missing SPDX license headers [auto-generated]'
           body: |
-            Auto-generated by Github Actions validation-wrapper release job.
+            Auto-generated by Github Actions secretvalidation-wrapper release job.
 
-            -> Please review and merge **before** publishing the validation-wrapper release.
+            -> Please review and merge **before** publishing the secretvalidation-wrapper release.
 
       - name: Print PR infos
         if: steps.apply-headers.outputs.commits != ''
@@ -84,9 +86,9 @@ jobs:
         run: git checkout master
 
       # -----------------------------------------
-      # Build SecHub Secretscan Validation Wrapper
+      # Build SecHub Secret-Validation Wrapper
       # -----------------------------------------
-      - name: Build Secretscan Validation Wrapper
+      - name: Build Secret-Validation Wrapper
         run: ./gradlew :sechub-wrapper-validation:bootjar
 
       # -----------------------------------------
@@ -106,7 +108,7 @@ jobs:
           path: build/reports/git-status.txt
           retention-days: 14
 
-      - name: Archive Secretscan Validation Wrapper libs directory
+      - name: Archive Secret-Validation Wrapper libs directory
         if: always()
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
@@ -124,64 +126,64 @@ jobs:
       - name: Assert releasable
         run: ./gradlew assertReleaseable
 
-      - name: Create Secretscan Validation Wrapper release
-        id: create_validation-wrapper_release
+      - name: Create Secret-Validation Wrapper release
+        id: create_secretvalidation-wrapper_release
         uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:
-          tag_name: v${{ inputs.validation-wrapper-version }}-secretvalidation-wrapper
+          tag_name: v${{ inputs.secretvalidation-wrapper-version }}-secretvalidation-wrapper
           commitish: master
-          release_name: Secretscan Validation Wrapper Version ${{ inputs.validation-wrapper-version }}
+          release_name: Secret-Validation Wrapper Version ${{ inputs.secretvalidation-wrapper-version }}
           body: |
             Changes in this Release
-            - Some minor changes on Secretscan Validation Wrapper implementation
+            - Some minor changes on Secret-Validation Wrapper implementation
 
-            For more details please look at [Milestone ${{inputs.validation-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.validation-wrapper-milestone-number}}?closed=1)
+            For more details please look at [Milestone ${{inputs.secretvalidation-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.secretvalidation-wrapper-milestone-number}}?closed=1)
           draft: true
           prerelease: false
 
       # -----------------------------------------
       # Upload release artifacts
       # -----------------------------------------
-      - name: Create files and sha256 checksum for Secretscan Validation Wrapper jar
+      - name: Create files and sha256 checksum for Secret-Validation Wrapper jar
         run: |
           cd sechub-wrapper-validation/build/libs/
-          sha256sum sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar > sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar.sha256sum
+          sha256sum sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar > sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
 
-      - name: Upload asset sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar
+      - name: Upload asset sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar
         uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_validation-wrapper_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar
-          asset_name: sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar
+          upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }}
+          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar
+          asset_name: sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar
           asset_content_type: application/zip
 
-      - name: Upload asset sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar.sha256sum
+      - name: Upload asset sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
         uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_validation-wrapper_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar.sha256sum
-          asset_name: sechub-wrapper-validation-${{ inputs.validation-wrapper-version }}.jar.sha256sum
+          upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }}
+          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
+          asset_name: sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
           asset_content_type: text/plain
 
       # -----------------------------------------
       # Create release issue
       # -----------------------------------------
-      - name: Create Secretscan Validation Wrapper ${{ inputs.validation-wrapper-version }} release issue
+      - name: Create Secret-Validation Wrapper ${{ inputs.secretvalidation-wrapper-version }} release issue
         uses: dacbd/create-issue-action@main
         with:
           token: ${{ github.token }}
-          title: Release Secretscan Validation Wrapper ${{ inputs.validation-wrapper-version }}
+          title: Release Secret-Validation Wrapper ${{ inputs.secretvalidation-wrapper-version }}
           body: |
-            See [Milestone ${{inputs.validation-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.validation-wrapper-milestone-number}}?closed=1) for details.
+            See [Milestone ${{inputs.secretvalidation-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.secretvalidation-wrapper-milestone-number}}?closed=1) for details.
 
             Please close this issue after the release.
-          milestone: ${{ inputs.validation-wrapper-milestone-number }}
+          milestone: ${{ inputs.secretvalidation-wrapper-milestone-number }}
 
       # -----------------------------------------
       # Create a pull request for merging back `master` into `develop`
@@ -195,7 +197,7 @@ jobs:
           source_branch: "master"
           destination_branch: "develop"
           pr_allow_empty: true  # should allow an empty PR, but seems not to work
-          pr_title: '2 - After Secretscan Validation Wrapper release: Merge master back into develop [auto-generated]'
+          pr_title: '2 - After Secret-Validation Wrapper release: Merge master back into develop [auto-generated]'
           pr_body: |
             Merge master branch back into develop
 
diff --git a/sechub-pds-solutions/gitleaks/docker/scripts/gitleaks.sh b/sechub-pds-solutions/gitleaks/docker/scripts/gitleaks.sh
index d3d30dc4df..6299b3b433 100755
--- a/sechub-pds-solutions/gitleaks/docker/scripts/gitleaks.sh
+++ b/sechub-pds-solutions/gitleaks/docker/scripts/gitleaks.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/bash
 # SPDX-License-Identifier: MIT
 
-declare -r secretvalidation_wrapper="$TOOL_FOLDER/sechub-wrapper-secret-validator.jar"
+declare -r secretvalidation_wrapper="$TOOL_FOLDER/sechub-wrapper-secretvalidation.jar"
 
-if [[ "$PDS_INTEGRATIONTEST_ENABLED" = "true" ]]; then
+if [[ "$PDS_INTEGRATIONTEST_ENABLED" = "true" ]] ; then
     echo "Integrationtest will be performed. Gitleaks will not be executed."
     
     # Execute the wrapper using the 'integrationtest' profile
@@ -13,7 +13,7 @@ if [[ "$PDS_INTEGRATIONTEST_ENABLED" = "true" ]]; then
 fi
 
 
-. "$SCRIPT_FOLDER/common.sh"
+source "$SCRIPT_FOLDER/common.sh"
 
 echo "Look for potential .git folder to perform history scan."
 
@@ -27,20 +27,17 @@ scan_target_directory="$PDS_JOB_EXTRACTED_SOURCES_FOLDER"
 gitleaks_options="--log-level debug --config $TOOL_FOLDER/custom-gitleaks.toml --source . --report-format sarif --report-path $PDS_JOB_RESULT_FILE --exit-code 0"
 
 # If the history scan was disabled, a normal filesystem scan is performed.
-if [ "$GITLEAKS_HISTORY_SCAN_ENABLED" = "false" ]
-then
+if [ "$GITLEAKS_HISTORY_SCAN_ENABLED" = "false" ] ; then
     gitleaks_options="$gitleaks_options --no-git"
     echo "History scan was disabled by an administrator. A secret scan on the filesystem without history deepscan will be done instead." | tee "$PDS_JOB_USER_MESSAGES_FOLDER"/history-scan-disabled.txt
     
 # If no '.git' directory was found we cannot scan the git history
-elif [ -z "$git_directory" ]
-then
+elif [ -z "$git_directory" ] ; then
     gitleaks_options="$gitleaks_options --no-git"
     echo "No .git folder was uploaded for the secret scan. A secret scan on the filesystem without history deepscan will be done instead." | tee "$PDS_JOB_USER_MESSAGES_FOLDER"/no-git.txt
 
 # If the value of 'git_directory' is not a valid directory there is more than a single result of the find command
-elif [ ! -d "$git_directory" ]
-then
+elif [ ! -d "$git_directory" ] ; then
     gitleaks_options="$gitleaks_options --no-git"
     echo "Multiple .git folders were uploaded for the secret scan. This is not supported. A secret scan on the filesystem without history deepscan will be done instead." | tee "$PDS_JOB_USER_MESSAGES_FOLDER"/multiple-git.txt
 
diff --git a/sechub-wrapper-secret-validator/build.gradle b/sechub-wrapper-secret-validator/build.gradle
index 347c5aeec1..3eb20b8f78 100644
--- a/sechub-wrapper-secret-validator/build.gradle
+++ b/sechub-wrapper-secret-validator/build.gradle
@@ -30,13 +30,13 @@ compileJava {
 bootJar {
 
      doLast {
-            /* Here we copy the created wrapper jar as "sechub-wrapper-secret-validator.jar" into the
+            /* Here we copy the created wrapper jar as "sechub-wrapper-secretvalidation.jar" into the
              * pds-tools folder inside the sechub-integrationtest gradle subproject.
              *
              *  This enables integration test script to use the solution secret-validator.sh script
              *  and just set as tool folder: ${project.buildDir}/pds-tools
              */
-            File integratonTestLaunchFile = new File("${rootProject.projectDir}/sechub-integrationtest/build/pds-tools/sechub-wrapper-secret-validator.jar")
+            File integratonTestLaunchFile = new File("${rootProject.projectDir}/sechub-integrationtest/build/pds-tools/sechub-wrapper-secretvalidation.jar")
 
             if (integratonTestLaunchFile.exists()){
                 java.nio.file.Files.delete(integratonTestLaunchFile.toPath())
@@ -44,7 +44,7 @@ bootJar {
                 integratonTestLaunchFile.getParentFile().mkdirs();
             }
 
-            File buildFile = new File("${project.buildDir}/libs/sechub-wrapper-secret-validator-${project.version}.jar")
+            File buildFile = new File("${project.buildDir}/libs/sechub-wrapper-secretvalidation-${project.version}.jar")
             java.nio.file.Files.copy(buildFile.toPath(),integratonTestLaunchFile.toPath())
     }
 

From 40d1a61e57d4d1881de014f43bae25b246ab0274 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 09:40:18 +0200
Subject: [PATCH 3/8] release job part2 #3359

---
 .github/workflows/release-wrapper-validation.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index a55e258ec1..ae71521c07 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT
 name: Release Secretscan Validation Wrapper
+# name: Release Wrapper for Secret-Validation
 
 on:
   workflow_dispatch:
@@ -23,7 +24,7 @@ jobs:
           echo "actor-email: '${{ inputs.actor-email }}'"
           echo "Secret-Validation-wrapper '${{ inputs.secretvalidation-wrapper-version }}' - Milestone '${{ inputs.secretvalidation-wrapper-milestone-number }}'"
 
-      - name: Checkout branch master
+      - name: Checkout branch feature-3359-validation-wrapper-release-and-integration
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
           # ref: master
@@ -82,8 +83,8 @@ jobs:
           echo "Pull Request Number - ${{ steps.pr_spdx_headers.outputs.pull-request-number }}"
           echo "Pull Request URL - ${{ steps.pr_spdx_headers.outputs.pull-request-url }}"
 
-      - name: Switch back to master branch
-        run: git checkout master
+      - name: Switch back to feature-3359-validation-wrapper-release-and-integration branch
+        run: git checkout feature-3359-validation-wrapper-release-and-integration
 
       # -----------------------------------------
       # Build SecHub Secret-Validation Wrapper
@@ -116,8 +117,8 @@ jobs:
           path: sechub-wrapper-validation/build/libs
           retention-days: 14
 
-      - name: Switch back to master branch
-        run: git checkout master
+      - name: Switch back to feature-3359-validation-wrapper-release-and-integration branch
+        run: git checkout feature-3359-validation-wrapper-release-and-integration
 
       # -----------------------------------------
       # Assert releaseable, so no dirty flags on releases

From 865b0fe00194e9b842e50fa09aae4996963b2819 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 09:55:31 +0200
Subject: [PATCH 4/8] renamed project to sechub-wrapper-secretvalidation #3359

---
 gradle/projects.gradle                                        | 4 ++--
 .../README.adoc                                               | 0
 .../build.gradle                                              | 0
 .../wrapper/secret/validator/SecretValidatorApplication.java  | 0
 .../wrapper/secret/validator/cli/SecretValidatorCLI.java      | 0
 .../secret/validator/execution/ResponseValidationService.java | 0
 .../secret/validator/execution/SecretValidationResult.java    | 0
 .../secret/validator/execution/SecretValidationService.java   | 0
 .../validator/execution/SecretValidationServiceImpl.java      | 0
 .../secret/validator/execution/SecretValidationStatus.java    | 0
 .../validator/execution/SecretValidatorExecutionContext.java  | 0
 .../execution/SecretValidatorExecutionContextFactory.java     | 0
 .../validator/execution/SecretValidatorExecutionService.java  | 0
 .../validator/execution/SecretValidatorSpringProfiles.java    | 0
 .../validator/execution/SecretValidatorWebRequestService.java | 0
 .../execution/SerecoSeveritySarifEnhancementService.java      | 0
 .../test/IntegrationTestSecretValidationServiceImpl.java      | 0
 .../secret/validator/model/SecretValidatorCategorization.java | 0
 .../validator/model/SecretValidatorConfigurationModel.java    | 0
 .../model/SecretValidatorConfigurationModelList.java          | 0
 .../secret/validator/model/SecretValidatorRequest.java        | 0
 .../secret/validator/model/SecretValidatorRequestHeader.java  | 0
 .../secret/validator/model/SecretValidatorResponse.java       | 0
 .../validator/model/SecretValidatorResponseContains.java      | 0
 .../validator/properties/SecretValidatorConfiguration.java    | 0
 .../validator/properties/SecretValidatorPDSJobResult.java     | 0
 .../validator/properties/SecretValidatorProperties.java       | 0
 .../wrapper/secret/validator/support/SarifImporterKeys.java   | 0
 .../secret/validator/support/SarifValidationSupport.java      | 0
 .../validator/support/SecretValidatorHttpClientFactory.java   | 0
 .../secret/validator/cli/SecretValidatorSpringBootTest.java   | 0
 .../validator/execution/ResponseValidationServiceTest.java    | 0
 .../validator/execution/SecretValidationResultTest.java       | 0
 .../validator/execution/SecretValidationServiceImplTest.java  | 0
 .../execution/SecretValidatorExecutionContextFactoryTest.java | 0
 .../execution/SecretValidatorExecutionServiceTest.java        | 0
 .../execution/SecretValidatorWebRequestServiceTest.java       | 0
 .../execution/SerecoSeveritySarifEnhancementServiceTest.java  | 0
 .../model/SecretValidatorConfigurationModelListTest.java      | 0
 .../SecretValidatorConfigurationSpringBootTest.java           | 0
 .../validator/properties/SecretValidatorPDSJobResultTest.java | 0
 .../validator/properties/SecretValidatorPropertiesTest.java   | 0
 .../secret/validator/support/SarifValidationSupportTest.java  | 0
 .../support/SecretValidatorHttpClientFactoryTest.java         | 0
 .../config-test-files/invalid-files/invalid-sarif.txt         | 0
 .../invalid-files/invalid-validator-config.txt                | 0
 .../resources/config-test-files/valid-files/test-config.json  | 0
 .../resources/config-test-files/valid-files/test-result.txt   | 0
 settings.gradle                                               | 2 +-
 49 files changed, 3 insertions(+), 3 deletions(-)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/README.adoc (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/build.gradle (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/SecretValidatorApplication.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorCLI.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationService.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResult.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationService.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImpl.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationStatus.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContext.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactory.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionService.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorSpringProfiles.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestService.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementService.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/test/IntegrationTestSecretValidationServiceImpl.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorCategorization.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModel.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelList.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequestHeader.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponse.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponseContains.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfiguration.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResult.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorProperties.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifImporterKeys.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupport.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactory.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorSpringBootTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationServiceTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResultTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImplTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactoryTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionServiceTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestServiceTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementServiceTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelListTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfigurationSpringBootTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResultTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPropertiesTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupportTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactoryTest.java (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/resources/config-test-files/invalid-files/invalid-sarif.txt (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/resources/config-test-files/invalid-files/invalid-validator-config.txt (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/resources/config-test-files/valid-files/test-config.json (100%)
 rename {sechub-wrapper-secret-validator => sechub-wrapper-secretvalidation}/src/test/resources/config-test-files/valid-files/test-result.txt (100%)

diff --git a/gradle/projects.gradle b/gradle/projects.gradle
index 1f85b461d3..353eca6063 100644
--- a/gradle/projects.gradle
+++ b/gradle/projects.gradle
@@ -54,7 +54,7 @@ projectType = [
                     project(':sechub-wrapper-checkmarx'),
                     project(':sechub-wrapper-prepare'),
 
-                    project(':sechub-wrapper-secret-validator'),
+                    project(':sechub-wrapper-secretvalidation'),
 
                     /* archUnit */
                     project(':sechub-archunit-test')
@@ -103,7 +103,7 @@ projectType = [
                    project(':sechub-wrapper-checkmarx'),
                    project(':sechub-wrapper-prepare'),
                    project(':sechub-webui'),
-                   project(':sechub-wrapper-secret-validator'),
+                   project(':sechub-wrapper-secretvalidation'),
             ],
 
             springBootWebUIProjects:[
diff --git a/sechub-wrapper-secret-validator/README.adoc b/sechub-wrapper-secretvalidation/README.adoc
similarity index 100%
rename from sechub-wrapper-secret-validator/README.adoc
rename to sechub-wrapper-secretvalidation/README.adoc
diff --git a/sechub-wrapper-secret-validator/build.gradle b/sechub-wrapper-secretvalidation/build.gradle
similarity index 100%
rename from sechub-wrapper-secret-validator/build.gradle
rename to sechub-wrapper-secretvalidation/build.gradle
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/SecretValidatorApplication.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/SecretValidatorApplication.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/SecretValidatorApplication.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/SecretValidatorApplication.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorCLI.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorCLI.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorCLI.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorCLI.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationService.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationService.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationService.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationService.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResult.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResult.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResult.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResult.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationService.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationService.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationService.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationService.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImpl.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImpl.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImpl.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImpl.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationStatus.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationStatus.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationStatus.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationStatus.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContext.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContext.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContext.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContext.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactory.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactory.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactory.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactory.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionService.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionService.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionService.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionService.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorSpringProfiles.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorSpringProfiles.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorSpringProfiles.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorSpringProfiles.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestService.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestService.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestService.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestService.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementService.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementService.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementService.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementService.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/test/IntegrationTestSecretValidationServiceImpl.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/test/IntegrationTestSecretValidationServiceImpl.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/test/IntegrationTestSecretValidationServiceImpl.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/test/IntegrationTestSecretValidationServiceImpl.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorCategorization.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorCategorization.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorCategorization.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorCategorization.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModel.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModel.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModel.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModel.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelList.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelList.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelList.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelList.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequest.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequest.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequest.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequestHeader.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequestHeader.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequestHeader.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorRequestHeader.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponse.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponse.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponse.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponse.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponseContains.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponseContains.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponseContains.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorResponseContains.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfiguration.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfiguration.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfiguration.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfiguration.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResult.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResult.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResult.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResult.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorProperties.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorProperties.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorProperties.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorProperties.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifImporterKeys.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifImporterKeys.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifImporterKeys.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifImporterKeys.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupport.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupport.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupport.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupport.java
diff --git a/sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactory.java b/sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactory.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactory.java
rename to sechub-wrapper-secretvalidation/src/main/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactory.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorSpringBootTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorSpringBootTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorSpringBootTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/cli/SecretValidatorSpringBootTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationServiceTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationServiceTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationServiceTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/ResponseValidationServiceTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResultTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResultTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResultTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationResultTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImplTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImplTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImplTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidationServiceImplTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactoryTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactoryTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactoryTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionContextFactoryTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionServiceTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionServiceTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionServiceTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorExecutionServiceTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestServiceTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestServiceTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestServiceTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SecretValidatorWebRequestServiceTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementServiceTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementServiceTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementServiceTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/execution/SerecoSeveritySarifEnhancementServiceTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelListTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelListTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelListTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/model/SecretValidatorConfigurationModelListTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfigurationSpringBootTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfigurationSpringBootTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfigurationSpringBootTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorConfigurationSpringBootTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResultTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResultTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResultTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPDSJobResultTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPropertiesTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPropertiesTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPropertiesTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/properties/SecretValidatorPropertiesTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupportTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupportTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupportTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SarifValidationSupportTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactoryTest.java b/sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactoryTest.java
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactoryTest.java
rename to sechub-wrapper-secretvalidation/src/test/java/com/mercedesbenz/sechub/wrapper/secret/validator/support/SecretValidatorHttpClientFactoryTest.java
diff --git a/sechub-wrapper-secret-validator/src/test/resources/config-test-files/invalid-files/invalid-sarif.txt b/sechub-wrapper-secretvalidation/src/test/resources/config-test-files/invalid-files/invalid-sarif.txt
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/resources/config-test-files/invalid-files/invalid-sarif.txt
rename to sechub-wrapper-secretvalidation/src/test/resources/config-test-files/invalid-files/invalid-sarif.txt
diff --git a/sechub-wrapper-secret-validator/src/test/resources/config-test-files/invalid-files/invalid-validator-config.txt b/sechub-wrapper-secretvalidation/src/test/resources/config-test-files/invalid-files/invalid-validator-config.txt
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/resources/config-test-files/invalid-files/invalid-validator-config.txt
rename to sechub-wrapper-secretvalidation/src/test/resources/config-test-files/invalid-files/invalid-validator-config.txt
diff --git a/sechub-wrapper-secret-validator/src/test/resources/config-test-files/valid-files/test-config.json b/sechub-wrapper-secretvalidation/src/test/resources/config-test-files/valid-files/test-config.json
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/resources/config-test-files/valid-files/test-config.json
rename to sechub-wrapper-secretvalidation/src/test/resources/config-test-files/valid-files/test-config.json
diff --git a/sechub-wrapper-secret-validator/src/test/resources/config-test-files/valid-files/test-result.txt b/sechub-wrapper-secretvalidation/src/test/resources/config-test-files/valid-files/test-result.txt
similarity index 100%
rename from sechub-wrapper-secret-validator/src/test/resources/config-test-files/valid-files/test-result.txt
rename to sechub-wrapper-secretvalidation/src/test/resources/config-test-files/valid-files/test-result.txt
diff --git a/settings.gradle b/settings.gradle
index 2b5c400749..53f9a806f8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -99,7 +99,7 @@ include 'sechub-cli',
 'sechub-wrapper-xray',
 
 // secret validator
-'sechub-wrapper-secret-validator',
+'sechub-wrapper-secretvalidation',
 
 /* System Test */
 'sechub-systemtest',

From ff8e5ac2ad4c4f8b9764407c5c62665f2be5aebe Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 09:59:22 +0200
Subject: [PATCH 5/8] gradle call updated #3359

---
 .github/workflows/release-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index ae71521c07..292acdef47 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -90,7 +90,7 @@ jobs:
       # Build SecHub Secret-Validation Wrapper
       # -----------------------------------------
       - name: Build Secret-Validation Wrapper
-        run: ./gradlew :sechub-wrapper-validation:bootjar
+        run: ./gradlew :sechub-wrapper-secretvalidation:bootJar
 
       # -----------------------------------------
       # Upload build artifacts

From 7b4b5ff7b48a33fb5d44c5d80a129a37e8d56ff8 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 10:05:35 +0200
Subject: [PATCH 6/8] updated artifact name #3359

---
 .github/workflows/release-wrapper-validation.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index 292acdef47..217187ddab 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -150,26 +150,26 @@ jobs:
       - name: Create files and sha256 checksum for Secret-Validation Wrapper jar
         run: |
           cd sechub-wrapper-validation/build/libs/
-          sha256sum sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar > sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
+          sha256sum sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar > sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
 
-      - name: Upload asset sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar
+      - name: Upload asset sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
         uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar
-          asset_name: sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar
+          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
+          asset_name: sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
           asset_content_type: application/zip
 
-      - name: Upload asset sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
+      - name: Upload asset sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
         uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
-          asset_name: sechub-wrapper-validation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
+          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
+          asset_name: sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
           asset_content_type: text/plain
 
       # -----------------------------------------

From 3d12abde81a67b9b3f9ffb2da8ffa9901e0c02b7 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 10:08:44 +0200
Subject: [PATCH 7/8] updated jar path #3359

---
 .github/workflows/release-wrapper-validation.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index 217187ddab..7903a2ede0 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -113,8 +113,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
-          name: sechub-wrapper-validation
-          path: sechub-wrapper-validation/build/libs
+          name: sechub-wrapper-secretvalidation
+          path: sechub-wrapper-secretvalidation/build/libs
           retention-days: 14
 
       - name: Switch back to feature-3359-validation-wrapper-release-and-integration branch
@@ -149,7 +149,7 @@ jobs:
       # -----------------------------------------
       - name: Create files and sha256 checksum for Secret-Validation Wrapper jar
         run: |
-          cd sechub-wrapper-validation/build/libs/
+          cd sechub-wrapper-secretvalidation/build/libs/
           sha256sum sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar > sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
 
       - name: Upload asset sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
@@ -158,7 +158,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
+          asset_path: sechub-wrapper-secretvalidation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
           asset_name: sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar
           asset_content_type: application/zip
 
@@ -168,7 +168,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-validation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
+          asset_path: sechub-wrapper-secretvalidation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
           asset_name: sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum
           asset_content_type: text/plain
 

From ca79a5e7758032e72adaf38cbf319b6cb8f7b3e3 Mon Sep 17 00:00:00 2001
From: Sven Dolderer <sven.dolderer@mercedes-benz.com>
Date: Thu, 15 Aug 2024 10:14:18 +0200
Subject: [PATCH 8/8] actions workflow production-ready #3359

---
 .../workflows/release-wrapper-validation.yml    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml
index 7903a2ede0..7605ac60dc 100644
--- a/.github/workflows/release-wrapper-validation.yml
+++ b/.github/workflows/release-wrapper-validation.yml
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
-name: Release Secretscan Validation Wrapper
-# name: Release Wrapper for Secret-Validation
+name: Release Wrapper for Secret-Validation
 
 on:
   workflow_dispatch:
@@ -24,12 +23,10 @@ jobs:
           echo "actor-email: '${{ inputs.actor-email }}'"
           echo "Secret-Validation-wrapper '${{ inputs.secretvalidation-wrapper-version }}' - Milestone '${{ inputs.secretvalidation-wrapper-milestone-number }}'"
 
-      - name: Checkout branch feature-3359-validation-wrapper-release-and-integration
+      - name: Checkout branch master
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
-          # ref: master
-          # temporary: development branch - please remove before merging!
-          ref: feature-3359-validation-wrapper-release-and-integration
+          ref: master
 
       # Create temporary local tags, so we build documentation for this tag...
       # The final tag on git server side will be done automatically by the release when the draft is saved as "real" release
@@ -83,8 +80,8 @@ jobs:
           echo "Pull Request Number - ${{ steps.pr_spdx_headers.outputs.pull-request-number }}"
           echo "Pull Request URL - ${{ steps.pr_spdx_headers.outputs.pull-request-url }}"
 
-      - name: Switch back to feature-3359-validation-wrapper-release-and-integration branch
-        run: git checkout feature-3359-validation-wrapper-release-and-integration
+      - name: Switch back to master branch
+        run: git checkout master
 
       # -----------------------------------------
       # Build SecHub Secret-Validation Wrapper
@@ -117,8 +114,8 @@ jobs:
           path: sechub-wrapper-secretvalidation/build/libs
           retention-days: 14
 
-      - name: Switch back to feature-3359-validation-wrapper-release-and-integration branch
-        run: git checkout feature-3359-validation-wrapper-release-and-integration
+      - name: Switch back to master branch
+        run: git checkout master
 
       # -----------------------------------------
       # Assert releaseable, so no dirty flags on releases