Skip to content

Commit aa0294d

Browse files
authored
Bump com.fasterxml.jackson:jackson-bom in /log4j-parent (#3708)
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.18.3 to 2.19.0. - [Commits](FasterXML/jackson-bom@jackson-bom-2.18.3...jackson-bom-2.19.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Fixes #3664.
1 parent 6fd9c62 commit aa0294d

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
*/
1717
package org.apache.logging.log4j.core.layout;
1818

19+
import static org.hamcrest.MatcherAssert.assertThat;
1920
import static org.junit.Assert.assertEquals;
2021
import static org.junit.Assert.assertFalse;
2122
import static org.junit.Assert.assertNull;
2223
import static org.junit.Assert.assertTrue;
24+
import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;
2325

2426
import com.fasterxml.jackson.core.JsonParseException;
2527
import com.fasterxml.jackson.databind.JsonMappingException;
@@ -332,8 +334,9 @@ public void testAdditionalFields() {
332334
.setConfiguration(ctx.getConfiguration())
333335
.build();
334336
final String str = layout.toSerializable(LogEventFixtures.createLogEvent());
335-
assertTrue(str, str.contains("<KEY1>VALUE1</KEY1>"));
336-
assertTrue(str, str.contains("<KEY2>" + new JavaLookup().getRuntime() + "</KEY2>"));
337+
338+
assertThat(str, hasXPath("//KEY1[text()='VALUE1']"));
339+
assertThat(str, hasXPath("//KEY2[text()='" + new JavaLookup().getRuntime() + "']"));
337340
}
338341

339342
@Test

log4j-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
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.3</jackson-bom.version>
90+
<jackson-bom.version>2.19.0</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>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
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.3</site-jackson.version>
348+
<site-jackson.version>2.19.0</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/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="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>
6+
<issue id="3708" link="https://github.com/apache/logging-log4j2/pull/3708"/>
7+
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.19.0`</description>
88
</entry>

0 commit comments

Comments
 (0)