From 6c06acaece4556fefc7572593297b4c35a8fda9e Mon Sep 17 00:00:00 2001
From: Florian Greinacher <florian.greinacher@siemens.com>
Date: Thu, 16 May 2024 10:44:14 +0000
Subject: [PATCH 1/2] feat(presets): add replacements for ZAP org moves

---
 lib/config/presets/internal/replacements.ts | 30 +++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/config/presets/internal/replacements.ts b/lib/config/presets/internal/replacements.ts
index ca6abebf478b81..93e312ad4843fc 100644
--- a/lib/config/presets/internal/replacements.ts
+++ b/lib/config/presets/internal/replacements.ts
@@ -47,6 +47,7 @@ export const presets: Record<string, Preset> = {
       'replacements:vso-task-lib-to-azure-pipelines-task-lib',
       'replacements:vsts-task-lib-to-azure-pipelines-task-lib',
       'replacements:xmldom-to-scoped',
+      'replacements:zap',
     ],
     ignoreDeps: [], // Hack to improve onboarding PR description
   },
@@ -950,6 +951,35 @@ export const presets: Record<string, Preset> = {
       },
     ],
   },
+  zap: {
+    description: 'Replace ZAP dependencies.',
+    packageRules: [
+      {
+        description:
+          'The `zap-stable` image has moved to the `zaproxy` organisation.',
+        matchCurrentVersion: '>=2.0.0 <2.14.0',
+        matchDatasources: ['docker'],
+        matchPackagePatterns: [
+          '^(?:docker\\.io/)?owasp/zap2docker-stable$',
+          '^(?:docker\\.io/)?softwaresecurityproject/zap-stable$',
+        ],
+        replacementName: 'zaproxy/zap-stable',
+        replacementVersion: '2.14.0',
+      },
+      {
+        description:
+          'The `zap-bare` image has moved to the `zaproxy` organisation.',
+        matchCurrentVersion: '>=2.0.0 <2.14.0',
+        matchDatasources: ['docker'],
+        matchPackagePatterns: [
+          '^(?:docker\\.io/)?owasp/zap2docker-bare$',
+          '^(?:docker\\.io/)?softwaresecurityproject/zap-bare$',
+        ],
+        replacementName: 'zaproxy/zap-bare',
+        replacementVersion: '2.14.0',
+      },
+    ],
+  },
 };
 
 const muiReplacement: Replacement[] = [

From 4e828211668cb15d317b4117c2c4e3b049002b92 Mon Sep 17 00:00:00 2001
From: Florian Greinacher <florian.greinacher@siemens.com>
Date: Thu, 16 May 2024 13:33:34 +0200
Subject: [PATCH 2/2] style: use American english

Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
---
 lib/config/presets/internal/replacements.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/config/presets/internal/replacements.ts b/lib/config/presets/internal/replacements.ts
index 93e312ad4843fc..74335ad3acd1bd 100644
--- a/lib/config/presets/internal/replacements.ts
+++ b/lib/config/presets/internal/replacements.ts
@@ -956,7 +956,7 @@ export const presets: Record<string, Preset> = {
     packageRules: [
       {
         description:
-          'The `zap-stable` image has moved to the `zaproxy` organisation.',
+          'The `zap-stable` image has moved to the `zaproxy` organization.',
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
         matchPackagePatterns: [
@@ -968,7 +968,7 @@ export const presets: Record<string, Preset> = {
       },
       {
         description:
-          'The `zap-bare` image has moved to the `zaproxy` organisation.',
+          'The `zap-bare` image has moved to the `zaproxy` organization.',
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
         matchPackagePatterns: [