From b83bbd435fe12751c6bc560e7090f1925bb29150 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 31 Jul 2024 00:04:12 +0200
Subject: [PATCH] fix(replacements): fix matchPackageNames preset migrations
 (#30471)

---
 lib/config/presets/internal/group.ts |  6 ++++--
 lib/data/replacements.json           | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/config/presets/internal/group.ts b/lib/config/presets/internal/group.ts
index 97898bab9d..5b928774c8 100644
--- a/lib/config/presets/internal/group.ts
+++ b/lib/config/presets/internal/group.ts
@@ -339,9 +339,8 @@ const staticGroups = {
       {
         commitMessageTopic: 'Node.js',
         matchDatasources: ['docker'],
-        matchDepNames: ['node'],
         matchPackageNames: [
-          '//node$/', // Ends with "node"
+          '/(^/)node$/', // node or ends with "/node, except those below"
           '!calico/node',
           '!docker.io/calico/node',
           '!kindest/node',
@@ -579,6 +578,9 @@ const staticGroups = {
       {
         groupName: 'spring boot',
         matchDepNames: ['org.springframework.boot'],
+      },
+      {
+        groupName: 'spring boot',
         matchPackageNames: ['org.springframework.boot:**'],
       },
     ],
diff --git a/lib/data/replacements.json b/lib/data/replacements.json
index 2b8d8cdd90..c4026cae5f 100644
--- a/lib/data/replacements.json
+++ b/lib/data/replacements.json
@@ -170,8 +170,10 @@
         "description": "Replace `renovate` `slim` docker tag with `latest`.",
         "matchCurrentValue": "/^slim$/",
         "matchDatasources": ["docker"],
-        "matchPackageNames": ["ghcr.io/renovatebot/renovate"],
-        "matchPackageNames": ["/^(?:docker\\.io/)?renovate/renovate$/"],
+        "matchPackageNames": [
+          "ghcr.io/renovatebot/renovate",
+          "/^(?:docker\\.io/)?renovate/renovate$/"
+        ],
         "replacementVersion": "latest"
       },
       {
@@ -179,8 +181,10 @@
         "extractVersion": "^(?<version>.+)-slim$",
         "matchCurrentValue": "/-slim$/",
         "matchDatasources": ["docker"],
-        "matchPackageNames": ["ghcr.io/renovatebot/renovate"],
-        "matchPackageNames": ["/^(?:docker\\.io/)?renovate/renovate$/"],
+        "matchPackageNames": [
+          "ghcr.io/renovatebot/renovate",
+          "/^(?:docker\\.io/)?renovate/renovate$/"
+        ],
         "versioning": "semver"
       }
     ]