Skip to content

Merge vNext commits to main#697

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.

Sign up for GitHub

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

Merged
leochr merged 11 commits into from
Jun 17, 2025
Merged

Merge vNext commits to main #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
071c2e5
Add MP Health health check scripts + update PATH (#692)
Channyboy Jun 2, 2025
9ce7a32
Add keystore.xml to overrides, not defaults, when keystore is generat…
leochr Jun 2, 2025
7538089
Merge pull request #693 from WASdev/keystore-config-override
idlewis Jun 3, 2025
42b100d
Pre-eGA updates for 25.0.0.6 (#694)
wraschke Jun 4, 2025
1cd5f2a
Explicitly specify the default keystore location and type in keystore…
leochr Jun 11, 2025
93ac80c
Merge pull request #695 from WASdev/keystore-config
idlewis Jun 12, 2025
9074608
Remove 24.0.0.12 directory
leochr Jun 13, 2025
39c95b4
Update secrets baseline to remove references of 24.0.0.12
leochr Jun 13, 2025
0bbeb6e
Merge pull request #696 from WASdev/remove-240012
leochr Jun 13, 2025
880469a
Merge conflict fixes from command line
wraschke Jun 17, 2025
eb1a0b6
Merge pull request #698 from wraschke/25006-vNext-mergeConflict-fix
leochr Jun 17, 2025
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
178 changes: 20 additions & 158 deletions .secrets.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-05-06T17:54:19Z",
"generated_at": "2025-06-03T18:12:06Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand DownExpand Up@@ -97,144 +97,6 @@
"verified_result": null
}
],
"ga/24.0.0.12/full/server.xml": [
{
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
"is_secret": false,
"is_verified": false,
"line_number": 16,
"type": "Secret Keyword",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubi.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 71,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 72,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 71,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk21": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 70,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 71,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 38,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 38,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
"is_verified": false,
"line_number": 38,
"type": "Hex High Entropy String",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/helpers/build/configuration_snippets/keystore.xml": [
{
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
"is_secret": false,
"is_verified": false,
"line_number": 2,
"type": "Secret Keyword",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/helpers/build/configuration_snippets/truststore.xml": [
{
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
"is_secret": false,
"is_verified": false,
"line_number": 3,
"type": "Secret Keyword",
"verified_result": null
}
],
"ga/24.0.0.12/kernel/helpers/runtime/docker-server.sh": [
{
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
"is_secret": false,
"is_verified": false,
"line_number": 138,
"type": "Secret Keyword",
"verified_result": null
}
],
"ga/24.0.0.12/oidcProvider/server.xml": [
{
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
"is_secret": false,
"is_verified": false,
"line_number": 42,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0",
"is_secret": false,
"is_verified": false,
"line_number": 133,
"type": "Secret Keyword",
"verified_result": null
}
],
"ga/25.0.0.3/full/server.xml": [
{
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
Expand DownExpand Up@@ -373,7 +235,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/full/server.xml": [
"ga/25.0.0.6/full/server.xml": [
{
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
"is_secret": false,
Expand All@@ -383,7 +245,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi.ibmjava8": [
"ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -393,7 +255,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk11": [
"ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -403,7 +265,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk17": [
"ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -413,7 +275,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk8": [
"ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -423,7 +285,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
"ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -433,7 +295,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk11": [
"ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -443,7 +305,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk17": [
"ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -453,7 +315,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk21": [
"ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk21": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -463,7 +325,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk8": [
"ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -473,7 +335,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8": [
"ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -483,7 +345,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk11": [
"ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -493,7 +355,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk17": [
"ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All@@ -503,7 +365,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/helpers/build/configuration_snippets/keystore.xml": [
"ga/25.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml": [
{
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
"is_secret": false,
Expand All@@ -513,7 +375,7 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/helpers/build/configuration_snippets/truststore.xml": [
"ga/25.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml": [
{
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
"is_secret": false,
Expand All@@ -523,17 +385,17 @@
"verified_result": null
}
],
"ga/25.0.0.5/kernel/helpers/runtime/docker-server.sh": [
"ga/25.0.0.6/kernel/helpers/runtime/docker-server.sh": [
{
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
"is_secret": false,
"is_verified": false,
"line_number": 138,
"line_number": 141,
"type": "Secret Keyword",
"verified_result": null
}
],
"ga/25.0.0.5/oidcProvider/server.xml": [
"ga/25.0.0.6/oidcProvider/server.xml": [
{
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
"is_secret": false,
Expand DownExpand Up@@ -706,7 +568,7 @@
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
"is_secret": false,
"is_verified": false,
"line_number": 138,
"line_number": 141,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
51 changes: 0 additions & 51 deletions ga/24.0.0.12/full/Dockerfile.ubi.ibmjava8
View file
Open in desktop

This file was deleted.

Loading