Skip to content

Commit 5dce00f

Browse files
committed
Group Dependabot PRs and remove merge-dependabot
This change adds grouping to all dependabot configurations to limit the number of open PRs to one. It also removes the `merge-dependabot` workflow, which is no longer useful in case of grouped upgrades.
1 parent 73733da commit 5dce00f

File tree

3 files changed

+34
-109
lines changed

3 files changed

+34
-109
lines changed

.github/dependabot.yaml

Lines changed: 34 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -44,48 +44,17 @@ registries:
4444
updates:
4545

4646
- package-ecosystem: maven
47-
directories:
48-
- "/log4j-1.2-api"
49-
- "/log4j-api-test"
50-
- "/log4j-api"
51-
- "/log4j-appserver"
52-
- "/log4j-cassandra"
53-
- "/log4j-core-fuzz-test"
54-
- "/log4j-core-its"
55-
- "/log4j-core-test"
56-
- "/log4j-core"
57-
- "/log4j-couchdb"
58-
- "/log4j-docker"
59-
- "/log4j-fuzz-test"
60-
- "/log4j-iostreams"
61-
- "/log4j-jakarta-jms"
62-
- "/log4j-jakarta-smtp"
63-
- "/log4j-jakarta-web"
64-
- "/log4j-jcl"
65-
- "/log4j-jdbc-dbcp2"
66-
- "/log4j-jpa"
67-
- "/log4j-jpl"
68-
- "/log4j-jul"
69-
- "/log4j-layout-template-json-fuzz-test"
70-
- "/log4j-layout-template-json-test"
71-
- "/log4j-layout-template-json"
72-
- "/log4j-mongodb"
73-
# `log4j-mongodb4` is in a separate run
74-
- "/log4j-osgi-test"
75-
- "/log4j-parent"
76-
- "/log4j-perf-test"
77-
# `log4j-slf4j-impl` is in a separate run
78-
- "/log4j-slf4j2-impl-fuzz-test"
79-
- "/log4j-slf4j2-impl"
80-
- "/log4j-spring-boot"
81-
- "/log4j-spring-cloud-config-client"
82-
- "/log4j-taglib"
83-
- "/log4j-to-jul"
84-
- "/log4j-to-slf4j"
85-
- "/log4j-web"
86-
open-pull-requests-limit: 10
47+
directory: "/"
48+
exclude-paths:
49+
# These use versions of MongoDB and SLF4J different
50+
# from the remaining artifacts
51+
- "/log4j-mongodb4"
52+
- "/log4j-slf4j-impl"
8753
schedule:
88-
interval: "daily"
54+
interval: "monthly"
55+
groups:
56+
dependencies:
57+
patterns: [ "*" ]
8958
target-branch: "2.x"
9059
registries:
9160
- maven-central
@@ -166,9 +135,11 @@ updates:
166135
- package-ecosystem: maven
167136
directories:
168137
- "/log4j-mongodb4"
169-
open-pull-requests-limit: 10
170138
schedule:
171-
interval: "daily"
139+
interval: "monthly"
140+
groups:
141+
dependencies:
142+
patterns: [ "*" ]
172143
target-branch: "2.x"
173144
registries:
174145
- maven-central
@@ -180,20 +151,19 @@ updates:
180151
- package-ecosystem: github-actions
181152
directory: "/"
182153
schedule:
183-
interval: "daily"
184-
target-branch: "2.x"
185-
186-
- package-ecosystem: npm
187-
directory: "/"
188-
schedule:
189-
interval: "daily"
154+
interval: "monthly"
155+
groups:
156+
dependencies:
157+
patterns: [ "*" ]
190158
target-branch: "2.x"
191159

192160
- package-ecosystem: maven
193161
directory: "/"
194-
open-pull-requests-limit: 10
195162
schedule:
196-
interval: "daily"
163+
interval: "monthly"
164+
groups:
165+
dependencies:
166+
patterns: [ "*" ]
197167
target-branch: "main"
198168
registries:
199169
- maven-central
@@ -222,9 +192,11 @@ updates:
222192
- package-ecosystem: maven
223193
directories:
224194
- "/log4j-slf4j-impl"
225-
open-pull-requests-limit: 10
226195
schedule:
227-
interval: "daily"
196+
interval: "monthly"
197+
groups:
198+
dependencies:
199+
patterns: [ "*" ]
228200
target-branch: "main"
229201
registries:
230202
- maven-central
@@ -236,11 +208,17 @@ updates:
236208
- package-ecosystem: github-actions
237209
directory: "/"
238210
schedule:
239-
interval: "daily"
211+
interval: "monthly"
212+
groups:
213+
dependencies:
214+
patterns: [ "*" ]
240215
target-branch: "main"
241216

242217
- package-ecosystem: npm
243218
directory: "/"
244219
schedule:
245-
interval: "daily"
220+
interval: "monthly"
221+
groups:
222+
dependencies:
223+
patterns: [ "*" ]
246224
target-branch: "main"

.github/workflows/build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ permissions: read-all
2929
jobs:
3030

3131
build:
32-
if: github.actor != 'dependabot[bot]'
3332
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
3433
secrets:
3534
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}

.github/workflows/merge-dependabot.yaml

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)