Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at 2026-01-06 17:46:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4j (Old) and /work/SRC/openSUSE:Factory/.log4j.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "log4j" Tue Jan 6 17:46:00 2026 rev:45 rq:1325545 version:2.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/log4j/log4j.changes 2024-10-11 17:05:00.609438569 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new.1928/log4j.changes 2026-01-06 17:47:21.748483842 +0100 @@ -1,0 +2,165 @@ +Mon Jan 5 18:13:34 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to 2.18.0 + * Added + + Add support for Jakarta Mail API in the SMTP appender. + + Add support for custom Log4j 1.x levels. + + Add support for adding and retrieving appenders in Log4j 1.x + bridge. + + Add support for custom LMAX disruptor WaitStrategy + configuration. + + Add support for Apache Extras' RollingFileAppender in Log4j + 1.x bridge. + + Add MutableThreadContextMapFilter. + + Add support for 24 colors in highlighting + * Changed + + Improves ServiceLoader support on servlet containers. + + Make the default disruptor WaitStrategy used by Async Loggers + garbage-free. + + Do not throw UnsupportedOperationException when JUL + ApiLogger::setLevel is called. + + Support Spring 2.6.x. + + Move perf tests to log4j-core-its + + Upgrade the Flume Appender to Flume 1.10.0 + * Fixed + + Fix minor typo #792. + + Improve validation and reporting of configuration errors. + + Allow enterprise id to be an OID fragment. + + Fix problem with non-uppercase custom levels. + + Avoid ClassCastException in JeroMqManager with custom + LoggerContextFactory #791. + + DirectWriteRolloverStrategy should use the current time when + creating files. + + Fixes the syslog appender in Log4j 1.x bridge, when used with + a custom layout. + + log4j-1.2-api 2.17.2 throws NullPointerException while + removing appender with name as null. + + Improve JsonTemplateLayout performance. + + Fix resolution of non-Log4j properties. + + Fixes Spring Boot logging system registration in a + multi-application environment. + + JAR file containing Log4j configuration isn’t closed. + + Properties defined in configuration using a value attribute + (as opposed to element) are read correctly. + + Syslog appender lacks the SocketOptions setting. + + Log4j 1.2 bridge should not wrap components unnecessarily. + + Update 3rd party dependencies for 2.18.0. + + SizeBasedTriggeringPolicy would fail to rename files properly + when integer pattern contained a leading zero. + + Fixes default SslConfiguration, when a custom keystore is + used. + + Fixes appender concurrency problems in Log4j 1.x bridge. + + Fix and test for race condition in FileUtils.mkdir(). + + LocalizedMessage logs misleading errors on the console. + + Add missing message parameterization in RegexFilter. + + Add the missing context stack to JsonLayout template. + + HttpWatcher did not pass credentials when polling. + + UrlConnectionFactory.createConnection now accepts an + AuthorizationProvider as a parameter. + + The DirectWriteRolloverStrategy was not detecting the correct + index to use during startup. + + Async Loggers were including the location information by + default. + + ClassArbiter’s newBuilder method referenced the wrong class. + + Don’t use Paths.get() to avoid circular file systems. + + Fix parsing error, when XInclude is disabled. + + Fix LevelRangeFilterBuilder to align with log4j1’s behavior. + + Fixes problem with wrong ANSI escape code for bright colors + + Log4j 1.2 bridge should generate Log4j 2.x messages based on + the parameter runtime type. +- Update to 2.19.0 + * Added + + Add implementation of SLF4J2 fluent API. + + Add support for SLF4J2 stack-valued MDC. + * Changed + + Add getExplicitLevel method to LoggerConfig. + + Allow PropertySources to be added. + + Allow Plugins to be injected with the LoggerContext reference. + * Fixed + + Add correct manifest entries for OSGi to log4j-jcl + + Improve support for passwordless keystores. + + SystemPropertyArbiter was assigning the value as the name. + + Make JsonTemplateLayout stack trace truncation operate for + each label block. + + Fix recursion between Log4j 1.2 LogManager and Category. + + Fix resolution of properties not starting with log4j2.. + + Logger$PrivateConfig.filter(Level, Marker, String) was + allocating empty varargs array. + + Allows a space separated list of style specifiers in the + %style pattern for consistency with %highlight. + + Fix NPE in log4j-to-jul in the case the root logger level is + null. + + Fix RollingRandomAccessFileAppender with + DirectWriteRolloverStrategy can’t create the first log file of + different directory. + + Generate new SSL certs for testing. + + Fix ServiceLoaderUtil behavior in the presence of a + SecurityManager. + + Fix regression in Rfc5424Layout default values. + + Harden InstantFormatter against delegate failures. + + Add async support to Log4jServletFilter. + * Removed + + Removed build page in favor of a single build instructions + file. + + Remove SLF4J 1.8.x binding. +- Update to 2.20.0 + * Added + + Add support for timezones in RollingFileAppender date pattern + + Add LogEvent timestamp to ProducerRecord in KafkaAppender + + Add PatternLayout support for abbreviating the name of all + logger components except the 2 rightmost + + Removes internal field that leaked into public API. + + Add a LogBuilder#logAndGet() method to emulate the + Logger#traceEntry method. + * Changed + + Simplify site generation + + Switch the issue tracker from JIRA to GitHub Issues + + Remove liquibase-log4j2 maven module + + Fix order of stacktrace elements, that causes cache misses in + ThrowableProxyHelper. + + Switch from com.sun.mail to Eclipse Angus. + + Add Log4j2 Core as default runtime dependency of the + SLF4J2-to-Log4j2 API bridge. + + Replace maven-changes-plugin with a custom changelog + implementation + + Moved log4j-api and log4j-core artifacts with classifier tests + to log4j-api-test and log4j-core-test respectively. + * Deprecated + + Deprecate support for package scanning for plugins + * Fixed + + Copy programmatically supplied location even if + includeLocation="false". + + Eliminate status logger warning, when disableAnsi or + noConsoleNoAnsi is used the style and highlight patterns. + + Fix detection of location requirements in RewriteAppender. + + Replace regex with manual code to escape characters in + Rfc5424Layout. + + Fix java.sql.Time object formatting in MapMessage + + Fix previous fire time computation in CronTriggeringPolicy + + Correct default to not include location for AsyncRootLoggers + + Make StatusConsoleListener use SimpleLogger internally. + + Lazily evaluate the level of a SLF4J LogEventBuilder + + Fixes priority of Legacy system properties, which are now back + to having higher priority than Environment variables. + + Protects ServiceLoaderUtil from unchecked ServiceLoader + exceptions. + + Fix Configurator#setLevel for internal classes + + Fix level propagation in Log4jBridgeHandler + + Disable OsgiServiceLocator if not running in OSGI container. + + When using a Date Lookup in the file pattern the current time + should be used. + + Fixed LogBuilder filtering in the presence of global filters. +- Removed patch: + * log4j-java8compat.patch + + not needed with this version +- Modified patch: + * logging-log4j-Remove-unsupported-EventDataConverter.patch + + rediff +- Added patch: + * 0002-Remove-usage-of-toolchains.patch + + do not use the maven-toolchains-plugin + * log4j-CVE-2025-68161.patch + + bsc#1255427, CVE-2025-68161: absent TLS hostname verification + may allow a man-in-the-middle attack + +------------------------------------------------------------------- Old: ---- apache-log4j-2.17.2-src.tar.gz apache-log4j-2.17.2-src.tar.gz.asc log4j-java8compat.patch New: ---- 0002-Remove-usage-of-toolchains.patch _scmsync.obsinfo apache-log4j-2.20.0-src.tar.gz apache-log4j-2.20.0-src.tar.gz.asc build.specials.obscpio log4j-CVE-2025-68161.patch ----------(Old B)---------- Old:- Removed patch: * log4j-java8compat.patch + not needed with this version ----------(Old E)---------- ----------(New B)---------- New:- Added patch: * 0002-Remove-usage-of-toolchains.patch + do not use the maven-toolchains-plugin New: + do not use the maven-toolchains-plugin * log4j-CVE-2025-68161.patch + bsc#1255427, CVE-2025-68161: absent TLS hostname verification ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.YB7PNP/_old 2026-01-06 17:47:22.488514285 +0100 +++ /var/tmp/diff_new_pack.YB7PNP/_new 2026-01-06 17:47:22.492514450 +0100 @@ -1,7 +1,7 @@ # # spec file for package log4j # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define __requires_exclude java-headless %bcond_without extra_modules Name: log4j -Version: 2.17.2 +Version: 2.20.0 Release: 0 Summary: Java logging package License: Apache-2.0 @@ -29,9 +29,10 @@ Source0: http://archive.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz Source1: http://archive.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz.asc Source2: https://www.apache.org/dist/logging/KEYS#/%{name}.keyring -Patch0: log4j-java8compat.patch -Patch1: logging-log4j-Remove-unsupported-EventDataConverter.patch +Patch0: logging-log4j-Remove-unsupported-EventDataConverter.patch +Patch1: 0002-Remove-usage-of-toolchains.patch Patch2: log4j-jackson-databind.patch +Patch3: log4j-CVE-2025-68161.patch BuildRequires: fdupes BuildRequires: java-devel >= 9 BuildRequires: maven-local @@ -39,13 +40,13 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) BuildRequires: mvn(com.lmax:disruptor) -BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(jakarta.mail:jakarta.mail-api) BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) -BuildRequires: mvn(javax.activation:javax.activation-api) +BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.logging:logging-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) @@ -61,7 +62,7 @@ BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml) BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml) BuildRequires: mvn(com.fasterxml.woodstox:woodstox-core) -BuildRequires: mvn(javax.servlet.jsp:jsp-api) +BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec) @@ -87,6 +88,12 @@ %description jcl Apache Log4j Commons Logging Bridge. +%package bom +Summary: Apache Log4j BOM + +%description bom +Apache Log4j 2 Bill of Material + %if %{with extra_modules} %package taglib Summary: Apache Log4j Tag Library @@ -102,7 +109,7 @@ %description jmx-gui Swing-based client for remotely editing the log4j configuration and remotely -monitoring StatusLogger output. Includes a JConsole plug-in. +monitoring StatusLogger output. %package web Summary: Apache Log4j Web @@ -111,12 +118,6 @@ %description web Support for Log4j in a web servlet container. -%package bom -Summary: Apache Log4j BOM - -%description bom -Apache Log4j 2 Bill of Material - %package nosql Summary: Apache Log4j NoSql Requires: java-headless >= 1.8 @@ -136,12 +137,15 @@ %setup -q -n apache-%{name}-%{version}-src %autopatch -p1 +%pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :maven-site-plugin -%pom_remove_plugin -r :maven-remote-resources-plugin -%pom_remove_plugin -r :maven-doap-plugin %pom_remove_plugin -r :maven-source-plugin %pom_remove_plugin -r :maven-toolchains-plugin -%pom_remove_plugin -r :revapi-maven-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r com.diffplug.spotless:spotless-maven-plugin +%pom_remove_plugin -r org.apache.logging.log4j:log4j-changelog-maven-plugin +%pom_remove_plugin -r org.codehaus.mojo:xml-maven-plugin +%pom_remove_plugin -r org.ops4j.pax.exam:exam-maven-plugin # remove all the stuff we'll build ourselves find -name "*.jar" -o -name "*.class" -delete @@ -156,6 +160,15 @@ # artifact for upstream testing of log4j itself, shouldn't be distributed %pom_disable_module %{name}-perf +%pom_remove_dep -r org.codehaus.groovy:groovy-bom +%pom_remove_dep -r com.fasterxml.jackson:jackson-bom +%pom_remove_dep -r jakarta.platform:jakarta.jakartaee-bom +%pom_remove_dep -r org.eclipse.jetty:jetty-bom +%pom_remove_dep -r org.junit:junit-bom +%pom_remove_dep -r io.fabric8:kubernetes-client-bom +%pom_remove_dep -r io.netty:netty-bom +%pom_remove_dep -r org.springframework:spring-framework-bom + # unavailable com.conversantmedia:disruptor rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java %pom_remove_dep -r com.conversantmedia:disruptor @@ -164,12 +177,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :kafka-clients -# liquibase not available -%pom_disable_module %{name}-liquibase - -# we don't have slf4j 1.8 yet -%pom_disable_module %{name}-slf4j18-impl - # we don't have commons-dbcp2 %pom_disable_module %{name}-jdbc-dbcp2 @@ -179,15 +186,25 @@ # System scoped dep provided by JDK %pom_remove_dep :jconsole %{name}-jmx-gui +rm log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java # old AID is provided by felix, we want osgi-core %pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core -# BOM package shouldn't require Apache RAT -%pom_remove_plugin :apache-rat-plugin %{name}-bom - # tests are disabled %pom_remove_plugin -r :maven-failsafe-plugin +%pom_remove_plugin -r :maven-surefire-plugin + +%pom_remove_parent +%pom_remove_parent log4j-bom + +# Make compiled code compatible with OpenJDK 8 +%pom_xpath_inject 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' "<release>8</release>" + +%pom_disable_module %{name}-api-test +%pom_disable_module %{name}-core-test +%pom_disable_module %{name}-layout-template-json-test +%pom_disable_module %{name}-slf4j2-impl %pom_disable_module %{name}-core-its %pom_disable_module %{name}-jpa @@ -197,27 +214,23 @@ %pom_disable_module %{name}-spring-cloud-config %pom_disable_module %{name}-kubernetes %if %{without extra_modules} -%pom_disable_module %{name}-bom %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui %pom_disable_module %{name}-web %pom_disable_module %{name}-couchdb %endif -%pom_remove_dep -r :javax.persistence %if %{without extra_modules} %pom_remove_dep -r :jackson-dataformat-yaml %pom_remove_dep -r :jackson-dataformat-xml %pom_remove_dep -r :woodstox-core -%pom_remove_dep -r :jboss-jms-api_1.1_spec +%pom_remove_dep -r javax.jms:javax.jms-api %pom_remove_dep -r :jeromq %pom_remove_dep -r :commons-csv %else -%pom_change_dep -r :jboss-jms-api_1.1_spec org.apache.geronimo.specs:geronimo-jms_1.1_spec +%pom_change_dep -r javax.jms:javax.jms-api org.apache.geronimo.specs:geronimo-jms_1.1_spec %endif -%pom_add_dep javax.activation:javax.activation-api %{name}-core - %if %{without extra_modules} rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,config/yaml,parser} rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/{db,mom,nosql} @@ -226,6 +239,17 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %endif +%pom_remove_dep com.sun.mail:javax.mail log4j-core +%pom_remove_dep javax.mail:javax.mail-api log4j-core +%pom_remove_dep javax.activation:javax.activation-api log4j-core +rm log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java +rm log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java +rm log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java +rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java + +%pom_remove_dep org.eclipse.angus:angus-activation log4j-jakarta-smtp +%pom_remove_dep org.eclipse.angus:jakarta.mail log4j-jakarta-smtp + %{mvn_package} ':%{name}-slf4j-impl' slf4j %{mvn_package} ':%{name}-to-slf4j' slf4j %{mvn_package} ':%{name}-taglib' taglib @@ -259,13 +283,13 @@ %files jcl -f .mfiles-jcl +%files bom -f .mfiles-bom + %if %{with extra_modules} %files taglib -f .mfiles-taglib %files web -f .mfiles-web -%files bom -f .mfiles-bom - %files nosql -f .mfiles-nosql %files jmx-gui -f .mfiles-jmx-gui ++++++ 0002-Remove-usage-of-toolchains.patch ++++++ >From 22d40a2e43583647f3337489ac9e286883586bcd Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> Date: Tue, 6 Jun 2023 15:06:14 +0200 Subject: [PATCH] Remove usage of toolchains --- log4j-api-java9/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml index e78fe4a..4a669e1 100644 --- a/log4j-api-java9/pom.xml +++ b/log4j-api-java9/pom.xml @@ -76,9 +76,6 @@ <goal>compile</goal> </goals> <configuration> - <jdkToolchain> - <version>[9, )</version> - </jdkToolchain> <release>9</release> </configuration> </execution> @@ -98,9 +95,6 @@ <goal>testCompile</goal> </goals> <configuration> - <jdkToolchain> - <version>[9, )</version> - </jdkToolchain> <release>9</release> <compileSourceRoots> <compileSourceRoot>${project.basedir}/src/test/java9</compileSourceRoot> @@ -128,9 +122,6 @@ <systemPropertyVariables> <java.awt.headless>true</java.awt.headless> </systemPropertyVariables> - <jdkToolchain> - <version>[9, )</version> - </jdkToolchain> </configuration> </plugin> </plugins> -- 2.40.1 ++++++ _scmsync.obsinfo ++++++ mtime: 1767687889 commit: b95f4b757a7bba7c515825fc625f9f380a2d68ddceff9b2e7db277d251998d61 url: https://src.opensuse.org/java-packages/log4j.git revision: b95f4b757a7bba7c515825fc625f9f380a2d68ddceff9b2e7db277d251998d61 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ apache-log4j-2.17.2-src.tar.gz -> apache-log4j-2.20.0-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/log4j/apache-log4j-2.17.2-src.tar.gz /work/SRC/openSUSE:Factory/.log4j.new.1928/apache-log4j-2.20.0-src.tar.gz differ: char 13, line 1 ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-01-06 09:25:35.000000000 +0100 @@ -0,0 +1 @@ +.osc ++++++ log4j-CVE-2025-68161.patch ++++++ ++++ 806 lines (skipped) ++++++ log4j.keyring ++++++ --- /var/tmp/diff_new_pack.YB7PNP/_old 2026-01-06 17:47:22.656521196 +0100 +++ /var/tmp/diff_new_pack.YB7PNP/_new 2026-01-06 17:47:22.660521362 +0100 @@ -1618,3 +1618,93 @@ =4dis -----END PGP PUBLIC KEY BLOCK----- +pub ed25519 2024-03-18 [SC] + 7D24 496A 230E 29D6 349A 99EF 583E 4915 78F0 2D5D +uid [ultimate] Jan Friedrich <[email protected]> +sig 3 583E491578F02D5D 2024-03-18 [self-signature] +sub cv25519 2024-03-18 [E] +sig 583E491578F02D5D 2024-03-18 [self-signature] + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEZfidWBYJKwYBBAHaRw8BAQdACdFyhwtzHenkv/ZrBLHE3KPS88PninzvIjBy +JV56HSS0JUphbiBGcmllZHJpY2ggPGZyZWVhbmRuaWxAYXBhY2hlLm9yZz6IkwQT +FgoAOxYhBH0kSWojDinWNJqZ71g+SRV48C1dBQJl+J1YAhsDBQsJCAcCAiICBhUK +CQgLAgQWAgMBAh4HAheAAAoJEFg+SRV48C1d9aoBALVa4RbPNEKGiEbK+cFZTm26 +EeIM0eUL3zXEDHr7mpk3AQDsAAZzQIoKp8v+SqoSS8PZK2MMJ589Yap5ExyWVwQs +Arg4BGX4nVgSCisGAQQBl1UBBQEBB0DA8Xl74f/FGxNiOp30ik9hQTFpIQsmOnoJ +4jwCAo6yVQMBCAeIeAQYFgoAIBYhBH0kSWojDinWNJqZ71g+SRV48C1dBQJl+J1Y +AhsMAAoJEFg+SRV48C1dB7wBAOfodcT9e7OZkeEvryU9RSUb0QD+izqD7hMvQEKv +L5D6AQCrbbIg4D4GCzgjr5XVjGklA4iz61suXilmKqY3XP2nCw== +=iIGg +-----END PGP PUBLIC KEY BLOCK----- + +pub rsa4096 2024-10-09 [SC] + C6FC 425C 9672 2EFC 4E2D 02D5 D430 5EBC 16B4 A78D +uid [ultimate] Stephen Webb <[email protected]> +sig 3 D4305EBC16B4A78D 2024-10-09 Stephen Webb <[email protected]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGcF/6gBEACwzLW1sRWw65C8wqpmeWvE5wx4OgVLLTnrhM1ZKBKdLwJRKGjB +SQ7q/mMzZmGPqGwT1JeFr9LP29SCdlyQiIhOUtXFFtKb2gu8ATrDp+ENKOjjKT3w +KjB5RHVTj+lzx4vydRXnR9arCXTgOUx5TMXoEc7IvPdSxGnd1LW30PRld4aexFV7 ++1fK96tpjjaWLPHNhjxNQ9FqRSImaf2pmw8WOPvshh/VDWw8SKP5DalZ+xjq/3w1 +xv1FgJmR+NmJSJ+t875cCtZE5JoWK8aAd7mafqWtchu2K3QY6fEpdNXooKIWierT +13z+TGqQZGeHAirs5/Mdc9n6VzBDePtFJ2REEiVRVjzbxMqgA3AODyJ9oCYG327Y +GhIIvjlpiC3S1qBLC2wE8LEvgf+d0kQYjZjuSTxlwbwDJp6wk5tNOozEi2OYFYy7 +ZLB6jwNy2u/qu6FR14S3qmhnMBBnopU4ycpUbzdVh6CgI6LEbOu4RRuKpQCh1A8u +jR5MnUr5UNWa2dc4c1n+uKttI/CXnY6co9tn/6bFN1Xvw+J30OCnREoS/HOzXHed +f31NVF/91upI7tCY2R5gcc70goG+HzRhSiqqf5uqc6buTaSkqh/ejtvTF3CEBCn9 +MrwGdXp4CsJkcI8TsJxcqie/liyG+SWDRvvLalYU8snH4q9fphUvCo2Z8QARAQAB +tCNTdGVwaGVuIFdlYmIgPHN3ZWJiMjA2NkBhcGFjaGUub3JnPokCTgQTAQoAOBYh +BMb8QlyWci78Ti0C1dQwXrwWtKeNBQJnBf+oAhsDBQsJCAcCBhUKCQgLAgQWAgMB +Ah4BAheAAAoJENQwXrwWtKeNkNIP/0ZIwOPsmpHwQ9xvzoXvR9UUb/szZIsXRcy9 +R8Lme/UpTDAWGOgOb0UkKpy560DZWi78637pxeKz9P9SPCvg9jRJY5OJ91m8TjWw +pDq+tStCqxetNVAVY0NH8HsMB3+zqd4+MbHj0GRfx8Bpia6rqpu/DzOk69S8ARzZ +JkkHaX5xKbXio6Brd6jRsCXFatudYA+4+O1zJ+lZzLaQV0ziXSlwtz7v6Z1yQKLo +KfjEPFM63c2hTnQ3sd/5eC6Uf6DE37CUOu8EQlGoMMAS96apAfqjOfEWYkUWnPYS +8K6ZTb6Ux/8HX6ub40a/MQbYI4JYJ0+HHVkRGgap+zgPxDev2SJGJTeAjHgJ5O3M +ownYBLmppfBnsFW7dwIMC63OIeC/qQ1nTtn6UVrsh39Xt+T4/Z0DQuUQGjxC6cug +2f9sO0l9sVvBtromz2Muexvu+u+NWf6HlvA00YtK/+9QgYRh4OHHgAwdFkezXGwA +8f/1X5otqmHLExz9t6/89ytnPnZXf4yeeYCroZSjK5X9C8T57cjzH8OwbaQNWAtG +rz/LkDP0m+IvMCS2P83gS1AKBUHyHeHH5nCgU3PYtaGyrc/iNvtzIv9uczjCqIAn +YLjC80ZNIwpbZjDRSfoeOpr4ZwIph5JGjxYcT1lL/fj+F9teNYkQt4MsK9/ArEx/ +LAChBgyd +=u+un +-----END PGP PUBLIC KEY BLOCK----- + +pub ed25519/0x8B585C2026E8BA5F 2025-11-28 [SC] [expires: 2028-11-27] + Key fingerprint = 1F09 DBBA E4EC A525 5B65 A21F 8B58 5C20 26E8 BA5F +uid [ultimate] Raman Gupta <[email protected]> +sig 3 0x8B585C2026E8BA5F 2025-11-28 [self-signature] +sig 1 0x943F287533382C9D 2025-11-28 Raman Gupta <[email protected]> +sub cv25519/0x6DC62ADE9D4C35CB 2025-11-28 [E] [expires: 2028-11-27] +sig 0x8B585C2026E8BA5F 2025-11-28 [self-signature] + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEaSkg4xYJKwYBBAHaRw8BAQdAnZUWexxwRDdWWy3+voy2oNk6y+eiHogt0mSj +NgfMggK0H1JhbWFuIEd1cHRhIDxyZ3VwdGFAYXBhY2hlLm9yZz6IlgQTFgoAPhYh +BB8J27rk7KUlW2WiH4tYXCAm6LpfBQJpKSDjAhsDBQkFo5qABQsJCAcDBRUKCQgL +BRYCAwEAAh4FAheAAAoJEItYXCAm6Lpfp3EBALtv1eTVtI+EyNbefOap89o2fQSD +8yyZqC8UJkdaOxQZAQDO/BalQIkpKbuNWjIvyrbqeTsYXqPfKDeg03N+gz6ZC4kC +NwQQAQoAIRYhBB884GxRziD3xEBRgZQ/KHUzOCydBQJpKSF2AwUBeAAKCRCUPyh1 +MzgsnYJCEACyIXXHzrn4cOYdZmkcB4XjYKVWOzBr9v+hNSbgl6gbnp7xEv/nSzpy +HwdI2Gx/bmjDuMaq1/2w5gjoTifUi6f7wJi3gAMPoobb20WOIQhNMbXFxC/p1PMc +w4VwofV8oZbFvIyDJHtWyq4zIB34NpWQhwCJgZa+IhN1JDfdhwgiCt/2vLb7nn9s +iJBIIgxu8XvY/wCh5KupONbl7UppDz7LsfnniMmT3pxutOe/DnDJe+Tmu+p72GMk +hJHh+gh9Q/Xzs7jRG7W00jwXOjIFJRS7aC3FNsPhoNtu/z7QfV9/flVd4X9vyke1 +zSAebBnoa7ssUk7vgrLmLQ2YOrKY5Sdld++qxUqSScSUCcSyIVRuLFiZvTLcHJvb +d1k1jQHFrHRxXY5qUnFhdbnLtG7OKYzIDpDNRG/mNfTpU/IPRwCaaQGl0u8vX2HB +gzZSYVEx/3mnMAVm0uNBKAs2r0qRVtkhlpyy1V9j5Wore0K1/SOkPlh2naLINQcE +axHbuxBklVP5ipsmLGA1hGSi8lyusIUIxUyV8r01plzLYqk3hI9GvwbfSRKS+fcX +MIcru4Z/x5OmegHJQkyv0l7QtXYU33kv82k/AIfXzs9VHdsuEmzaukXd9XVGa7cV +pzPfKlVt431USmUwJf8BtTMvMN5jtMEISUYNFzirQuQPOGXMDDHC5rg4BGkpIOMS +CisGAQQBl1UBBQEBB0AFawIIp75NLurw8SNhf3mqQUvZSy8D2OZ9YYNh5QstUAMB +CAeIfgQYFgoAJhYhBB8J27rk7KUlW2WiH4tYXCAm6LpfBQJpKSDjAhsMBQkFo5qA +AAoJEItYXCAm6LpfkVQBAO7Y+oejWP6kBz7ercGFNlKX/pc01uTlCt3BUky7/4X4 +AQD+X5ScigcabLpkKn17OhdkTdgyigw5mT6MwBRIKaP6AA== +=MKb4 +-----END PGP PUBLIC KEY BLOCK----- + ++++++ logging-log4j-Remove-unsupported-EventDataConverter.patch ++++++ --- /var/tmp/diff_new_pack.YB7PNP/_old 2026-01-06 17:47:22.672521855 +0100 +++ /var/tmp/diff_new_pack.YB7PNP/_new 2026-01-06 17:47:22.672521855 +0100 @@ -1,22 +1,3 @@ -From b017736fa1b58377b8bf1b89599b274a9cfb9956 Mon Sep 17 00:00:00 2001 -From: Dinesh Prasanth M K <[email protected]> -Date: Fri, 31 Jan 2020 13:00:05 -0500 -Subject: [PATCH] Remove unsupported EventDataConverter - -This deletes the EventDataConverter entirely from log4j-slf4j-impl -entirely because EventData is not supported in 1.8. - -Signed-off-by: Dinesh Prasanth M K <[email protected]> ---- - .../logging/slf4j/EventDataConverter.java | 50 -------------- - .../org/apache/logging/slf4j/Log4jLogger.java | 22 +----- - .../org/apache/logging/slf4j/LoggerTest.java | 21 ------ - .../apache/logging/slf4j/OptionalTest.java | 69 ------------------- - .../src/test/resources/log4j-test1.xml | 7 -- - 5 files changed, 1 insertion(+), 168 deletions(-) - delete mode 100644 log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java - delete mode 100644 log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java - diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java deleted file mode 100644 index 620232a..0000000 @@ -74,7 +55,7 @@ - } -} diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java -index 1fa8080..90cfe4e 100644 +index 39cb2e7..1d654f8 100644 --- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java +++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java @@ -27,9 +27,7 @@ import org.apache.logging.log4j.message.Message; @@ -84,14 +65,12 @@ -import org.apache.logging.log4j.util.LoaderUtil; import org.slf4j.Marker; -import org.slf4j.MarkerFactory; - import org.slf4j.impl.StaticMarkerBinder; import org.slf4j.spi.LocationAwareLogger; -@@ -39,18 +37,13 @@ import org.slf4j.spi.LocationAwareLogger; - public class Log4jLogger implements LocationAwareLogger, Serializable { - + /** +@@ -40,10 +38,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { public static final String FQCN = Log4jLogger.class.getName(); -- + private static final long serialVersionUID = 7869000638091304316L; - private static final Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT"); - private static final EventDataConverter CONVERTER = createConverter(); @@ -99,25 +78,28 @@ - private final boolean eventLogger; private transient ExtendedLogger logger; private final String name; - - public Log4jLogger(final ExtendedLogger logger, final String name) { + private transient Log4jMarkerFactory markerFactory; +@@ -51,7 +46,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + public Log4jLogger(final Log4jMarkerFactory markerFactory, final ExtendedLogger logger, final String name) { + this.markerFactory = markerFactory; this.logger = logger; - this.eventLogger = "EventLogger".equals(name); this.name = name; } -@@ -363,9 +356,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { - return; +@@ -365,10 +359,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { } final Message msg; + final Throwable actualThrowable; - if (CONVERTER != null && eventLogger && marker != null && marker.contains(EVENT_MARKER)) { - msg = CONVERTER.convertEvent(message, params, throwable); +- actualThrowable = throwable != null ? throwable : msg.getThrowable(); - } else if (params == null) { + if (params == null) { msg = new SimpleMessage(message); + actualThrowable = throwable; } else { - msg = new ParameterizedMessage(message, params, throwable); -@@ -410,15 +401,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { +@@ -402,15 +393,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { aOutputStream.defaultWriteObject(); } @@ -134,7 +116,7 @@ switch (i) { case TRACE_INT: diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java -index 0524074..c60f1ad 100644 +index 2239dc0..c09be84 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull; @@ -143,9 +125,9 @@ import java.util.List; -import java.util.Locale; - import org.apache.logging.log4j.junit.LoggerContextRule; - import org.apache.logging.log4j.test.appender.ListAppender; -@@ -34,8 +33,6 @@ import org.slf4j.Logger; + import org.apache.logging.log4j.core.LogEvent; + import org.apache.logging.log4j.core.test.appender.ListAppender; +@@ -35,8 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; import org.slf4j.Marker; @@ -154,7 +136,7 @@ import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; import org.slf4j.spi.LocationAwareLogger; -@@ -145,23 +142,6 @@ public class LoggerTest { +@@ -146,23 +143,6 @@ public class LoggerTest { verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR); } @@ -175,19 +157,19 @@ - verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete" + Strings.LINE_SEPARATOR); - } - - private void verify(final String name, final String expected) { - final ListAppender listApp = ctx.getListAppender(name); - assertNotNull("Missing Appender", listApp); -@@ -177,6 +157,5 @@ public class LoggerTest { - public void cleanup() { + @Test + public void testThrowable() { + final Throwable expected = new RuntimeException(); +@@ -217,6 +197,5 @@ public class LoggerTest { MDC.clear(); ctx.getListAppender("List").clear(); + ctx.getListAppender("UnformattedList").clear(); - ctx.getListAppender("EventLogger").clear(); } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java deleted file mode 100644 -index a6e9fd5..0000000 +index 746eb61..0000000 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java +++ /dev/null @@ -1,69 +0,0 @@ @@ -211,8 +193,8 @@ - -import java.util.List; - --import org.apache.logging.log4j.junit.LoggerContextRule; --import org.apache.logging.log4j.test.appender.ListAppender; +-import org.apache.logging.log4j.core.test.appender.ListAppender; +-import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.apache.logging.log4j.util.Strings; -import org.junit.Before; -import org.junit.ClassRule; @@ -261,7 +243,7 @@ - } -} diff --git a/log4j-slf4j-impl/src/test/resources/log4j-test1.xml b/log4j-slf4j-impl/src/test/resources/log4j-test1.xml -index a64bdfa..07a2be6 100644 +index 1ba09ca..2dee2c1 100644 --- a/log4j-slf4j-impl/src/test/resources/log4j-test1.xml +++ b/log4j-slf4j-impl/src/test/resources/log4j-test1.xml @@ -6,9 +6,6 @@ @@ -274,7 +256,7 @@ <Console name="STDOUT"> <PatternLayout pattern="%C{1.} %m MDC%X%n"/> </Console> -@@ -24,10 +21,6 @@ +@@ -25,10 +22,6 @@ </Appenders> <Loggers>
