Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at 2024-03-11 15:34:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4j (Old) and /work/SRC/openSUSE:Factory/.log4j.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "log4j" Mon Mar 11 15:34:16 2024 rev:42 rq:1156792 version:2.17.2 Changes: -------- --- /work/SRC/openSUSE:Factory/log4j/log4j.changes 2022-06-19 21:11:09.682152663 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new.1770/log4j.changes 2024-03-11 15:42:03.968392166 +0100 @@ -1,0 +2,8 @@ +Sun Mar 10 22:19:36 UTC 2024 - Fridrich Strba <[email protected]> + +- Added patch: + * log4j-jackson-databind.patch + + do not use previously deprecated methods, removed in + jackson-databind 2.16.x + +------------------------------------------------------------------- New: ---- log4j-jackson-databind.patch BETA DEBUG BEGIN: New:- Added patch: * log4j-jackson-databind.patch + do not use previously deprecated methods, removed in BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.TjDGDl/_old 2024-03-11 15:42:04.496411629 +0100 +++ /var/tmp/diff_new_pack.TjDGDl/_new 2024-03-11 15:42:04.496411629 +0100 @@ -1,7 +1,7 @@ # # spec file for package log4j # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ Source2: https://www.apache.org/dist/logging/KEYS#/%{name}.keyring Patch0: log4j-java8compat.patch Patch1: logging-log4j-Remove-unsupported-EventDataConverter.patch +Patch2: log4j-jackson-databind.patch BuildRequires: fdupes BuildRequires: java-devel >= 9 BuildRequires: maven-local ++++++ log4j-jackson-databind.patch ++++++ --- apache-log4j-2.17.2-src/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java 2024-03-09 21:13:03.876020411 +0100 +++ apache-log4j-2.17.2-src/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java 2024-03-09 21:34:48.633999170 +0100 @@ -21,11 +21,11 @@ import org.apache.logging.log4j.core.util.Integers; 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; /** * Copy and edit the Jackson (Apache License 2.0) class to use Log4j attribute names. Does not work as of Jackson 2.3.2. @@ -44,8 +44,7 @@ } @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) { @@ -79,6 +78,9 @@ } 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)); } } \ No newline at end of file
