Update com.fasterxml.jackson:jackson-bom to version 2.16.0

vy · vy · commit abd07b60b59e · 2023-11-16T15:38:37.000+01:00
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
@@ -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 Log4jStackTraceElementDeserializer() {
     }
 
     @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 StackTraceElement deserialize(final JsonParser jp, final DeserializationC
             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
@@ -26,6 +26,7 @@
 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 StackTraceElement deserialize(final JsonParser jp, final DeserializationC
                 }
                 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
@@ -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 Log4jStackTraceElementDeserializer() {
     }
 
     @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 StackTraceElement deserialize(final JsonParser jp, final DeserializationC
             }
             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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import com.fasterxml.jackson.databind.annotation.JsonDeserialize;`
`27`	`27`	`import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;`
`28`	`28`	`import com.fasterxml.jackson.databind.module.SimpleModule;`
	`29`	`+import com.fasterxml.jackson.databind.util.ClassUtil;`
`29`	`30`	`import java.io.IOException;`
`30`	`31`	`import org.apache.logging.log4j.core.test.categories.Layouts;`
`31`	`32`	`import org.apache.logging.log4j.util.Strings;`
`@@ -78,7 +79,11 @@ public StackTraceElement deserialize(final JsonParser jp, final DeserializationC`
`78`	`79`	`}`
`79`	`80`	`return new StackTraceElement(className, methodName, fileName, lineNumber);`
`80`	`81`	`}`
`81`		`- throw ctxt.mappingException(_valueClass, t);`
	`82`	`+ throw JsonMappingException.from(`
	`83`	`+ jp,`
	`84`	`+ String.format(`
	`85`	`+ "Cannot deserialize instance of %s out of %s token",`
	`86`	`+ ClassUtil.nameOf(this._valueClass), t));`
`82`	`87`	`}`
`83`	`88`	`}`
`84`	`89`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@`
`17`	`17`	`package org.apache.logging.log4j.core.jackson;`
`18`	`18`
`19`	`19`	`import com.fasterxml.jackson.core.JsonParser;`
`20`		`-import com.fasterxml.jackson.core.JsonProcessingException;`
`21`	`20`	`import com.fasterxml.jackson.core.JsonToken;`
`22`	`21`	`import com.fasterxml.jackson.databind.DeserializationContext;`
`23`	`22`	`import com.fasterxml.jackson.databind.JsonMappingException;`
`24`	`23`	`import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;`
	`24`	`+import com.fasterxml.jackson.databind.util.ClassUtil;`
`25`	`25`	`import java.io.IOException;`
`26`	`26`	`import org.apache.logging.log4j.core.util.Integers;`
`27`	`27`
`@@ -43,8 +43,7 @@ public Log4jStackTraceElementDeserializer() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public StackTraceElement deserialize(final JsonParser jp, final DeserializationContext ctxt)`
`47`		`- throws IOException, JsonProcessingException {`
	`46`	`+ public StackTraceElement deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException {`
`48`	`47`	`JsonToken t = jp.getCurrentToken();`
`49`	`48`	`// Must get an Object`
`50`	`49`	`if (t == JsonToken.START_OBJECT) {`
`@@ -90,6 +89,9 @@ public StackTraceElement deserialize(final JsonParser jp, final DeserializationC`
`90`	`89`	`}`
`91`	`90`	`return new StackTraceElement(className, methodName, fileName, lineNumber);`
`92`	`91`	`}`
`93`		`- throw ctxt.mappingException(this._valueClass, t);`
	`92`	`+ throw JsonMappingException.from(`
	`93`	`+ jp,`
	`94`	`+ String.format(`
	`95`	`+ "Cannot deserialize instance of %s out of %s token", ClassUtil.nameOf(this._valueClass), t));`
`94`	`96`	`}`
`95`	`97`	`}`