Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 34 additions & 56 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,48 +44,17 @@ registries:
updates:

- package-ecosystem: maven
directories:
- "/log4j-1.2-api"
- "/log4j-api-test"
- "/log4j-api"
- "/log4j-appserver"
- "/log4j-cassandra"
- "/log4j-core-fuzz-test"
- "/log4j-core-its"
- "/log4j-core-test"
- "/log4j-core"
- "/log4j-couchdb"
- "/log4j-docker"
- "/log4j-fuzz-test"
- "/log4j-iostreams"
- "/log4j-jakarta-jms"
- "/log4j-jakarta-smtp"
- "/log4j-jakarta-web"
- "/log4j-jcl"
- "/log4j-jdbc-dbcp2"
- "/log4j-jpa"
- "/log4j-jpl"
- "/log4j-jul"
- "/log4j-layout-template-json-fuzz-test"
- "/log4j-layout-template-json-test"
- "/log4j-layout-template-json"
- "/log4j-mongodb"
# `log4j-mongodb4` is in a separate run
- "/log4j-osgi-test"
- "/log4j-parent"
- "/log4j-perf-test"
# `log4j-slf4j-impl` is in a separate run
- "/log4j-slf4j2-impl-fuzz-test"
- "/log4j-slf4j2-impl"
- "/log4j-spring-boot"
- "/log4j-spring-cloud-config-client"
- "/log4j-taglib"
- "/log4j-to-jul"
- "/log4j-to-slf4j"
- "/log4j-web"
open-pull-requests-limit: 10
directory: "/"
exclude-paths:
# These use versions of MongoDB and SLF4J different
# from the remaining artifacts
- "/log4j-mongodb4"
- "/log4j-slf4j-impl"
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "2.x"
registries:
- maven-central
Expand Down Expand Up @@ -166,9 +135,11 @@ updates:
- package-ecosystem: maven
directories:
- "/log4j-mongodb4"
open-pull-requests-limit: 10
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "2.x"
registries:
- maven-central
Expand All @@ -180,20 +151,19 @@ updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: "daily"
target-branch: "2.x"

- package-ecosystem: npm
directory: "/"
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "2.x"

- package-ecosystem: maven
directory: "/"
open-pull-requests-limit: 10
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "main"
registries:
- maven-central
Expand Down Expand Up @@ -222,9 +192,11 @@ updates:
- package-ecosystem: maven
directories:
- "/log4j-slf4j-impl"
open-pull-requests-limit: 10
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "main"
registries:
- maven-central
Expand All @@ -236,11 +208,17 @@ updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "main"

- package-ecosystem: npm
directory: "/"
schedule:
interval: "daily"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
target-branch: "main"
1 change: 0 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ permissions: read-all
jobs:

build:
if: github.actor != 'dependabot[bot]'
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
secrets:
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/merge-dependabot.yaml

This file was deleted.