Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
*/
package org.apache.logging.log4j.core.layout;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;

import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
Expand Down Expand Up @@ -332,8 +334,9 @@ public void testAdditionalFields() {
.setConfiguration(ctx.getConfiguration())
.build();
final String str = layout.toSerializable(LogEventFixtures.createLogEvent());
assertTrue(str, str.contains("<KEY1>VALUE1</KEY1>"));
assertTrue(str, str.contains("<KEY2>" + new JavaLookup().getRuntime() + "</KEY2>"));

assertThat(str, hasXPath("//KEY1[text()='VALUE1']"));
assertThat(str, hasXPath("//KEY2[text()='" + new JavaLookup().getRuntime() + "']"));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion log4j-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<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.0</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 Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<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.0</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns"
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="updated">
<issue id="3515" link="https://github.com/apache/logging-log4j2/pull/3515"/>
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.18.3`</description>
<issue id="3708" link="https://github.com/apache/logging-log4j2/pull/3708"/>
<description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.19.0`</description>
</entry>