Fixing conflicts

Author: gkertasef

.secrets.baseline

@@ -3,11 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword"
   },
-<<<<<<< HEAD
-  "generated_at": "2025-08-22T19:43:14Z",
-=======
-  "generated_at": "2025-08-13T18:55:02Z",
->>>>>>> main
+  "generated_at": "2025-09-11T13:25:02Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -417,11 +413,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/full/server.xml": [
-=======
-    "ga/25.0.0.8/full/server.xml": [
->>>>>>> main
       {
         "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
         "is_secret": false,
@@ -431,11 +423,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -445,11 +433,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -459,11 +443,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -473,11 +453,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -487,11 +463,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -501,11 +473,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk11": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -515,11 +483,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk17": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -529,11 +493,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk21": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -543,11 +503,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk8": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -557,11 +513,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -571,11 +523,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -585,11 +533,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17": [
-=======
-    "ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17": [
->>>>>>> main
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -599,11 +543,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml": [
-=======
-    "ga/25.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml": [
->>>>>>> main
       {
         "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
         "is_secret": false,
@@ -613,11 +553,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml": [
-=======
-    "ga/25.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml": [
->>>>>>> main
       {
         "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
         "is_secret": false,
@@ -627,11 +563,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/kernel/helpers/runtime/docker-server.sh": [
-=======
-    "ga/25.0.0.8/kernel/helpers/runtime/docker-server.sh": [
->>>>>>> main
       {
         "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
         "is_secret": false,
@@ -641,11 +573,7 @@
         "verified_result": null
       }
     ],
-<<<<<<< HEAD
     "ga/25.0.0.9/oidcProvider/server.xml": [
-=======
-    "ga/25.0.0.8/oidcProvider/server.xml": [
->>>>>>> main
       {
         "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
         "is_secret": false,