From 2dd353d837d1925a8d97906933895778bfad2d27 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Mon, 5 Aug 2024 14:48:05 +0100
Subject: [PATCH] Drop usage of $default which doesn't work fully

---
 .github/renovate.json | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 5d7b49b4fab6..0d05a3b098a7 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,30 +7,34 @@
   ],
   "prHourlyLimit": 0,
   "postUpdateOptions": ["yarnDedupeHighest"],
-  "baseBranches": ["$default", "stable-2.462"],
+  "baseBranches": ["master", "stable-2.462"],
   "packageRules": [
     {
       "matchBaseBranches": ["/stable-.+/"],
       "matchManagers": ["maven"],
-      "labels": ["dependencies", "into-lts", "needs-justification"],
-      "enabled": true
+      "labels": ["dependencies", "into-lts", "needs-justification"]
+    },
+    {
+      "matchBaseBranches": ["/stable-.+/"],
+      "matchManagers": ["custom.regex", "npm", "github-actions"],
+      "enabled": false
     },
     {
       "matchDatasources": ["npm"],
-      "matchBaseBranches": ["$default"],
+      "matchBaseBranches": ["master"],
       "addLabels": ["javascript"],
       "minimumReleaseAge": "3 days",
       "reviewers": ["team:sig-ux"]
     },
     {
       "matchPackageNames": ["node"],
-      "matchBaseBranches": ["$default"],
+      "matchBaseBranches": ["master"],
       "allowedVersions": "/20.[0-9]+.[0-9]+(.[0-9]+)?$/"
     },
     {
       "description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned, could be grouped but releases are likely separated by a bit of time",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": [
         "/(org.eclipse.jetty:jetty-maven-plugin|org.jenkins-ci:winstone)/"
@@ -39,14 +43,14 @@
     {
       "description": "Provided by Jetty and should be aligned with the version provided by the version of Jetty we deliver. See: https://github.com/jenkinsci/jenkins/pull/5211",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": ["/jakarta.servlet:jakarta.servlet-api/"]
     },
     {
       "description": "Contains incompatible API changes and needs compatibility work",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": [
         "/jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api/"
@@ -55,55 +59,55 @@
     {
       "description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "allowedVersions": "<2.5.0",
       "matchPackageNames": ["/org.codehaus.groovy:groovy-all/"]
     },
     {
       "description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": ["/org.fusesource.jansi:jansi/"]
     },
     {
       "description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": ["/org.jfree:jfreechart/"]
     },
     {
       "description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "allowedVersions": "<6.0.0",
       "matchPackageNames": ["/org.springframework/"]
     },
     {
       "description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "allowedVersions": "<7.0.0",
       "matchPackageNames": ["/com.google.inject:guice-bom/"]
     },
     {
       "matchFileNames": ["test/pom.xml", "core/pom.xml", "war/pom.xml"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "matchPackageNames": ["org.jenkins-ci.main:remoting"],
       "description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
       "enabled": false
     },
     {
       "matchPackageNames": ["net.jcip:jcip-annotations"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "matchDatasources": ["maven"],
       "enabled": false,
       "description": "maven-metadata.xml is missing for this really old package which is required by renovate"
     },
     {
       "matchPackageNames": ["org.maven.ide.eclipse:lifecycle-mapping"],
-      "matchBaseBranches": ["$default", "/stable-.+/"],
+      "matchBaseBranches": ["master", "/stable-.+/"],
       "matchDatasources": ["maven"],
       "enabled": false,
       "description": "see https://github.com/jenkinsci/jenkins/pull/9522"