Skip to content

Commit 8ffdfc2

Browse files
committed
Merge branch '2.x' of github.com:apache/logging-log4j2 into 2.x
2 parents e6ef19f + d2bde13 commit 8ffdfc2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

log4j-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<hamcrest.version>2.2</hamcrest.version>
9292
<HdrHistogram.version>2.2.1</HdrHistogram.version>
9393
<hsqldb.version>2.7.2</hsqldb.version>
94-
<jackson-bom.version>2.17.0</jackson-bom.version>
94+
<jackson-bom.version>2.17.1</jackson-bom.version>
9595
<!-- Override the version in Jakarta EE 9 BOM: -->
9696
<jakarta-activation.version>2.1.3</jakarta-activation.version>
9797
<jakarta-mail.version>2.1.3</jakarta-mail.version>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
<maven.site.skip>true</maven.site.skip>
333333
<maven.site.deploy.skip>true</maven.site.deploy.skip>
334334
<site-commons-logging.version>1.3.1</site-commons-logging.version>
335-
<site-jackson.version>2.17.0</site-jackson.version>
335+
<site-jackson.version>2.17.1</site-jackson.version>
336336
<site-log4j-api.version>2.23.1</site-log4j-api.version>
337337
<site-log4j-core.version>2.23.1</site-log4j-core.version>
338338
<site-log4j-layout-template-json.version>2.23.1</site-log4j-layout-template-json.version>

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

+2-2
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="2372" link="https://github.com/apache/logging-log4j2/pull/2372"/>
7-
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.17.0`</description>
6+
<issue id="2570" link="https://github.com/apache/logging-log4j2/pull/2570"/>
7+
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.17.1`</description>
88
</entry>

0 commit comments

Comments
 (0)