From f58f2407707ba822a03fecf0c363b84840d34fe8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 30 Mar 2023 16:03:24 +0200 Subject: [PATCH] Updade to upstream version 2.20.0 --- .gitignore | 1 + 0002-Remove-usage-of-toolchains.patch | 46 ++++++++++ log4j.spec | 91 +++++++++++-------- ...emove-unsupported-EventDataConverter.patch | 55 +++++------ sources | 2 +- 5 files changed, 131 insertions(+), 64 deletions(-) create mode 100644 0002-Remove-usage-of-toolchains.patch diff --git a/.gitignore b/.gitignore index ecabb93..5a03c22 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /apache-log4j-2.17.2-src.tar.gz /apache-log4j-2.17.2-src.tar.gz.asc /log4j-2.17.2.tar.gz +/log4j-2.20.0.tar.gz diff --git a/0002-Remove-usage-of-toolchains.patch b/0002-Remove-usage-of-toolchains.patch new file mode 100644 index 0000000..5d340c2 --- /dev/null +++ b/0002-Remove-usage-of-toolchains.patch @@ -0,0 +1,46 @@ +From 22d40a2e43583647f3337489ac9e286883586bcd Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 @@ + compile + + +- +- [9, ) +- + 9 + + +@@ -98,9 +95,6 @@ + testCompile + + +- +- [9, ) +- + 9 + + ${project.basedir}/src/test/java9 +@@ -128,9 +122,6 @@ + + true + +- +- [9, ) +- + + + +-- +2.40.1 + diff --git a/log4j.spec b/log4j.spec index fc76cb1..34148d6 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,9 +1,9 @@ %bcond_with bootstrap -%bcond_without jp_minimal +%bcond_without jp_minimal Name: log4j -Version: 2.17.2 -Release: 10%{?dist} +Version: 2.20.0 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -14,16 +14,17 @@ URL: https://logging.apache.org/%{name} # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch +Patch1: logging-log4j-Remove-unsupported-EventDataConverter.patch +Patch2: 0002-Remove-usage-of-toolchains.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local BuildRequires: mvn(com.lmax:disruptor) -BuildRequires: mvn(com.sun.activation:jakarta.activation) -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(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -45,7 +46,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(com.lmax:disruptor) -BuildRequires: mvn(com.sun.mail:javax.mail) +BuildRequires: mvn(jakarta.mail:jakarta.mail-api) BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(org.apache.commons:commons-csv) @@ -95,6 +96,12 @@ Summary: Apache Log4j Web %description web Support for Log4j in a web servlet container. +%package bom +Summary: Apache Log4j BOM + +%description bom +Apache Log4j 2 Bill of Material + %if %{without jp_minimal} %package osgi Summary: Apache Log4J Core OSGi Bundles @@ -116,19 +123,11 @@ Requires: java-devel Swing-based client for remotely editing the log4j configuration and remotely monitoring StatusLogger output. Includes a JConsole plug-in. -%package bom -Summary: Apache Log4j BOM - -%description bom -Apache Log4j 2 Bill of Material - - %package nosql Summary: Apache Log4j NoSql %description nosql Use NoSQL databases such as MongoDB and CouchDB to append log messages. - %endif %package javadoc @@ -139,17 +138,20 @@ Summary: API documentation for %{name} %prep %setup -q -n apache-%{name}-%{version}-src -%autopatch -p1 +%patch 1 -p1 +%patch 2 -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 # remove all the stuff we'll build ourselves -find -name "*.jar" -o -name "*.class" -delete +find -name '*.jar' -o -name '*.class' -delete rm -rf docs/api %pom_disable_module %{name}-distribution @@ -161,8 +163,14 @@ rm -rf docs/api # artifact for upstream testing of log4j itself, shouldn't be distributed %pom_disable_module %{name}-perf -# add dependency for javax.activation package (no longer part of OpenJDK) -%pom_add_dep com.sun.activation:jakarta.activation +%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 @@ -172,11 +180,7 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockin rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :kafka-clients -# not compatible with fedora's version -%pom_disable_module %{name}-liquibase - -# we don't have slf4j 1.8 yet -%pom_disable_module %{name}-slf4j18-impl +%pom_remove_dep -r javax.jms:javax.jms-api # we don't have commons-dbcp2 %pom_disable_module %{name}-jdbc-dbcp2 @@ -192,23 +196,25 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # 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 :maven-failsafe-plugin # Remove deps on slf4j-ext, it is no longer available in Fedora 35 %pom_remove_dep -r :slf4j-ext %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' "8" +%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 + %if %{with jp_minimal} %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui -%pom_disable_module %{name}-bom %pom_disable_module %{name}-jakarta-web %pom_disable_module %{name}-iostreams %pom_disable_module %{name}-jul @@ -223,14 +229,11 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-kubernetes %pom_disable_module %{name}-layout-template-json -%pom_remove_dep -r :jackson-annotations %pom_remove_dep -r :jackson-core %pom_remove_dep -r :jackson-databind %pom_remove_dep -r :jackson-dataformat-yaml %pom_remove_dep -r :jackson-dataformat-xml %pom_remove_dep -r :woodstox-core -%pom_remove_dep -r :javax.persistence -%pom_remove_dep -r :jboss-jms-api_1.1_spec %pom_remove_dep -r :jeromq %pom_remove_dep -r :commons-csv @@ -261,6 +264,20 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %mvn_package :log4j-core-its __noinstall +%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 + +%pom_remove_plugin -r org.apache.maven.plugins:maven-failsafe-plugin +%pom_remove_plugin -r org.ops4j.pax.exam:exam-maven-plugin + %build # missing test deps (mockejb) %mvn_build -f @@ -278,9 +295,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %files slf4j -f .mfiles-slf4j %files jcl -f .mfiles-jcl %files web -f .mfiles-web +%files bom -f .mfiles-bom %if %{without jp_minimal} %files taglib -f .mfiles-taglib -%files bom -f .mfiles-bom %files nosql -f .mfiles-nosql %files jmx-gui -f .mfiles-jmx-gui %{_bindir}/%{name}-jmx @@ -289,8 +306,10 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %files javadoc -f .mfiles-javadoc %doc LICENSE.txt NOTICE.txt - %changelog +* Mon Aug 21 2023 Marian Koncek - 2.20.0-1 +- Update to upstream version 2.20.0 + * Thu Jul 20 2023 Fedora Release Engineering - 2.17.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/logging-log4j-Remove-unsupported-EventDataConverter.patch b/logging-log4j-Remove-unsupported-EventDataConverter.patch index 01e5cb7..6dcc056 100644 --- a/logging-log4j-Remove-unsupported-EventDataConverter.patch +++ b/logging-log4j-Remove-unsupported-EventDataConverter.patch @@ -55,7 +55,7 @@ index 620232a..0000000 - } -} 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; @@ -65,14 +65,12 @@ index 1fa8080..90cfe4e 100644 -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(); @@ -80,25 +78,28 @@ index 1fa8080..90cfe4e 100644 - 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(); } @@ -115,7 +116,7 @@ index 1fa8080..90cfe4e 100644 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; @@ -124,9 +125,9 @@ index 0524074..c60f1ad 100644 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; @@ -135,7 +136,7 @@ index 0524074..c60f1ad 100644 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); } @@ -156,19 +157,19 @@ index 0524074..c60f1ad 100644 - 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 @@ @@ -192,8 +193,8 @@ index a6e9fd5..0000000 - -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; @@ -242,7 +243,7 @@ index a6e9fd5..0000000 - } -} 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 @@ @@ -255,7 +256,7 @@ index a64bdfa..07a2be6 100644 -@@ -24,10 +21,6 @@ +@@ -25,10 +22,6 @@ diff --git a/sources b/sources index a2a4e6a..d1dfca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (log4j-2.17.2.tar.gz) = fd76960224f3441cdbe43a4326bbcf2007d4680e1a29438c00a056376c140d827ed4923df2c97fee4fb567687b93e79f7745403d32dd071c91cd347112f2f303 +SHA512 (log4j-2.20.0.tar.gz) = b99f0a2f7ca3f808223fd2e3463cce2a668ed5979e7bf935470b889e9141e0da0747f50ae936f43b9292434ed56569793a340ed42b358cacc5736084e2464d46