From 79e0c49ffa2238e9a0c51e0b4c521ebd6cbda719 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Mon, 5 Aug 2024 16:39:59 +0100
Subject: [PATCH] Some tweaks

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

diff --git a/.github/renovate.json b/.github/renovate.json
index bd3531b54de0..6bf43a63a8a1 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -22,36 +22,31 @@
     },
     {
       "matchDatasources": ["npm"],
-      "matchBaseBranches": ["master"],
       "addLabels": ["javascript"],
       "minimumReleaseAge": "3 days",
       "reviewers": ["team:sig-ux"]
     },
     {
       "matchPackageNames": ["node"],
-      "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": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": [
-        "/(org.eclipse.jetty:jetty-maven-plugin|org.jenkins-ci:winstone)/"
+        "org.eclipse.jetty:jetty-maven-plugin", "org.jenkins-ci:winstone"
       ]
     },
     {
       "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": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": ["jakarta.servlet:jakarta.servlet-api"]
     },
     {
       "description": "Contains incompatible API changes and needs compatibility work",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": [
         "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
@@ -60,48 +55,41 @@
     {
       "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": ["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": ["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": ["master", "/stable-.+/"],
       "enabled": false,
       "matchPackageNames": ["org.jfree:jfreechart"]
     },
     {
       "description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
       "matchManagers": ["maven"],
-      "matchBaseBranches": ["master", "/stable-.+/"],
       "allowedVersions": "<6.0.0",
-      "matchPackageNames": ["org.springframework"]
+      "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": ["master", "/stable-.+/"],
       "allowedVersions": "<7.0.0",
       "matchPackageNames": ["com.google.inject:guice-bom"]
     },
     {
       "matchFileNames": ["test/pom.xml", "core/pom.xml", "war/pom.xml"],
-      "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": ["master", "/stable-.+/"],
       "matchDatasources": ["maven"],
       "enabled": false,
       "description": "maven-metadata.xml is missing for this really old package which is required by renovate"