Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c1f1ffc
Disable (temporarily) Dependabot updates
ppkarwasz Apr 17, 2025
544412e
Move `auto-merge-dependabot` to `2.x`
ppkarwasz May 8, 2025
e9147e5
Bump mongodb.version from 5.4.0 to 5.5.0 in /log4j-mongodb
dependabot[bot] May 8, 2025
4e5bc93
Merge pull request #525 from ppkarwasz/dependabot/maven/log4j-mongodb…
ppkarwasz May 8, 2025
996fc32
Downgrade MongoDB to try again
ppkarwasz May 8, 2025
912d34c
Formatting
ppkarwasz May 8, 2025
e0d1a62
Add custom action
ppkarwasz May 10, 2025
addf82f
Group dependency updates
ppkarwasz May 10, 2025
ae30c2b
Simplify Dependabot config
ppkarwasz May 10, 2025
7011c0a
Remove dependency from `merge-dependabot` job
ppkarwasz May 10, 2025
1bb911c
Formatting
ppkarwasz May 10, 2025
a655bd7
Run build on `auto-merge-dependabot`
ppkarwasz May 10, 2025
2583f77
Formatting
ppkarwasz May 10, 2025
700f068
Remove `build-dependabot`
ppkarwasz May 10, 2025
4d675a8
Try to dispatch workflow
ppkarwasz May 10, 2025
9ba8f7d
Try triggering workflow again
ppkarwasz May 10, 2025
0aa6ef0
Use PAT to dispatch workflow
ppkarwasz May 10, 2025
8a7e990
Use token for the checkout
ppkarwasz May 10, 2025
9e280f2
Replace build with mock
ppkarwasz May 10, 2025
8eafff8
Add debugging data
ppkarwasz May 10, 2025
02b4fb3
Add auto-merge
ppkarwasz May 10, 2025
a0cb968
fix: auto-merge Dependabot
ppkarwasz May 10, 2025
f478596
Merge pull request #539 from ppkarwasz/fix/auto-merge
ppkarwasz May 10, 2025
0b1380e
fix: auto_merge and disable on recursive call
ppkarwasz May 10, 2025
1b937b8
Merge pull request #540 from ppkarwasz/fix/auto-merge-2
ppkarwasz May 10, 2025
b70385b
Bump com.github.luben:zstd-jni from 1.5.7-2 to 1.5.7-3 in /log4j-pare…
dependabot[bot] May 10, 2025
e96e07d
Bump the non-breaking group in /log4j-parent with 6 updates (#536)
dependabot[bot] May 10, 2025
fef7ad2
Workflow dispatch for CodeQL (#541)
ppkarwasz May 10, 2025
6f78e8e
Dev/dependabot reusable (#547)
ppkarwasz Jun 16, 2025
a289d5e
Bump org.apache.kafka:kafka-clients (#537)
dependabot[bot] Jun 16, 2025
314718d
feat: reference to reusable workflow (#548)
ppkarwasz Jun 16, 2025
25fa646
Bump gradle/develocity-actions from 1.3 to 1.4 (#542)
dependabot[bot] Jun 16, 2025
8c6f71e
Dev/dependabot reusable (#549)
ppkarwasz Jun 16, 2025
2888246
fix: add self-reference to reusable workflow (#550)
ppkarwasz Jun 16, 2025
707edd6
Bump apache/logging-parent/.github/workflows/deploy-release-reusable.…
dependabot[bot] Jun 16, 2025
0b7732d
Bump apache/logging-parent/.github/workflows/codeql-analysis-reusable…
dependabot[bot] Jun 16, 2025
0f3a848
Bump apache/logging-parent/.github/workflows/verify-reproducibility-r…
dependabot[bot] Jun 16, 2025
9d9a3cd
fix: add username for the GPG key (#553)
ppkarwasz Jun 16, 2025
07a1c97
Bump the non-breaking group in /log4j-parent with 13 updates (#552)
dependabot[bot] Jun 16, 2025
0799c99
Bump the non-breaking group across 1 directory with 3 updates (#555)
dependabot[bot] Jun 21, 2025
451d702
Switch to alternative Dependabot workflow (#556)
ppkarwasz Jun 22, 2025
c0cb382
Generate changelog entries for PR #557
copernik-rm Jun 23, 2025
a624194
fix: Add contents permission to GitHub token (#558)
ppkarwasz Jun 23, 2025
be371f3
fix: Use `github.head_ref` (#559)
ppkarwasz Jun 23, 2025
65171ef
fix: Delete old changelog entries (#560)
ppkarwasz Jun 23, 2025
711c891
Switch to split Dependabot workflow (#561)
ppkarwasz Jun 24, 2025
b3fa405
fix: `process-dependabot` workflow (#562)
ppkarwasz Jun 24, 2025
184a90a
fix: Value of `analyze-workflow-run-id` (#563)
ppkarwasz Jun 24, 2025
7e00f5a
New test with implicit GitHub token (#564)
ppkarwasz Jun 24, 2025
c0b9bc0
Bump the non-breaking group across 1 directory with 9 updates (#566)
dependabot[bot] Jun 24, 2025
0bced43
Bump com.github.luben:zstd-jni from 1.5.7-3 to 1.5.7-4 in /log4j-parent
dependabot[bot] Jul 2, 2025
31c8555
Generate changelog entries for PR #567
copernik-rm Jul 2, 2025
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
41 changes: 4 additions & 37 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,50 +45,17 @@ 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
schedule:
interval: "daily"
target-branch: "2.x"
registries:
- maven-central
groups:
all-dependencies:
patterns:
- "*"
ignore:
# Jetty 10.x does not have an internal logging API
- dependency-name: "org.eclipse.jetty:*"
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/analyze-dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to you under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Dependabot Analyze PR

on:
pull_request:

permissions: { }

jobs:

analyze-dependabot:
# Skip this workflow on commits not pushed by Dependabot
if: ${{ github.actor == 'dependabot[bot]' }}
uses: apache/logging-parent/.github/workflows/analyze-dependabot-reusable.yaml@feat/dependabot-add-changelog2
28 changes: 15 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,25 @@ on:
- "2.x"
- "release/2*"
pull_request:
workflow_dispatch:

permissions: read-all

jobs:

build:
if: github.actor != 'dependabot[bot]'
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0
secrets:
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}
with:
java-version: |
8
17
site-enabled: true
reproducibility-check-enabled: false
develocity-enabled: ${{ ! startsWith(github.ref_name, 'release/') }}
runs-on: ubuntu-latest

steps:
- name: Just print some data
env:
ACTOR: ${{ github.actor }}
SENDER: ${{ toJSON(github.event.sender) }}
PR_USER: ${{ toJSON(github.event.pull_request.user) }}
run: |
echo "Actor: $ACTOR"
echo "Sender: $SENDER"
echo "User: $PR_USER"

deploy-snapshot:
needs: build
Expand All @@ -57,7 +59,7 @@ jobs:
deploy-release:
needs: build
if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.0
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.1
# Secrets for deployments
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
Expand All @@ -78,7 +80,7 @@ jobs:
needs: [ deploy-snapshot, deploy-release ]
if: ${{ always() && (needs.deploy-snapshot.result == 'success' || needs.deploy-release.result == 'success') }}
name: "verify-reproducibility (${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.project-version || needs.deploy-snapshot.outputs.project-version }})"
uses: apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@rel/12.1.0
uses: apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@rel/12.1.1
with:
nexus-url: ${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.nexus-url || 'https://repository.apache.org/content/groups/snapshots' }}
# Encode the `runs-on` input as JSON array
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/codeql-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@
name: codeql-analysis

on:
push:
branches: [ "2.x", "main" ]
pull_request:
branches: [ "2.x", "main" ]
schedule:
- cron: '32 12 * * 5'
workflow_dispatch:

permissions: read-all

jobs:

analyze:
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.0
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1
with:
java-version: |
8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/develocity-publish-build-scans.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
steps:

- name: Setup Build Scan link capture
uses: gradle/develocity-actions/setup-maven@b8d3a572314ffff3b940a2c1b7b384d4983d422d # 1.3
uses: gradle/develocity-actions/setup-maven@4a2aed82eea165ba2d5c494fc2a8730d7fdff229 # 1.4
with:
capture-build-scan-links: true

- name: Publish Build Scans
uses: gradle/develocity-actions/maven-publish-build-scan@b8d3a572314ffff3b940a2c1b7b384d4983d422d # 1.3
uses: gradle/develocity-actions/maven-publish-build-scan@4a2aed82eea165ba2d5c494fc2a8730d7fdff229 # 1.4
with:
develocity-url: 'https://develocity.apache.org'
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
52 changes: 0 additions & 52 deletions .github/workflows/merge-dependabot.yaml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/process-dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to you under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Dependabot Process PR

on:
workflow_run:
workflows:
- "Dependabot Analyze PR"
types:
- completed

permissions: { }

jobs:

process-dependabot:
# Skip this workflow on commits not pushed by Dependabot
if: ${{ github.actor == 'dependabot[bot]' }}
uses: apache/logging-parent/.github/workflows/process-dependabot-reusable.yaml@feat/dependabot-add-changelog2
permissions:
# Required to auto-merge PRs
contents: write
pull-requests: write
secrets:
RECURSIVE_TOKEN: ${{ secrets.USER_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
with:
user-name: 'Release Manager'
user-email: [email protected]
analyze-workflow-run-id: ${{ github.event.workflow_run.id }}
2 changes: 1 addition & 1 deletion log4j-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- OSGi and JPMS options -->
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
<!-- Dependency versions -->
<mongodb.version>5.3.1</mongodb.version>
<mongodb.version>5.3.0</mongodb.version>
<slf4j2.version>2.0.17</slf4j2.version>
</properties>
<dependencyManagement>
Expand Down
26 changes: 13 additions & 13 deletions log4j-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<!-- =====================================================
Direct dependency version properties (in alphabetical order)
===================================================== -->
<activemq.version>6.1.6</activemq.version>
<activemq.version>6.1.7</activemq.version>
<angus-activation.version>2.0.2</angus-activation.version>
<angus-mail.version>2.0.3</angus-mail.version>
<assertj.version>3.27.3</assertj.version>
Expand All @@ -73,21 +73,21 @@
<commons-compress.version>1.27.1</commons-compress.version>
<commons-csv.version>1.14.0</commons-csv.version>
<commons-dbcp2.version>2.13.0</commons-dbcp2.version>
<commons-io.version>2.18.0</commons-io.version>
<commons-io.version>2.19.0</commons-io.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<commons-logging.version>1.3.5</commons-logging.version>
<!-- `com.conversantmedia:disruptor` version 1.2.16 requires Java 9: -->
<conversant.disruptor.version>1.2.15</conversant.disruptor.version>
<disruptor.version>3.4.4</disruptor.version>
<embedded-ldap.version>0.9.0</embedded-ldap.version>
<felix.version>7.0.5</felix.version>
<groovy.version>4.0.26</groovy.version>
<guava.version>33.4.7-jre</guava.version>
<groovy.version>4.0.27</groovy.version>
<guava.version>33.4.8-jre</guava.version>
<h2.version>2.2.224</h2.version>
<hamcrest.version>3.0</hamcrest.version>
<HdrHistogram.version>2.2.2</HdrHistogram.version>
<hsqldb.version>2.7.4</hsqldb.version>
<jackson-bom.version>2.18.3</jackson-bom.version>
<jackson-bom.version>2.19.1</jackson-bom.version>
<!-- Override the version in Jakarta EE 9 BOM: -->
<jakarta-activation.version>2.1.3</jakarta-activation.version>
<jakarta-mail.version>2.1.3</jakarta-mail.version>
Expand All @@ -109,20 +109,20 @@
<jmdns.version>3.6.1</jmdns.version>
<jmh.version>1.37</jmh.version>
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>5.12.1</junit-jupiter.version>
<junit-jupiter.version>5.13.2</junit-jupiter.version>
<junit-pioneer.version>1.9.1</junit-pioneer.version>
<kafka.version>3.9.0</kafka.version>
<kafka.version>4.0.0</kafka.version>
<lightcouch.version>0.2.0</lightcouch.version>
<log4j.version>1.2.17</log4j.version>
<log4j-transform.version>0.2.0</log4j-transform.version>
<log4j2-cachefile-transformer.version>2.15.0</log4j2-cachefile-transformer.version>
<log4j2-ecs-layout.version>1.6.0</log4j2-ecs-layout.version>
<log4j2-ecs-layout.version>1.7.0</log4j2-ecs-layout.version>
<logback.version>1.3.15</logback.version>
<maven.version>3.9.9</maven.version>
<maven.version>3.9.10</maven.version>
<mockito.version>4.11.0</mockito.version>
<nashorn.version>15.6</nashorn.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.persistence.version>2.7.15</org.eclipse.persistence.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<org.eclipse.persistence.version>2.7.16</org.eclipse.persistence.version>
<oro.version>2.0.8</oro.version>
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports: -->
<osgi.api.version>6.0.0</osgi.api.version>
Expand All @@ -136,9 +136,9 @@
<system-stubs.version>2.0.3</system-stubs.version>
<velocity.version>1.7</velocity.version>
<wiremock.version>2.35.2</wiremock.version>
<xmlunit.version>2.10.0</xmlunit.version>
<xmlunit.version>2.10.3</xmlunit.version>
<xz.version>1.10</xz.version>
<zstd.version>1.5.7-2</zstd.version>
<zstd.version>1.5.7-4</zstd.version>

<!-- =====================================================
Pinned transitive dependency version properties (in alphabetical order)
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
<version>12.1.0</version>
<version>12.1.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -345,12 +345,12 @@
<site-conversant.version>1.2.21</site-conversant.version>
<site-disruptor.version>4.0.0</site-disruptor.version>
<site-flume.version>1.11.0</site-flume.version>
<site-jackson.version>2.18.3</site-jackson.version>
<site-jackson.version>2.19.1</site-jackson.version>
<site-javax-mail.version>1.6.2</site-javax-mail.version>
<site-jctools.version>4.0.5</site-jctools.version>
<site-je.version>18.3.12</site-je.version>
<site-jeromq.version>0.6.0</site-jeromq.version>
<site-kafka.version>3.9.0</site-kafka.version>
<site-kafka.version>4.0.0</site-kafka.version>
<site-logback.version>1.3.15</site-logback.version>
<site-slf4j.version>2.0.17</site-slf4j.version>

Expand Down
7 changes: 0 additions & 7 deletions src/changelog/.2.x.x/fix_JsonWriter_surrogate_handling.xml

This file was deleted.

Loading