This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new abd07b60b5 Update `com.fasterxml.jackson:jackson-bom` to version
`2.16.0`
abd07b60b5 is described below
commit abd07b60b59e4b4af1d042950d85bd3784b6d26b
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Nov 16 15:38:37 2023 +0100
Update `com.fasterxml.jackson:jackson-bom` to version `2.16.0`
---
.../log4j/core/jackson/Log4jStackTraceElementDeserializer.java | 10 ++++++----
.../logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java | 7 ++++++-
.../log4j/core/jackson/Log4jStackTraceElementDeserializer.java | 10 ++++++----
log4j-parent/pom.xml | 2 +-
.../.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml | 4 ++--
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git
a/log4j-core-java9/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
b/log4j-core-java9/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
index f8cf72f7a3..75b4b4b4af 100644
---
a/log4j-core-java9/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
+++
b/log4j-core-java9/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
@@ -17,11 +17,11 @@
package org.apache.logging.log4j.core.jackson;
import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
+import com.fasterxml.jackson.databind.util.ClassUtil;
import java.io.IOException;
import org.apache.logging.log4j.core.util.Integers;
@@ -43,8 +43,7 @@ public final class Log4jStackTraceElementDeserializer extends
StdScalarDeseriali
}
@Override
- public StackTraceElement deserialize(final JsonParser jp, final
DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
+ public StackTraceElement deserialize(final JsonParser jp, final
DeserializationContext ctxt) throws IOException {
JsonToken t = jp.getCurrentToken();
// Must get an Object
if (t == JsonToken.START_OBJECT) {
@@ -109,6 +108,9 @@ public final class Log4jStackTraceElementDeserializer
extends StdScalarDeseriali
return new StackTraceElement(
classLoaderName, moduleName, moduleVersion, className,
methodName, fileName, lineNumber);
}
- throw ctxt.mappingException(this._valueClass, t);
+ throw JsonMappingException.from(
+ jp,
+ String.format(
+ "Cannot deserialize instance of %s out of %s token",
ClassUtil.nameOf(this._valueClass), t));
}
}
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
index 883d02a141..767464d2d3 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.util.ClassUtil;
import java.io.IOException;
import org.apache.logging.log4j.core.test.categories.Layouts;
import org.apache.logging.log4j.util.Strings;
@@ -78,7 +79,11 @@ public class JacksonIssue429MyNamesTest {
}
return new StackTraceElement(className, methodName, fileName,
lineNumber);
}
- throw ctxt.mappingException(_valueClass, t);
+ throw JsonMappingException.from(
+ jp,
+ String.format(
+ "Cannot deserialize instance of %s out of %s
token",
+ ClassUtil.nameOf(this._valueClass), t));
}
}
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
index c423b6fa17..88689528bd 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
@@ -17,11 +17,11 @@
package org.apache.logging.log4j.core.jackson;
import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
+import com.fasterxml.jackson.databind.util.ClassUtil;
import java.io.IOException;
import org.apache.logging.log4j.core.util.Integers;
@@ -43,8 +43,7 @@ public final class Log4jStackTraceElementDeserializer extends
StdScalarDeseriali
}
@Override
- public StackTraceElement deserialize(final JsonParser jp, final
DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
+ public StackTraceElement deserialize(final JsonParser jp, final
DeserializationContext ctxt) throws IOException {
JsonToken t = jp.getCurrentToken();
// Must get an Object
if (t == JsonToken.START_OBJECT) {
@@ -90,6 +89,9 @@ public final class Log4jStackTraceElementDeserializer extends
StdScalarDeseriali
}
return new StackTraceElement(className, methodName, fileName,
lineNumber);
}
- throw ctxt.mappingException(this._valueClass, t);
+ throw JsonMappingException.from(
+ jp,
+ String.format(
+ "Cannot deserialize instance of %s out of %s token",
ClassUtil.nameOf(this._valueClass), t));
}
}
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index ca53934ab6..31d576634a 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -93,7 +93,7 @@
<hamcrest.version>2.2</hamcrest.version>
<HdrHistogram.version>2.1.12</HdrHistogram.version>
<hsqldb.version>2.7.2</hsqldb.version>
- <jackson-bom.version>2.15.3</jackson-bom.version>
+ <jackson-bom.version>2.16.0</jackson-bom.version>
<!-- Override the version in Jakarta EE 9 BOM: -->
<jakarta-activation.version>2.1.2</jakarta-activation.version>
<jakarta-mail.version>2.1.2</jakarta-mail.version>
diff --git a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
b/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
index 3370d4ae3c..b7e236b8ed 100644
--- a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
+++ b/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
@@ -3,6 +3,6 @@
xmlns="http://logging.apache.org/log4j/changelog";
xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
type="changed">
- <issue id="1894" link="https://github.com/apache/logging-log4j2/pull/1894"/>
- <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to
version `2.15.3`</description>
+ <issue id="1974" link="https://github.com/apache/logging-log4j2/pull/1974"/>
+ <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to
version `2.16.0`</description>
</entry>
