Skip to content

Commit c3cd060

Browse files
Pluto-sydPluto-syd
committed
Merge remote-tracking branch 'origin/2.x' into bugfix/issue-2614
2 parents 9d4f182 + b272045 commit c3cd060

23 files changed

+116
-41
lines changed

‎.asf.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ notifications:
3131
pullrequests: [email protected]
3232
pullrequests_bot_dependabot: [email protected]
3333
jira_options: link label worklog
34+
discussions: [email protected]
3435

3536
github:
3637
description: "Apache Log4j is a versatile, feature-rich, efficient logging API and backend for Java."
3738
homepage: https://logging.apache.org/log4j/2.x
3839
features:
3940
issues: true
41+
discussions: true
42+
projects: true
4043
del_branch_on_merge: true
4144
autolink_jira:
4245
- LOG4J2

‎log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ public boolean hasFilter() {
145145
/**
146146
* Determine if the LogEvent should be processed or ignored.
147147
* @param event The LogEvent.
148-
* @return true if the LogEvent should be processed.
148+
* @return {@code true} if the event is filtered and should be ignored; otherwise, {@code false} if
149+
* it should be processed
149150
*/
150151
@Override
151152
public boolean isFiltered(final LogEvent event) {

‎log4j-layout-template-json-test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
2. The Docker image version of the ELK-stack
4949
5050
As of 2024-09-16, these all (Maven artifacts and Elastic products) get released with the same version. -->
51-
<elastic.version>8.17.2</elastic.version>
51+
<elastic.version>8.17.3</elastic.version>
5252

5353
</properties>
5454

‎log4j-parent/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- =====================================================
6161
Direct dependency version properties (in alphabetical order)
6262
===================================================== -->
63-
<activemq.version>6.1.5</activemq.version>
63+
<activemq.version>6.1.6</activemq.version>
6464
<angus-activation.version>2.0.2</angus-activation.version>
6565
<angus-mail.version>2.0.3</angus-mail.version>
6666
<assertj.version>3.27.3</assertj.version>
@@ -71,7 +71,7 @@
7171
<cassandra-driver.version>3.11.5</cassandra-driver.version>
7272
<commons-codec.version>1.18.0</commons-codec.version>
7373
<commons-compress.version>1.27.1</commons-compress.version>
74-
<commons-csv.version>1.13.0</commons-csv.version>
74+
<commons-csv.version>1.14.0</commons-csv.version>
7575
<commons-dbcp2.version>2.13.0</commons-dbcp2.version>
7676
<commons-io.version>2.18.0</commons-io.version>
7777
<commons-lang3.version>3.17.0</commons-lang3.version>
@@ -82,12 +82,12 @@
8282
<embedded-ldap.version>0.9.0</embedded-ldap.version>
8383
<felix.version>7.0.5</felix.version>
8484
<groovy.version>4.0.26</groovy.version>
85-
<guava.version>33.4.0-jre</guava.version>
85+
<guava.version>33.4.5-jre</guava.version>
8686
<h2.version>2.2.224</h2.version>
8787
<hamcrest.version>3.0</hamcrest.version>
8888
<HdrHistogram.version>2.2.2</HdrHistogram.version>
8989
<hsqldb.version>2.7.4</hsqldb.version>
90-
<jackson-bom.version>2.18.2</jackson-bom.version>
90+
<jackson-bom.version>2.18.3</jackson-bom.version>
9191
<!-- Override the version in Jakarta EE 9 BOM: -->
9292
<jakarta-activation.version>2.1.3</jakarta-activation.version>
9393
<jakarta-mail.version>2.1.3</jakarta-mail.version>
@@ -106,10 +106,10 @@
106106
<jconsole.version>1.7.0</jconsole.version>
107107
<jctools.version>4.0.5</jctools.version>
108108
<jeromq.version>0.6.0</jeromq.version>
109-
<jmdns.version>3.6.0</jmdns.version>
109+
<jmdns.version>3.6.1</jmdns.version>
110110
<jmh.version>1.37</jmh.version>
111111
<junit.version>4.13.2</junit.version>
112-
<junit-jupiter.version>5.12.0</junit-jupiter.version>
112+
<junit-jupiter.version>5.12.1</junit-jupiter.version>
113113
<junit-pioneer.version>1.9.1</junit-pioneer.version>
114114
<kafka.version>3.9.0</kafka.version>
115115
<lightcouch.version>0.2.0</lightcouch.version>
@@ -121,7 +121,7 @@
121121
<maven.version>3.9.9</maven.version>
122122
<mockito.version>4.11.0</mockito.version>
123123
<nashorn.version>15.6</nashorn.version>
124-
<org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
124+
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
125125
<org.eclipse.persistence.version>2.7.15</org.eclipse.persistence.version>
126126
<oro.version>2.0.8</oro.version>
127127
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports: -->
@@ -130,15 +130,15 @@
130130
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
131131
<pax-exam.version>4.14.0</pax-exam.version>
132132
<plexus-utils.version>3.6.0</plexus-utils.version>
133-
<spotbugs-annotations.version>4.9.1</spotbugs-annotations.version>
133+
<spotbugs-annotations.version>4.9.3</spotbugs-annotations.version>
134134
<spring-boot.version>2.7.18</spring-boot.version>
135135
<spring-framework.version>5.3.39</spring-framework.version>
136136
<system-stubs.version>2.0.3</system-stubs.version>
137137
<velocity.version>1.7</velocity.version>
138138
<wiremock.version>2.35.2</wiremock.version>
139139
<xmlunit.version>2.10.0</xmlunit.version>
140140
<xz.version>1.10</xz.version>
141-
<zstd.version>1.5.6-10</zstd.version>
141+
<zstd.version>1.5.7-2</zstd.version>
142142

143143
<!-- =====================================================
144144
Pinned transitive dependency version properties (in alphabetical order)
@@ -152,7 +152,7 @@
152152
<commons-pool2.version>2.12.1</commons-pool2.version>
153153
<httpclient.version>4.5.14</httpclient.version>
154154
<httpcore.version>4.4.16</httpcore.version>
155-
<jna.version>5.16.0</jna.version>
155+
<jna.version>5.17.0</jna.version>
156156

157157
</properties>
158158

‎log4j-spring-cloud-config-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<properties>
3636
<!-- Dependency versions -->
37-
<spring-cloud.version>4.2.0</spring-cloud.version>
37+
<spring-cloud.version>4.2.1</spring-cloud.version>
3838

3939
<!--
4040
~ OSGi and JPMS options

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,12 @@
340340
<maven.site.skip>true</maven.site.skip>
341341
<maven.site.deploy.skip>true</maven.site.deploy.skip>
342342
<site-commons-compress.version>1.27.1</site-commons-compress.version>
343-
<site-commons-csv.version>1.13.0</site-commons-csv.version>
343+
<site-commons-csv.version>1.14.0</site-commons-csv.version>
344344
<site-commons-logging.version>1.3.5</site-commons-logging.version>
345345
<site-conversant.version>1.2.21</site-conversant.version>
346346
<site-disruptor.version>4.0.0</site-disruptor.version>
347347
<site-flume.version>1.11.0</site-flume.version>
348-
<site-jackson.version>2.18.2</site-jackson.version>
348+
<site-jackson.version>2.18.3</site-jackson.version>
349349
<site-javax-mail.version>1.6.2</site-javax-mail.version>
350350
<site-jctools.version>4.0.5</site-jctools.version>
351351
<site-je.version>18.3.12</site-je.version>

‎src/changelog/.2.x.x/3300_fix-javadoc.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
5+
type="fixed">
6+
<issue id="3300" link="https://github.com/apache/logging-log4j2/issues/3300"/>
7+
<description format="asciidoc">
8+
Corrected @return javadoc for AbstractFilterable#isFiltered().
9+
</description>
10+
</entry>

‎src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
55
type="updated">
6-
<issue id="3460" link="https://github.com/apache/logging-log4j2/pull/3460"/>
7-
<description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.17.2`</description>
6+
<issue id="3521" link="https://github.com/apache/logging-log4j2/pull/3521"/>
7+
<description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.17.3`</description>
88
</entry>

‎src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
55
type="updated">
6-
<issue id="3244" link="https://github.com/apache/logging-log4j2/pull/3244"/>
7-
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.18.2`</description>
6+
<issue id="3515" link="https://github.com/apache/logging-log4j2/pull/3515"/>
7+
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.18.3`</description>
88
</entry>

‎src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
55
type="updated">
6-
<issue id="3447" link="https://github.com/apache/logging-log4j2/pull/3447"/>
7-
<description format="asciidoc">Update `com.github.luben:zstd-jni` to version `1.5.6-10`</description>
6+
<issue id="3479" link="https://github.com/apache/logging-log4j2/pull/3479"/>
7+
<description format="asciidoc">Update `com.github.luben:zstd-jni` to version `1.5.7-1`</description>
88
</entry>

0 commit comments

Comments
 (0)