From c5b897e4e7a894e969b8c399a3d17c906c329e66 Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:39:53 +0000 Subject: [PATCH 1/7] Limit CXF Dependabot updates by Tomcat branch Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3ca13ef4d9ef..b6e713d2e3f2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -27,19 +27,43 @@ updates: interval: "weekly" - package-ecosystem: "maven" target-branch: "11.0.x" - directories: ["/modules/cxf", "/modules/jdbc-pool", "/modules/stuffed"] + directories: ["/modules/jdbc-pool", "/modules/stuffed"] + schedule: + interval: "weekly" + - package-ecosystem: "maven" + target-branch: "10.1.x" + directories: ["/modules/jdbc-pool", "/modules/stuffed"] + schedule: + interval: "weekly" + - package-ecosystem: "maven" + target-branch: "9.0.x" + directory: "/modules/jdbc-pool" schedule: interval: "weekly" + - package-ecosystem: "maven" + target-branch: "11.0.x" + directory: "/modules/cxf" + schedule: + interval: "weekly" + ignore: + - dependency-name: "org.apache.cxf:*" + versions: ["(,4.2.0)", "[4.3.0,)"] - package-ecosystem: "maven" target-branch: "10.1.x" - directories: ["/modules/cxf", "/modules/jdbc-pool", "/modules/stuffed"] + directory: "/modules/cxf" schedule: interval: "weekly" + ignore: + - dependency-name: "org.apache.cxf:*" + versions: ["(,4.1.0)", "[4.2.0,)"] - package-ecosystem: "maven" target-branch: "9.0.x" - directories: ["/modules/cxf", "/modules/jdbc-pool"] + directory: "/modules/cxf" schedule: interval: "weekly" + ignore: + - dependency-name: "org.apache.cxf:*" + versions: ["(,3.6.0)", "[3.7.0,)"] - package-ecosystem: "maven" target-branch: "main" directory: "/modules/owb" From 691ab401bcb5bf51c12237010b3e01bd95eead4a Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:42:10 +0000 Subject: [PATCH 2/7] Apply CDI API update limits to CXF modules Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b6e713d2e3f2..8a737d36e323 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -48,6 +48,8 @@ updates: ignore: - dependency-name: "org.apache.cxf:*" versions: ["(,4.2.0)", "[4.3.0,)"] + - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api" + versions: ["(,4.1.0)", "[4.2.0,)"] - package-ecosystem: "maven" target-branch: "10.1.x" directory: "/modules/cxf" @@ -56,6 +58,8 @@ updates: ignore: - dependency-name: "org.apache.cxf:*" versions: ["(,4.1.0)", "[4.2.0,)"] + - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api" + versions: ["(,4.0.0)", "[4.1.0,)"] - package-ecosystem: "maven" target-branch: "9.0.x" directory: "/modules/cxf" @@ -64,6 +68,8 @@ updates: ignore: - dependency-name: "org.apache.cxf:*" versions: ["(,3.6.0)", "[3.7.0,)"] + - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api" + versions: ["(,3.0.0)", "[3.1.0,)"] - package-ecosystem: "maven" target-branch: "main" directory: "/modules/owb" From f2e23a02de55b2fa7c75614851cba575a892c753 Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:44:17 +0000 Subject: [PATCH 3/7] Drop unused CDI API rule for Tomcat 9 CXF Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8a737d36e323..6aa8b555aa64 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -68,8 +68,6 @@ updates: ignore: - dependency-name: "org.apache.cxf:*" versions: ["(,3.6.0)", "[3.7.0,)"] - - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api" - versions: ["(,3.0.0)", "[3.1.0,)"] - package-ecosystem: "maven" target-branch: "main" directory: "/modules/owb" From 6fc17f621de68b6aa57e81858e3680dc3326173c Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:49:44 +0000 Subject: [PATCH 4/7] Limit Johnzon JSON-B updates for Tomcat 9 CXF Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6aa8b555aa64..9ee7528ee22a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -68,6 +68,8 @@ updates: ignore: - dependency-name: "org.apache.cxf:*" versions: ["(,3.6.0)", "[3.7.0,)"] + - dependency-name: "org.apache.johnzon:johnzon-jsonb" + versions: ["(,1.3.0)", "[2.0.0,)"] - package-ecosystem: "maven" target-branch: "main" directory: "/modules/owb" From 8152254fba61a50753a0de31da85b42b007466e6 Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:54:02 +0000 Subject: [PATCH 5/7] Limit JSON-B API updates for Tomcat 9 CXF Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9ee7528ee22a..6e35cb2eef38 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -70,6 +70,8 @@ updates: versions: ["(,3.6.0)", "[3.7.0,)"] - dependency-name: "org.apache.johnzon:johnzon-jsonb" versions: ["(,1.3.0)", "[2.0.0,)"] + - dependency-name: "javax.json.bind:javax.json.bind-api" + versions: ["(,1.0.0)", "[2.0.0,)"] - package-ecosystem: "maven" target-branch: "main" directory: "/modules/owb" From 698c7dbc5b8dc10c39832156f066bbcf4021e889 Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:57:04 +0000 Subject: [PATCH 6/7] Limit JDBC Pool Tomcat JULI updates by branch Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6e35cb2eef38..bdffc58dbb1c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,24 +22,51 @@ updates: # No glob on main: modules/manager2 has no pom.xml, which would cause errors - package-ecosystem: "maven" target-branch: "main" - directories: ["/modules/jdbc-pool", "/modules/stuffed"] + directory: "/modules/stuffed" schedule: interval: "weekly" - package-ecosystem: "maven" target-branch: "11.0.x" - directories: ["/modules/jdbc-pool", "/modules/stuffed"] + directory: "/modules/stuffed" schedule: interval: "weekly" - package-ecosystem: "maven" target-branch: "10.1.x" - directories: ["/modules/jdbc-pool", "/modules/stuffed"] + directory: "/modules/stuffed" schedule: interval: "weekly" + - package-ecosystem: "maven" + target-branch: "main" + directory: "/modules/jdbc-pool" + schedule: + interval: "weekly" + ignore: + - dependency-name: "org.apache.tomcat:tomcat-juli" + versions: ["(,12.0.0)", "[12.1.0,)"] + - package-ecosystem: "maven" + target-branch: "11.0.x" + directory: "/modules/jdbc-pool" + schedule: + interval: "weekly" + ignore: + - dependency-name: "org.apache.tomcat:tomcat-juli" + versions: ["(,11.0.0)", "[11.1.0,)"] + - package-ecosystem: "maven" + target-branch: "10.1.x" + directory: "/modules/jdbc-pool" + schedule: + interval: "weekly" + ignore: + - dependency-name: "org.apache.tomcat:tomcat-juli" + versions: ["(,10.1.0)", "[10.2.0,)"] - package-ecosystem: "maven" target-branch: "9.0.x" directory: "/modules/jdbc-pool" schedule: interval: "weekly" + ignore: + - dependency-name: "org.apache.tomcat:tomcat-juli" + versions: ["(,9.0.0)", "[9.1.0,)"] - package-ecosystem: "maven" target-branch: "11.0.x" directory: "/modules/cxf" From 5bd85f5de09e15eb5e30eca578b8b42486b35ade Mon Sep 17 00:00:00 2001 From: markt-asf <4690029+markt-asf@users.noreply.github.com> Date: Mon, 16 Nov 2026 13:05:34 +0000 Subject: [PATCH 7/7] Limit H2 updates for Tomcat 9 JDBC Pool Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bdffc58dbb1c..ae592c91eba4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -67,6 +67,8 @@ updates: ignore: - dependency-name: "org.apache.tomcat:tomcat-juli" versions: ["(,9.0.0)", "[9.1.0,)"] + - dependency-name: "com.h2database:h2" + versions: ["(,2.2.0)", "[2.3.0,)"] - package-ecosystem: "maven" target-branch: "11.0.x" directory: "/modules/cxf"