From e78fc9f21945643b7b089292c07158907c3ac2ef Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Fri, 24 Jul 2026 18:58:27 -0500 Subject: [PATCH 1/7] Update renovate configs from maintainer and user feedback Signed-off-by: Jon Bartels --- renovate.json | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/renovate.json b/renovate.json index 51449912de..e6c9d227f9 100644 --- a/renovate.json +++ b/renovate.json @@ -38,14 +38,6 @@ "docker" ] }, - { - "description": "Catch-all: bundle minor/patch of ungrouped deps; majors stay individual. Listed BEFORE the named groups so a family's own minor/patch is overridden back into its family group (Renovate merges rules, last match wins for groupName).", - "matchUpdateTypes": [ - "minor", - "patch" - ], - "groupName": "all-minor-and-patch" - }, { "groupName": "aws-sdk", "matchPackageNames": [ @@ -56,33 +48,51 @@ { "groupName": "jetty", "matchPackageNames": [ - "org.eclipse.jetty*" + "org.eclipse.jetty:*" + ] + }, + { + "groupName": "bouncycastle", + "matchPackageNames": [ + "org.bouncycastle:*" ] }, { "groupName": "jersey", "matchPackageNames": [ - "org.glassfish.jersey*", - "org.glassfish.hk2*" + "org.glassfish.jersey:*", + "org.glassfish.hk2:*" + ] + }, + { + "groupName": "pdfbox", + "matchPackageNames": [ + "*pdfbox*" + ] + }, + { + "groupName": "sun-xml", + "matchPackageNames": [ + "com.sun.xml:*" ] }, { "groupName": "jackson", "matchPackageNames": [ - "com.fasterxml.jackson*" + "com.fasterxml.jackson:*" ] }, { "groupName": "netty", "matchPackageNames": [ - "io.netty*", - "com.typesafe.netty*" + "io.netty:*", + "com.typesafe.netty:*" ] }, { "groupName": "log4j", "matchPackageNames": [ - "org.apache.logging.log4j*" + "org.apache.logging.log4j:*" ] }, { @@ -95,8 +105,8 @@ { "groupName": "test-tooling", "matchPackageNames": [ - "org.mockito*", - "net.bytebuddy*", + "org.mockito:*", + "net.bytebuddy:*", "org.objenesis:*", "org.hamcrest:*", "junit:*" From 6f0aae8520aeecb168ffeab600d7d847dee001c8 Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Mon, 27 Jul 2026 07:21:34 -0400 Subject: [PATCH 2/7] Address PR feedback, fix minimumReleaseAge and use a schedule preset Signed-off-by: Jon Bartels --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index e6c9d227f9..37de23a65b 100644 --- a/renovate.json +++ b/renovate.json @@ -7,7 +7,7 @@ "before 6am on the first day of the month" ], "timezone": "America/New_York", - "minimumReleaseAge": "2 days", + "minimumReleaseAge": "14 days", "prConcurrentLimit": 10, "prHourlyLimit": 2, "automerge": false, From eae10738e4e7b2a2fbd0a9688568f8717bc0902b Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Mon, 27 Jul 2026 12:44:47 -0400 Subject: [PATCH 3/7] Address PR feedback, use a schedule preset Signed-off-by: Jon Bartels --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 37de23a65b..213545260e 100644 --- a/renovate.json +++ b/renovate.json @@ -4,7 +4,7 @@ "config:recommended" ], "schedule": [ - "before 6am on the first day of the month" + "monthly" ], "timezone": "America/New_York", "minimumReleaseAge": "14 days", From 8eb71d42281ffacca1091ce9c12618865c5590ff Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Mon, 27 Jul 2026 12:49:12 -0400 Subject: [PATCH 4/7] Update rebaseWhen setting so that conflicted PRs get rebased Signed-off-by: Jon Bartels --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index 213545260e..83a5345e9b 100644 --- a/renovate.json +++ b/renovate.json @@ -11,6 +11,7 @@ "prConcurrentLimit": 10, "prHourlyLimit": 2, "automerge": false, + "rebaseWhen": "conflicted", "major": { "dependencyDashboardApproval": true }, From 46f24a0cdf610a786ecb8539e9a8f0c91832d6ad Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Tue, 28 Jul 2026 21:11:55 -0400 Subject: [PATCH 5/7] Use correct schedule monthly syntax Signed-off-by: Jon Bartels --- renovate.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index 83a5345e9b..fb1ca34a67 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:recommended" - ], - "schedule": [ - "monthly" + "config:recommended", + "schedule:monthly" ], "timezone": "America/New_York", "minimumReleaseAge": "14 days", From 8f13942498266f9b80761e9d0ac40f59b9b323fa Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Tue, 28 Jul 2026 21:45:54 -0400 Subject: [PATCH 6/7] Undo wildcard changes. main branch is showing reasonable groups with the old pattern Signed-off-by: Jon Bartels --- renovate.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/renovate.json b/renovate.json index fb1ca34a67..f561d91529 100644 --- a/renovate.json +++ b/renovate.json @@ -47,20 +47,20 @@ { "groupName": "jetty", "matchPackageNames": [ - "org.eclipse.jetty:*" + "org.eclipse.jetty*" ] }, { "groupName": "bouncycastle", "matchPackageNames": [ - "org.bouncycastle:*" + "org.bouncycastle*" ] }, { "groupName": "jersey", "matchPackageNames": [ - "org.glassfish.jersey:*", - "org.glassfish.hk2:*" + "org.glassfish.jersey*", + "org.glassfish.hk2*" ] }, { @@ -72,26 +72,26 @@ { "groupName": "sun-xml", "matchPackageNames": [ - "com.sun.xml:*" + "com.sun.xml*" ] }, { "groupName": "jackson", "matchPackageNames": [ - "com.fasterxml.jackson:*" + "com.fasterxml.jackson*" ] }, { "groupName": "netty", "matchPackageNames": [ - "io.netty:*", - "com.typesafe.netty:*" + "io.netty*", + "com.typesafe.netty*" ] }, { "groupName": "log4j", "matchPackageNames": [ - "org.apache.logging.log4j:*" + "org.apache.logging.log4j*" ] }, { @@ -104,8 +104,8 @@ { "groupName": "test-tooling", "matchPackageNames": [ - "org.mockito:*", - "net.bytebuddy:*", + "org.mockito:", + "net.bytebuddy*", "org.objenesis:*", "org.hamcrest:*", "junit:*" From 06da5616a3511645729c78ad89c42851bba66364 Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Tue, 28 Jul 2026 21:48:28 -0400 Subject: [PATCH 7/7] typo on wildcard pattern Signed-off-by: Jon Bartels --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index f561d91529..9c37dfb451 100644 --- a/renovate.json +++ b/renovate.json @@ -104,7 +104,7 @@ { "groupName": "test-tooling", "matchPackageNames": [ - "org.mockito:", + "org.mockito*", "net.bytebuddy*", "org.objenesis:*", "org.hamcrest:*",