From deaa1e78449e57b8476c95f99657253e08239f0d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 23 Aug 2016 17:56:43 +0200 Subject: [PATCH 01/84] Update to upstream version 2.6.1 --- .gitignore | 1 + log4j.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3cf486f..25c0ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.2-src.tar.gz /apache-log4j-2.3-src.tar.gz /apache-log4j-2.5-src.tar.gz +/apache-log4j-2.6.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 413fdf1..c2b6dbb 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,6 +1,6 @@ Name: log4j -Version: 2.5 -Release: 4%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -12,6 +12,7 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) 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(commons-logging:commons-logging) BuildRequires: mvn(com.sun.mail:javax.mail) @@ -23,7 +24,6 @@ BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) BuildRequires: mvn(org.eclipse:osgi) BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi) BuildRequires: mvn(org.eclipse.persistence:org.eclipse.persistence.jpa) @@ -218,6 +218,9 @@ fi %changelog +* Thu Jun 23 2016 Michael Simacek - 2.6.1-1 +- Update to upstream version 2.6.1 + * Thu Jun 16 2016 Mikolaj Izdebski - 2.5-4 - Remove RAT depenency from BOM package diff --git a/sources b/sources index 21d4f71..a195edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -105869a03b459007a7591d9e4373285d apache-log4j-2.5-src.tar.gz +a76ded23a44054f0496a099c6bff432a apache-log4j-2.6.1-src.tar.gz From 480912f88a67685f2dcbfa91af72c5d72041ae34 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 11 Nov 2016 17:39:09 +0100 Subject: [PATCH 02/84] Update to upstream version 2.7 - Remove stuff marked as "Remove in F24" --- .gitignore | 1 + log4j.spec | 35 +++++++++++++++-------------------- sources | 2 +- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 25c0ec8..3dda110 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.3-src.tar.gz /apache-log4j-2.5-src.tar.gz /apache-log4j-2.6.1-src.tar.gz +/apache-log4j-2.7-src.tar.gz diff --git a/log4j.spec b/log4j.spec index c2b6dbb..e958f26 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,5 +1,5 @@ Name: log4j -Version: 2.6.1 +Version: 2.7 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch @@ -8,6 +8,7 @@ URL: http://logging.apache.org/%{name} Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz BuildRequires: maven-local +BuildRequires: mvn(com.beust:jcommander) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml) @@ -30,6 +31,7 @@ BuildRequires: mvn(org.eclipse.persistence:org.eclipse.persistence.jpa) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) +BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.lightcouch:lightcouch) BuildRequires: mvn(org.liquibase:liquibase-core) BuildRequires: mvn(org.mongodb:mongo-java-driver) @@ -127,6 +129,14 @@ rm -rf docs/api # jmh not available %pom_disable_module %{name}-perf +# unavailable com.conversantmedia:disruptor +rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java +%pom_remove_dep com.conversantmedia:disruptor %{name}-core + +# unavailable net.alchim31.maven:scala-maven-plugin +%pom_disable_module log4j-api-scala_2.10 +%pom_disable_module log4j-api-scala_2.11 + # kafka not available rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :kafka-clients @@ -180,25 +190,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %jpackage_script org.apache.logging.log4j.jmx.gui.ClientGUI '' '' %{name}/%{name}-jmx-gui:%{name}/%{name}-core %{name}-jmx false -# TODO: Remove this in F-24 -%preun -if [ $1 -eq 0 ]; then - if [ -x xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then - xmlcatalog --noout --del \ - file://%{_datadir}/sgml/%{name}/log4j.dtd \ - %{_sysconfdir}/xml/catalog > /dev/null || : - fi -fi - -# TODO: Remove this in F-24 -%postun -# Note that we're using versioned catalog, so this is always ok. -if [ -x install-catalog -a -d %{_sysconfdir}/sgml ]; then - install-catalog --remove \ - %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \ - %{_datadir}/sgml/%{name}/catalog > /dev/null || : -fi - %files -f .mfiles %dir %{_javadir}/%{name} %doc LICENSE.txt NOTICE.txt @@ -218,6 +209,10 @@ fi %changelog +* Wed Nov 09 2016 Michael Simacek - 2.7-1 +- Update to upstream version 2.7 +- Remove stuff marked as "Remove in F24" + * Thu Jun 23 2016 Michael Simacek - 2.6.1-1 - Update to upstream version 2.6.1 diff --git a/sources b/sources index a195edf..3abdbca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a76ded23a44054f0496a099c6bff432a apache-log4j-2.6.1-src.tar.gz +b2c10f0e1e5df9cfc90fe606ea652fe3 apache-log4j-2.7-src.tar.gz From 67e622afe01cff0ea3ace7c554f60c2e78f5dd98 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 16:12:03 +0100 Subject: [PATCH 03/84] Cleanup osgi parts - Add conditional for nosql --- log4j.spec | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/log4j.spec b/log4j.spec index e958f26..b160466 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,6 +1,8 @@ +%bcond_without nosql + Name: log4j Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -25,17 +27,16 @@ BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.eclipse:osgi) -BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi) -BuildRequires: mvn(org.eclipse.persistence:org.eclipse.persistence.jpa) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) BuildRequires: mvn(org.jctools:jctools-core) +%if %{with nosql} BuildRequires: mvn(org.lightcouch:lightcouch) BuildRequires: mvn(org.liquibase:liquibase-core) BuildRequires: mvn(org.mongodb:mongo-java-driver) -BuildRequires: mvn(org.osgi:org.osgi.core) +%endif +BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-ext) BuildRequires: mvn(org.zeromq:jeromq) @@ -91,6 +92,8 @@ Summary: Apache Log4j BOM %description bom Apache Log4j 2 Bill of Material + +%if %{with nosql} %package nosql Summary: Apache Log4j NoSql @@ -103,6 +106,8 @@ Summary: Apache Log4j Liquibase Binding %description liquibase The Apache Log4j Liquibase binding to Log4j 2 Core. +%endif + %package javadoc Summary: API documentation for %{name} Obsoletes: %{name}-manual < %{version} @@ -126,7 +131,7 @@ rm -rf docs/api # Apache Flume is not in Fedora yet %pom_disable_module %{name}-flume-ng -# jmh not available +# artifact for upstream testing of log4j itself, shouldn't be distributed %pom_disable_module %{name}-perf # unavailable com.conversantmedia:disruptor @@ -145,13 +150,8 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep :jconsole %{name}-jmx-gui %pom_add_dep sun.jdk:jconsole %{name}-jmx-gui -# Different AID, provided by equinox -%pom_remove_dep : %{name}-api -%pom_add_dep org.eclipse:osgi:any:provided %{name}-api - -# Classpath hell, equinox must come before felix -%pom_remove_dep org.eclipse.osgi:org.eclipse.osgi %{name}-core -%pom_add_dep org.eclipse.osgi:org.eclipse.osgi:any:provided %{name}-core +# old AID is provided by felix, we want osgi-core +%pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core # Old version of specification %pom_remove_dep :javax.persistence %{name}-core @@ -160,9 +160,10 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # BOM package shouldn't require Apache RAT %pom_remove_plugin :apache-rat-plugin %{name}-bom -# Required at compile-time not just test, but we don't want requires -%pom_xpath_set "pom:dependency[pom:groupId='org.eclipse.persistence']/pom:scope" provided %{name}-core -%pom_xpath_set "pom:dependency[pom:groupId='org.eclipse.osgi']/pom:scope" provided %{name}-core +%if %{without nosql} +%pom_disable_module %{name}-nosql +%pom_disable_module %{name}-liquibase +%endif %mvn_alias :%{name}-1.2-api %{name}:%{name} @@ -199,8 +200,10 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %files jcl -f .mfiles-jcl %files web -f .mfiles-web %files bom -f .mfiles-bom +%if %{with nosql} %files nosql -f .mfiles-nosql %files liquibase -f .mfiles-liquibase +%endif %files jmx-gui -f .mfiles-jmx-gui %{_bindir}/%{name}-jmx @@ -209,6 +212,10 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %changelog +* Wed Feb 01 2017 Michael Simacek - 2.7-2 +- Cleanup osgi parts +- Add conditional for nosql + * Wed Nov 09 2016 Michael Simacek - 2.7-1 - Update to upstream version 2.7 - Remove stuff marked as "Remove in F24" From 7420fa2982131213852db63d7386f1d98d08e2e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:56:28 +0000 Subject: [PATCH 04/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index b160466..fd62f9d 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -212,6 +212,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 01 2017 Michael Simacek - 2.7-2 - Cleanup osgi parts - Add conditional for nosql From ff4dec6cfdb52a9abf7f5bb7de67e69bc96df5a3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 15 Mar 2017 18:32:49 +0100 Subject: [PATCH 05/84] Add jp_minimal conditional --- log4j.spec | 78 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/log4j.spec b/log4j.spec index fd62f9d..cd6fc2f 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ -%bcond_without nosql +%bcond_with jp_minimal Name: log4j Version: 2.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -13,34 +13,33 @@ BuildRequires: maven-local BuildRequires: mvn(com.beust:jcommander) 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(org.apache:apache:pom:) +BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.fusesource.jansi:jansi) +BuildRequires: mvn(org.jctools:jctools-core) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-ext) + +%if %{without jp_minimal} 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(commons-logging:commons-logging) -BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(javax.servlet:servlet-api) -BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-csv) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) -BuildRequires: mvn(org.jctools:jctools-core) -%if %{with nosql} BuildRequires: mvn(org.lightcouch:lightcouch) BuildRequires: mvn(org.liquibase:liquibase-core) BuildRequires: mvn(org.mongodb:mongo-java-driver) -%endif BuildRequires: mvn(org.osgi:osgi.core) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-ext) BuildRequires: mvn(org.zeromq:jeromq) BuildRequires: mvn(sun.jdk:jconsole) +%endif Obsoletes: %{name}-osgi < %{version}-%{release} @@ -48,18 +47,19 @@ Obsoletes: %{name}-osgi < %{version}-%{release} Log4j is a tool to help the programmer output log statements to a variety of output targets. -%package osgi -Summary: Apache Log4J Core OSGi Bundles - -%description osgi -Apache Log4J Core OSGi Bundles. - %package slf4j Summary: Binding between LOG4J 2 API and SLF4J %description slf4j Binding between LOG4J 2 API and SLF4J. +%if %{without jp_minimal} +%package osgi +Summary: Apache Log4J Core OSGi Bundles + +%description osgi +Apache Log4J Core OSGi Bundles. + %package taglib Summary: Apache Log4j Tag Library @@ -93,7 +93,6 @@ Summary: Apache Log4j BOM Apache Log4j 2 Bill of Material -%if %{with nosql} %package nosql Summary: Apache Log4j NoSql @@ -160,9 +159,33 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # BOM package shouldn't require Apache RAT %pom_remove_plugin :apache-rat-plugin %{name}-bom -%if %{without nosql} +# tests are disabled +%pom_remove_plugin :maven-failsafe-plugin + +%if %{with jp_minimal} +%pom_disable_module %{name}-jcl +%pom_disable_module %{name}-taglib +%pom_disable_module %{name}-jmx-gui +%pom_disable_module %{name}-bom %pom_disable_module %{name}-nosql +%pom_disable_module %{name}-web +%pom_disable_module %{name}-iostreams +%pom_disable_module %{name}-jul %pom_disable_module %{name}-liquibase + +%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 +%pom_remove_dep -r :hibernate-jpa-2.1-api + +rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,net/server,net/mom,config/yaml} +rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/{db,mom} +rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java +rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %endif %mvn_alias :%{name}-1.2-api %{name}:%{name} @@ -189,29 +212,34 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %install %mvn_install +%if %{without jp_minimal} %jpackage_script org.apache.logging.log4j.jmx.gui.ClientGUI '' '' %{name}/%{name}-jmx-gui:%{name}/%{name}-core %{name}-jmx false +%endif %files -f .mfiles %dir %{_javadir}/%{name} %doc LICENSE.txt NOTICE.txt %files slf4j -f .mfiles-slf4j +%if %{without jp_minimal} %files taglib -f .mfiles-taglib %files jcl -f .mfiles-jcl %files web -f .mfiles-web %files bom -f .mfiles-bom -%if %{with nosql} %files nosql -f .mfiles-nosql %files liquibase -f .mfiles-liquibase -%endif %files jmx-gui -f .mfiles-jmx-gui %{_bindir}/%{name}-jmx +%endif %files javadoc -f .mfiles-javadoc %doc LICENSE.txt NOTICE.txt %changelog +* Wed Mar 15 2017 Michael Simacek - 2.7-4 +- Add jp_minimal conditional + * Fri Feb 10 2017 Fedora Release Engineering - 2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 12048a2c3564fbe06c73bc4bc1210f0a5000a0e5 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 29 Mar 2017 13:29:48 +0200 Subject: [PATCH 06/84] Update to upstream version 2.8.1 --- .gitignore | 1 + log4j.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3dda110..f495b5f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.5-src.tar.gz /apache-log4j-2.6.1-src.tar.gz /apache-log4j-2.7-src.tar.gz +/apache-log4j-2.8.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index cd6fc2f..3912b04 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_with jp_minimal Name: log4j -Version: 2.7 -Release: 4%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -18,12 +18,14 @@ BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(org.apache:apache:pom:) 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.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-ext) %if %{without jp_minimal} +BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) 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) @@ -119,6 +121,7 @@ Obsoletes: %{name}-manual < %{version} %pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-remote-resources-plugin +%pom_remove_plugin -r :maven-doap-plugin # remove all the stuff we'll build ourselves find -name "*.jar" -o -name "*.class" -delete @@ -237,6 +240,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Wed Mar 29 2017 Michael Simacek - 2.8.1-1 +- Update to upstream version 2.8.1 + * Wed Mar 15 2017 Michael Simacek - 2.7-4 - Add jp_minimal conditional diff --git a/sources b/sources index 3abdbca..779e1e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2c10f0e1e5df9cfc90fe606ea652fe3 apache-log4j-2.7-src.tar.gz +SHA512 (apache-log4j-2.8.1-src.tar.gz) = 28114a6632fd81f5928c09265e3efbd9e33ade05c28161be1a8051bc2790c68d155f3f84269fa448a1bcbe43e9cf5f315e1e84222a6a50c81c6767caba87372b From ad66e936be0d25bf64f260e251c6302961eb5c65 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 6 Apr 2017 14:46:23 +0200 Subject: [PATCH 07/84] Update to upstream version 2.8.2 --- .gitignore | 1 + log4j.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f495b5f..69af49d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.6.1-src.tar.gz /apache-log4j-2.7-src.tar.gz /apache-log4j-2.8.1-src.tar.gz +/apache-log4j-2.8.2-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 3912b04..a307ba9 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,7 +1,7 @@ %bcond_with jp_minimal Name: log4j -Version: 2.8.1 +Version: 2.8.2 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch @@ -138,7 +138,7 @@ rm -rf docs/api # unavailable com.conversantmedia:disruptor rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java -%pom_remove_dep com.conversantmedia:disruptor %{name}-core +%pom_remove_dep -r com.conversantmedia:disruptor # unavailable net.alchim31.maven:scala-maven-plugin %pom_disable_module log4j-api-scala_2.10 @@ -175,6 +175,7 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-iostreams %pom_disable_module %{name}-jul %pom_disable_module %{name}-liquibase +%pom_disable_module %{name}-core-its %pom_remove_dep -r :jackson-dataformat-yaml %pom_remove_dep -r :jackson-dataformat-xml @@ -208,6 +209,8 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %mvn_package ':%{name}-nosql' nosql %mvn_package ':%{name}-liquibase' liquibase +%mvn_package :log4j-core-its __noinstall + %build # missing test deps (mockejb) %mvn_build -f @@ -240,6 +243,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Thu Apr 06 2017 Michael Simacek - 2.8.2-1 +- Update to upstream version 2.8.2 + * Wed Mar 29 2017 Michael Simacek - 2.8.1-1 - Update to upstream version 2.8.1 diff --git a/sources b/sources index 779e1e8..238ac71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.8.1-src.tar.gz) = 28114a6632fd81f5928c09265e3efbd9e33ade05c28161be1a8051bc2790c68d155f3f84269fa448a1bcbe43e9cf5f315e1e84222a6a50c81c6767caba87372b +SHA512 (apache-log4j-2.8.2-src.tar.gz) = 5cd49d4d65ac7c62914a253e5221297b236d2e15b70978a95d6a7a239076aa7c262d259d441375b047549bc8e07531f9d62bb9ee1d5fac770cb04c1feb6586b3 From c48373bade31d34ef2faacd35b1ca267649db1dc Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 21 Apr 2017 16:46:43 +0200 Subject: [PATCH 08/84] Backport fix for CVE-2017-5645 --- 0001-Backport-fix-for-CVE-2017-5645.patch | 134 ++++++++++++++++++++++ log4j.spec | 9 +- 2 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 0001-Backport-fix-for-CVE-2017-5645.patch diff --git a/0001-Backport-fix-for-CVE-2017-5645.patch b/0001-Backport-fix-for-CVE-2017-5645.patch new file mode 100644 index 0000000..2419652 --- /dev/null +++ b/0001-Backport-fix-for-CVE-2017-5645.patch @@ -0,0 +1,134 @@ +From 3418715bde9a2944a40773f418976ecca1c8f05f Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 21 Apr 2017 16:45:43 +0200 +Subject: [PATCH] Backport fix for CVE-2017-5645 + +--- + .../server/ObjectInputStreamLogEventBridge.java | 21 ++++++- + .../log4j/core/util/FilteredObjectInputStream.java | 67 ++++++++++++++++++++++ + 2 files changed, 87 insertions(+), 1 deletion(-) + create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/FilteredObjectInputStream.java + +diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java +index 059f069..25a690d 100644 +--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java ++++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java +@@ -19,15 +19,34 @@ package org.apache.logging.log4j.core.net.server; + import java.io.IOException; + import java.io.InputStream; + import java.io.ObjectInputStream; ++import java.util.Collections; ++import java.util.List; + + import org.apache.logging.log4j.core.LogEvent; + import org.apache.logging.log4j.core.LogEventListener; ++import org.apache.logging.log4j.core.util.FilteredObjectInputStream; + + /** + * Reads and logs serialized {@link LogEvent} objects from an {@link ObjectInputStream}. + */ + public class ObjectInputStreamLogEventBridge extends AbstractLogEventBridge { + ++ private final List allowedClasses; ++ ++ public ObjectInputStreamLogEventBridge() { ++ this(Collections.emptyList()); ++ } ++ ++ /** ++ * Constructs an ObjectInputStreamLogEventBridge with additional allowed classes to deserialize. ++ * ++ * @param allowedClasses class names to also allow for deserialization ++ * @since 2.8.2 ++ */ ++ public ObjectInputStreamLogEventBridge(final List allowedClasses) { ++ this.allowedClasses = allowedClasses; ++ } ++ + @Override + public void logEvents(final ObjectInputStream inputStream, final LogEventListener logEventListener) + throws IOException { +@@ -40,6 +59,6 @@ public class ObjectInputStreamLogEventBridge extends AbstractLogEventBridge REQUIRED_JAVA_CLASSES = Arrays.asList( ++ // for StandardLevel ++ "java.lang.Enum", ++ // for location information ++ "java.lang.StackTraceElement", ++ // for Message delegate ++ "java.rmi.MarshalledObject", ++ "[B" ++ ); ++ ++ private final Collection allowedClasses; ++ ++ public FilteredObjectInputStream(final InputStream in, final Collection allowedClasses) throws IOException { ++ super(in); ++ this.allowedClasses = allowedClasses; ++ } ++ ++ @Override ++ protected Class resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException { ++ String name = desc.getName(); ++ if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) { ++ throw new InvalidObjectException("Class is not allowed for deserialization: " + name); ++ } ++ return super.resolveClass(desc); ++ } ++ ++ private static boolean isAllowedByDefault(final String name) { ++ return name.startsWith("org.apache.logging.log4j.") || ++ name.startsWith("[Lorg.apache.logging.log4j.") || ++ REQUIRED_JAVA_CLASSES.contains(name); ++ } ++ ++} +-- +2.9.3 + diff --git a/log4j.spec b/log4j.spec index 413fdf1..6d98f7e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,12 +1,14 @@ Name: log4j Version: 2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 URL: http://logging.apache.org/%{name} Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz +Patch0: 0001-Backport-fix-for-CVE-2017-5645.patch + BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) @@ -111,6 +113,8 @@ Obsoletes: %{name}-manual < %{version} %prep %setup -q -n apache-%{name}-%{version}-src +%patch0 -p1 + %pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-remote-resources-plugin @@ -218,6 +222,9 @@ fi %changelog +* Fri Apr 21 2017 Michael Simacek - 2.5-5 +- Backport fix for CVE-2017-5645 + * Thu Jun 16 2016 Mikolaj Izdebski - 2.5-4 - Remove RAT depenency from BOM package From 403e4441b687c0da87bf7e61cb52be0deeb69627 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 20:16:15 +0000 Subject: [PATCH 09/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index a307ba9..f314a54 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -243,6 +243,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Apr 06 2017 Michael Simacek - 2.8.2-1 - Update to upstream version 2.8.2 From d87d7f2c69f12f3b83668b691cad88258b2c861b Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 18 Sep 2017 11:01:33 +0300 Subject: [PATCH 10/84] Update to upstream version 2.9.0 --- .gitignore | 1 + log4j.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 69af49d..e3a7b73 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.7-src.tar.gz /apache-log4j-2.8.1-src.tar.gz /apache-log4j-2.8.2-src.tar.gz +/apache-log4j-2.9.0-src.tar.gz diff --git a/log4j.spec b/log4j.spec index f314a54..2db581a 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_with jp_minimal Name: log4j -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -19,6 +19,7 @@ BuildRequires: mvn(org.apache:apache:pom:) 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.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.slf4j:slf4j-api) @@ -122,6 +123,7 @@ Obsoletes: %{name}-manual < %{version} %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 # remove all the stuff we'll build ourselves find -name "*.jar" -o -name "*.class" -delete @@ -136,14 +138,15 @@ rm -rf docs/api # artifact for upstream testing of log4j itself, shouldn't be distributed %pom_disable_module %{name}-perf +# needs java 9 to build +%pom_disable_module %{name}-api-java9 +%pom_remove_dep -r :%{name}-api-java9 +%pom_remove_plugin :maven-dependency-plugin log4j-api + # 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 -# unavailable net.alchim31.maven:scala-maven-plugin -%pom_disable_module log4j-api-scala_2.10 -%pom_disable_module log4j-api-scala_2.11 - # kafka not available rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :kafka-clients @@ -186,7 +189,7 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :commons-csv %pom_remove_dep -r :hibernate-jpa-2.1-api -rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,net/server,net/mom,config/yaml} +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} rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java @@ -243,6 +246,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Mon Sep 18 2017 Michael Simacek - 2.9.0-1 +- Update to upstream version 2.9.0 + * Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 238ac71..973beb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.8.2-src.tar.gz) = 5cd49d4d65ac7c62914a253e5221297b236d2e15b70978a95d6a7a239076aa7c262d259d441375b047549bc8e07531f9d62bb9ee1d5fac770cb04c1feb6586b3 +SHA512 (apache-log4j-2.9.0-src.tar.gz) = 4e42cff6103310191975776cfcf3365fb2bcf99cebe123b7fd80c82630c3943c343507dfbff7fb0076833640bdcc6a524c6d57be11eff634a9b63c6156a4ef32 From 53e4975dee1e1866d1f91b8d11d8e506f3660f45 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 13 Oct 2017 11:32:37 +0300 Subject: [PATCH 11/84] Update to upstream version 2.9.1 --- .gitignore | 1 + log4j.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e3a7b73..ca763c5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.8.1-src.tar.gz /apache-log4j-2.8.2-src.tar.gz /apache-log4j-2.9.0-src.tar.gz +/apache-log4j-2.9.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 2db581a..c51eb73 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_with jp_minimal Name: log4j -Version: 2.9.0 -Release: 1%{?dist} +Version: 2.9.1 +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -246,6 +246,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Fri Oct 13 2017 Michael Simacek - 2.9.1-2 +- Update to upstream version 2.9.1 + * Mon Sep 18 2017 Michael Simacek - 2.9.0-1 - Update to upstream version 2.9.0 diff --git a/sources b/sources index 973beb2..662940d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.9.0-src.tar.gz) = 4e42cff6103310191975776cfcf3365fb2bcf99cebe123b7fd80c82630c3943c343507dfbff7fb0076833640bdcc6a524c6d57be11eff634a9b63c6156a4ef32 +SHA512 (apache-log4j-2.9.1-src.tar.gz) = 2a1d6c11601b4f96967db16e5f84896b843a6a38b1b2520622ea793a22e2e375d64751d71f0c0f68ae99a9ee2448d1aea25bf57908f18a44a987334f7a0e0b8b From 2db0991e134d3cd5d94acaeb126df0ca4da572f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 00:05:38 +0000 Subject: [PATCH 12/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index c51eb73..0e26d3f 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -246,6 +246,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Oct 13 2017 Michael Simacek - 2.9.1-2 - Update to upstream version 2.9.1 From 9e10ec871bbdec4a7efb156e6ca5396e1cd4dbe4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 28 May 2018 11:06:09 +0200 Subject: [PATCH 13/84] Disable liquibase to fix FTBFS --- log4j.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/log4j.spec b/log4j.spec index 0e26d3f..1d711ac 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -37,14 +37,14 @@ BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) BuildRequires: mvn(org.lightcouch:lightcouch) -BuildRequires: mvn(org.liquibase:liquibase-core) BuildRequires: mvn(org.mongodb:mongo-java-driver) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.zeromq:jeromq) BuildRequires: mvn(sun.jdk:jconsole) %endif -Obsoletes: %{name}-osgi < %{version}-%{release} +Obsoletes: %{name}-osgi < 2.9.1-4 +Obsoletes: %{name}-liquibase < 2.9.1-4 %description Log4j is a tool to help the programmer output log statements to a @@ -102,12 +102,6 @@ Summary: Apache Log4j NoSql %description nosql Use NoSQL databases such as MongoDB and CouchDB to append log messages. -%package liquibase -Summary: Apache Log4j Liquibase Binding - -%description liquibase -The Apache Log4j Liquibase binding to Log4j 2 Core. - %endif %package javadoc @@ -151,6 +145,9 @@ 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 + # System scoped dep provided by JDK %pom_remove_dep :jconsole %{name}-jmx-gui %pom_add_dep sun.jdk:jconsole %{name}-jmx-gui @@ -177,7 +174,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-web %pom_disable_module %{name}-iostreams %pom_disable_module %{name}-jul -%pom_disable_module %{name}-liquibase %pom_disable_module %{name}-core-its %pom_remove_dep -r :jackson-dataformat-yaml @@ -210,7 +206,6 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %mvn_package ':%{name}-web' web %mvn_package ':%{name}-bom' bom %mvn_package ':%{name}-nosql' nosql -%mvn_package ':%{name}-liquibase' liquibase %mvn_package :log4j-core-its __noinstall @@ -236,7 +231,6 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %files web -f .mfiles-web %files bom -f .mfiles-bom %files nosql -f .mfiles-nosql -%files liquibase -f .mfiles-liquibase %files jmx-gui -f .mfiles-jmx-gui %{_bindir}/%{name}-jmx %endif @@ -246,6 +240,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Mon May 28 2018 Michael Simacek - 2.9.1-4 +- Disable liquibase to fix FTBFS + * Thu Feb 08 2018 Fedora Release Engineering - 2.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 16b34d7d52ff7b817a8c669e4baadebd87478b2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:18:27 +0000 Subject: [PATCH 14/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 1d711ac..b8df77e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -240,6 +240,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon May 28 2018 Michael Simacek - 2.9.1-4 - Disable liquibase to fix FTBFS From 8a3d40715ccbdc8eae354c728a3e54ba353d5203 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 7 Aug 2018 16:34:37 +0200 Subject: [PATCH 15/84] Update to upstream version 2.11.1 --- .gitignore | 1 + log4j.spec | 59 +++++++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index ca763c5..f1a8d4c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.8.2-src.tar.gz /apache-log4j-2.9.0-src.tar.gz /apache-log4j-2.9.1-src.tar.gz +/apache-log4j-2.11.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index b8df77e..530e6d3 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_with jp_minimal Name: log4j -Version: 2.9.1 -Release: 5%{?dist} +Version: 2.11.1 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -10,35 +10,47 @@ URL: http://logging.apache.org/%{name} Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz BuildRequires: maven-local -BuildRequires: mvn(com.beust:jcommander) 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(org.apache:apache:pom:) 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.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) +BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-ext) %if %{without jp_minimal} BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) 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(commons-logging:commons-logging) +BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) -BuildRequires: mvn(javax.servlet:servlet-api) +BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-csv) -BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.logging:logging-parent:pom:) +BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-util) +BuildRequires: mvn(org.eclipse.persistence:javax.persistence) +BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) +BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.lightcouch:lightcouch) -BuildRequires: mvn(org.mongodb:mongo-java-driver) BuildRequires: mvn(org.osgi:osgi.core) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-ext) BuildRequires: mvn(org.zeromq:jeromq) BuildRequires: mvn(sun.jdk:jconsole) %endif @@ -118,6 +130,7 @@ Obsoletes: %{name}-manual < %{version} %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 # remove all the stuff we'll build ourselves find -name "*.jar" -o -name "*.class" -delete @@ -134,8 +147,10 @@ rm -rf docs/api # needs java 9 to build %pom_disable_module %{name}-api-java9 +%pom_disable_module %{name}-core-java9 %pom_remove_dep -r :%{name}-api-java9 -%pom_remove_plugin :maven-dependency-plugin log4j-api +%pom_remove_dep -r :%{name}-core-java9 +%pom_remove_plugin -r :maven-dependency-plugin # unavailable com.conversantmedia:disruptor rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java @@ -148,6 +163,16 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # 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 + +# we don't have commons-dbcp2 +%pom_disable_module %{name}-jdbc-dbcp2 + +# We have mongodb 4 +%pom_disable_module %{name}-mongodb2 +%pom_disable_module %{name}-mongodb3 + # System scoped dep provided by JDK %pom_remove_dep :jconsole %{name}-jmx-gui %pom_add_dep sun.jdk:jconsole %{name}-jmx-gui @@ -155,10 +180,6 @@ 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 -# Old version of specification -%pom_remove_dep :javax.persistence %{name}-core -%pom_add_dep org.hibernate.javax.persistence:hibernate-jpa-2.1-api:any:provided %{name}-core - # BOM package shouldn't require Apache RAT %pom_remove_plugin :apache-rat-plugin %{name}-bom @@ -170,11 +191,14 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui %pom_disable_module %{name}-bom -%pom_disable_module %{name}-nosql %pom_disable_module %{name}-web %pom_disable_module %{name}-iostreams %pom_disable_module %{name}-jul %pom_disable_module %{name}-core-its +%pom_disable_module %{name}-jpa +%pom_disable_module %{name}-couchdb +%pom_disable_module %{name}-cassandra +%pom_disable_module %{name}-appserver %pom_remove_dep -r :jackson-dataformat-yaml %pom_remove_dep -r :jackson-dataformat-xml @@ -183,10 +207,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :jboss-jms-api_1.1_spec %pom_remove_dep -r :jeromq %pom_remove_dep -r :commons-csv -%pom_remove_dep -r :hibernate-jpa-2.1-api 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} +rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/{db,mom,nosql} rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %endif @@ -205,7 +228,8 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %mvn_package ':%{name}-jmx-gui' jmx-gui %mvn_package ':%{name}-web' web %mvn_package ':%{name}-bom' bom -%mvn_package ':%{name}-nosql' nosql +%mvn_package ':%{name}-cassandra' nosql +%mvn_package ':%{name}-couchdb' nosql %mvn_package :log4j-core-its __noinstall @@ -240,6 +264,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Tue Aug 07 2018 Michael Simacek - 2.11.1-1 +- Update to upstream version 2.11.1 + * Fri Jul 13 2018 Fedora Release Engineering - 2.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 662940d..25dfd29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.9.1-src.tar.gz) = 2a1d6c11601b4f96967db16e5f84896b843a6a38b1b2520622ea793a22e2e375d64751d71f0c0f68ae99a9ee2448d1aea25bf57908f18a44a987334f7a0e0b8b +SHA512 (apache-log4j-2.11.1-src.tar.gz) = 2bd08c8170e36f427a2b39af443c729d933858b68b9bd766fd0a2ec5fcc65cd95d5e0b1f14ae1889120c35fead4ac93cf392b5277cac29ba1230e5c95adef068 From c6eb506cbc16d7349325c50e8b346db7f3720a27 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Fri, 31 Aug 2018 12:02:40 +0200 Subject: [PATCH 16/84] Add explicit requirement on javapackages-tools --- log4j.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 530e6d3..17b344b 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -53,6 +53,9 @@ BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-ext) BuildRequires: mvn(org.zeromq:jeromq) BuildRequires: mvn(sun.jdk:jconsole) +# Explicit requires for javapackages-tools since log4j-jmx script +# uses /usr/share/java-utils/java-functions +Requires: javapackages-tools %endif Obsoletes: %{name}-osgi < 2.9.1-4 @@ -264,6 +267,10 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Fri Aug 31 2018 Severin Gehwolf - 2.11.1-2 +- Add explicit requirement on javapackages-tools for log4j-jmx + script. See RHBZ#1600426. + * Tue Aug 07 2018 Michael Simacek - 2.11.1-1 - Update to upstream version 2.11.1 From 220d74a0e3a1dbbd86b36d3369f57afeba013108 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:55:58 +0000 Subject: [PATCH 17/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 17b344b..ccfa1b0 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -267,6 +267,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Aug 31 2018 Severin Gehwolf - 2.11.1-2 - Add explicit requirement on javapackages-tools for log4j-jmx script. See RHBZ#1600426. From 66285b0f746731f045bada7aace9e7a5825457db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 11 Jun 2019 11:00:08 +0200 Subject: [PATCH 18/84] Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui --- log4j.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/log4j.spec b/log4j.spec index ccfa1b0..9f1defe 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ -%bcond_with jp_minimal +%bcond_without jp_minimal Name: log4j Version: 2.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -71,6 +71,12 @@ Summary: Binding between LOG4J 2 API and SLF4J %description slf4j Binding between LOG4J 2 API and SLF4J. +%package jcl +Summary: Apache Log4j Commons Logging Bridge + +%description jcl +Apache Log4j Commons Logging Bridge. + %if %{without jp_minimal} %package osgi Summary: Apache Log4J Core OSGi Bundles @@ -84,12 +90,6 @@ Summary: Apache Log4j Tag Library %description taglib Apache Log4j Tag Library for Web Applications. -%package jcl -Summary: Apache Log4j Commons Logging Bridge - -%description jcl -Apache Log4j Commons Logging Bridge. - %package jmx-gui Summary: Apache Log4j JMX GUI Requires: java-devel @@ -190,7 +190,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_plugin :maven-failsafe-plugin %if %{with jp_minimal} -%pom_disable_module %{name}-jcl %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui %pom_disable_module %{name}-bom @@ -252,9 +251,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %doc LICENSE.txt NOTICE.txt %files slf4j -f .mfiles-slf4j +%files jcl -f .mfiles-jcl %if %{without jp_minimal} %files taglib -f .mfiles-taglib -%files jcl -f .mfiles-jcl %files web -f .mfiles-web %files bom -f .mfiles-bom %files nosql -f .mfiles-nosql @@ -267,6 +266,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Tue Jun 11 2019 Miro Hrončok - 2.11.1-4 +- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui + * Fri Feb 01 2019 Fedora Release Engineering - 2.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a6d298ef4b628eff67c5817ff282a91f7bfb46ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:07:32 +0000 Subject: [PATCH 19/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 9f1defe..8ceadba 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -266,6 +266,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 11 2019 Miro Hrončok - 2.11.1-4 - Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui From 3f6b65cc8e196d75d25c108716d986995e6b2a65 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 20 Oct 2019 16:24:35 +0200 Subject: [PATCH 20/84] update to version 2.12.1 --- .gitignore | 6 +++++- log4j.spec | 22 +++++++++++++++------- sources | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f1a8d4c..70ccda3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ -apache-log4j-1.2.16.tar.gz +/results_* +/*.src.rpm + +/apache-log4j-1.2.16.tar.gz /log4j-1.2.17.tar.gz /apache-log4j-2.0-rc1-src.tar.gz /apache-log4j-2.0-src.tar.gz @@ -12,3 +15,4 @@ apache-log4j-1.2.16.tar.gz /apache-log4j-2.9.0-src.tar.gz /apache-log4j-2.9.1-src.tar.gz /apache-log4j-2.11.1-src.tar.gz +/apache-log4j-2.12.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 8ceadba..7de845b 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,22 +1,25 @@ %bcond_without jp_minimal Name: log4j -Version: 2.11.1 -Release: 5%{?dist} +Version: 2.12.1 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 + URL: http://logging.apache.org/%{name} Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz BuildRequires: maven-local +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) 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(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:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) @@ -32,13 +35,10 @@ 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(commons-logging:commons-logging) BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) -BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-csv) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.logging:logging-parent:pom:) BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) @@ -134,13 +134,15 @@ Obsoletes: %{name}-manual < %{version} %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 # remove all the stuff we'll build ourselves find -name "*.jar" -o -name "*.class" -delete rm -rf docs/api -%pom_disable_module %{name}-samples %pom_disable_module %{name}-distribution +%pom_disable_module %{name}-samples +%pom_disable_module %{name}-spring-cloud-config # Apache Flume is not in Fedora yet %pom_disable_module %{name}-flume-ng @@ -266,6 +268,12 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Sun Oct 20 2019 Fabio Valentini - 2.12.1-1 +- Update to version 2.12.1. + +* Mon Sep 30 2019 Fabio Valentini - 2.12.0-1 +- Update to version 2.12.0. + * Thu Jul 25 2019 Fedora Release Engineering - 2.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 25dfd29..3f94105 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.11.1-src.tar.gz) = 2bd08c8170e36f427a2b39af443c729d933858b68b9bd766fd0a2ec5fcc65cd95d5e0b1f14ae1889120c35fead4ac93cf392b5277cac29ba1230e5c95adef068 +SHA512 (apache-log4j-2.12.1-src.tar.gz) = 305658ef22fb45b4f21fb6d6ee8ba5137abce90e085c59df1a25933a12719490a41bcdbe279a77bcef74c530ba7cc6c6622017a6e08e127f508ab31b2c15315d From b7af8aeb07eb8d25e949989e233aeaaf4fb1e8ac Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Mon, 6 Jan 2020 22:44:20 -0500 Subject: [PATCH 21/84] Rebase to upstream version v2.13.0 Signed-off-by: Alexander Scheel --- .gitignore | 1 + log4j.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 70ccda3..a005cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /apache-log4j-2.9.1-src.tar.gz /apache-log4j-2.11.1-src.tar.gz /apache-log4j-2.12.1-src.tar.gz +/apache-log4j-2.13.0-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 7de845b..8648dc1 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,7 +1,7 @@ %bcond_without jp_minimal Name: log4j -Version: 2.12.1 +Version: 2.13.0 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch @@ -56,6 +56,11 @@ BuildRequires: mvn(sun.jdk:jconsole) # Explicit requires for javapackages-tools since log4j-jmx script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools + +# Also needs: +# - Various Spring dependencies +# - javax.jms +# - io.fabric8.kubernetes-client %endif Obsoletes: %{name}-osgi < 2.9.1-4 @@ -142,7 +147,6 @@ rm -rf docs/api %pom_disable_module %{name}-distribution %pom_disable_module %{name}-samples -%pom_disable_module %{name}-spring-cloud-config # Apache Flume is not in Fedora yet %pom_disable_module %{name}-flume-ng @@ -203,6 +207,8 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-couchdb %pom_disable_module %{name}-cassandra %pom_disable_module %{name}-appserver +%pom_disable_module %{name}-spring-cloud-config +%pom_disable_module %{name}-kubernetes %pom_remove_dep -r :jackson-dataformat-yaml %pom_remove_dep -r :jackson-dataformat-xml @@ -215,7 +221,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka 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} rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java +rm log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/*Xml*.java rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java +rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %endif %mvn_alias :%{name}-1.2-api %{name}:%{name} @@ -268,6 +276,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Mon Jan 06 2020 Alexander Scheel - 2.13.0-1 +- Rebase to version 2.13.0 + * Sun Oct 20 2019 Fabio Valentini - 2.12.1-1 - Update to version 2.12.1. diff --git a/sources b/sources index 3f94105..9af50d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.12.1-src.tar.gz) = 305658ef22fb45b4f21fb6d6ee8ba5137abce90e085c59df1a25933a12719490a41bcdbe279a77bcef74c530ba7cc6c6622017a6e08e127f508ab31b2c15315d +SHA512 (apache-log4j-2.13.0-src.tar.gz) = 6f864eaa3f02ce44bcc321d3e3177499dce6de1852e6f9fe57e067bb4adc55fc84cfe3fe869fca82ad5e35289b599cebce5550c3f29ad3a0fc1c96b246415a1b From e258483545bf406ac4b8a8be53b79ca17e7dc885 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:12:55 +0000 Subject: [PATCH 22/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 8648dc1..8a96fcb 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -276,6 +276,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 06 2020 Alexander Scheel - 2.13.0-1 - Rebase to version 2.13.0 From d514624901646977cfc9fb2f53b4bc106bd9ca34 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Mon, 3 Feb 2020 09:29:24 -0500 Subject: [PATCH 23/84] AAdd upstream patch for compatibility with the latest slf4j versions Signed-off-by: Alexander Scheel --- log4j.spec | 9 +- ...-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch | 307 ++++++++++++++++++ ...emove-unsupported-EventDataConverter.patch | 297 +++++++++++++++++ 3 files changed, 612 insertions(+), 1 deletion(-) create mode 100644 logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch create mode 100644 logging-log4j-Remove-unsupported-EventDataConverter.patch diff --git a/log4j.spec b/log4j.spec index 8a96fcb..99f174f 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -10,6 +10,9 @@ License: ASL 2.0 URL: http://logging.apache.org/%{name} Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz +Patch1: logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch +Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch + BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) @@ -133,6 +136,7 @@ Obsoletes: %{name}-manual < %{version} %prep %setup -q -n apache-%{name}-%{version}-src +%autopatch -p1 %pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-remote-resources-plugin @@ -276,6 +280,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jan 30 2020 Fabio Valentini - 2.13.0-3 +- Add upstream patch for compatibility with the latest slf4j versions. + * Wed Jan 29 2020 Fedora Release Engineering - 2.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch b/logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch new file mode 100644 index 0000000..ae45ad4 --- /dev/null +++ b/logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch @@ -0,0 +1,307 @@ +diff --git a/log4j-slf4j18-impl/pom.xml b/log4j-slf4j18-impl/pom.xml +index 8332557..ea25131 100644 +--- a/log4j-slf4j18-impl/pom.xml ++++ b/log4j-slf4j18-impl/pom.xml +@@ -31,7 +31,7 @@ + ${basedir}/.. + SLF4J Documentation + /slf4j18 +- 1.8.0-alpha2 ++ 1.8.0-beta4 + org.apache.logging.log4j.slf4j + + +diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java +deleted file mode 100644 +index 620232a..0000000 +--- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache license, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the license for the specific language governing permissions and +- * limitations under the license. +- */ +-package org.apache.logging.slf4j; +- +-import java.util.Map; +- +-import org.apache.logging.log4j.message.Message; +-import org.apache.logging.log4j.message.ParameterizedMessage; +-import org.apache.logging.log4j.message.StructuredDataMessage; +-import org.slf4j.ext.EventData; +- +-/** +- * +- */ +-public class EventDataConverter { +- +- public Message convertEvent(final String message, final Object[] objects, final Throwable throwable) { +- try { +- final EventData data = objects != null && objects[0] instanceof EventData ? +- (EventData) objects[0] : new EventData(message); +- final StructuredDataMessage msg = +- new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType()); +- for (final Map.Entry entry : data.getEventMap().entrySet()) { +- final String key = entry.getKey(); +- if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) +- || EventData.EVENT_MESSAGE.equals(key)) { +- continue; +- } +- msg.put(key, String.valueOf(entry.getValue())); +- } +- return msg; +- } catch (final Exception ex) { +- return new ParameterizedMessage(message, objects, throwable); +- } +- } +-} +diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java +index 6cbb7c4..10ad49c 100644 +--- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java ++++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java +@@ -27,9 +27,7 @@ import org.apache.logging.log4j.message.Message; + import org.apache.logging.log4j.message.ParameterizedMessage; + import org.apache.logging.log4j.message.SimpleMessage; + import org.apache.logging.log4j.spi.ExtendedLogger; +-import org.apache.logging.log4j.util.LoaderUtil; + import org.slf4j.Marker; +-import org.slf4j.MarkerFactory; + import org.slf4j.spi.LocationAwareLogger; + + /** +@@ -40,19 +38,14 @@ 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 final boolean eventLogger; + private transient ExtendedLogger logger; + private final String name; +- private transient EventDataConverter converter; + private transient Log4jMarkerFactory markerFactory; + + 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; +- this.converter = createConverter(); + } + + @Override +@@ -364,9 +357,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + return; + } + final Message msg; +- if (eventLogger && marker != null && marker.contains(EVENT_MARKER) && converter != null) { +- msg = converter.convertEvent(message, params, throwable); +- } else if (params == null) { ++ if (params == null) { + msg = new SimpleMessage(message); + } else { + msg = new ParameterizedMessage(message, params, throwable); +@@ -400,7 +391,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + // always perform the default de-serialization first + aInputStream.defaultReadObject(); + logger = LogManager.getContext().getLogger(name); +- converter = createConverter(); + markerFactory = ((Log4jLoggerFactory) org.slf4j.LoggerFactory.getILoggerFactory()).getMarkerFactory(); + } + +@@ -412,15 +402,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + aOutputStream.defaultWriteObject(); + } + +- private static EventDataConverter createConverter() { +- try { +- LoaderUtil.loadClass("org.slf4j.ext.EventData"); +- return new EventDataConverter(); +- } catch (final ClassNotFoundException cnfe) { +- return null; +- } +- } +- + private static Level getLevel(final int i) { + switch (i) { + case TRACE_INT: +diff --git a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java +index 0524074..c60f1ad 100644 +--- a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java ++++ b/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java +@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull; + import static org.junit.Assert.assertTrue; + + 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.slf4j.LoggerFactory; + import org.slf4j.MDC; + import org.slf4j.Marker; +-import org.slf4j.ext.EventData; +-import org.slf4j.ext.EventLogger; + import org.slf4j.ext.XLogger; + import org.slf4j.ext.XLoggerFactory; + import org.slf4j.spi.LocationAwareLogger; +@@ -145,23 +142,6 @@ public class LoggerTest { + verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR); + } + +- @Test +- public void testEventLogger() { +- MDC.put("loginId", "JohnDoe"); +- MDC.put("ipAddress", "192.168.0.120"); +- MDC.put("locale", Locale.US.getDisplayName()); +- final EventData data = new EventData(); +- data.setEventType("Transfer"); +- data.setEventId("Audit@18060"); +- data.setMessage("Transfer Complete"); +- data.put("ToAccount", "123456"); +- data.put("FromAccount", "123457"); +- data.put("Amount", "200.00"); +- EventLogger.logEvent(data); +- MDC.clear(); +- 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() { + MDC.clear(); + ctx.getListAppender("List").clear(); +- ctx.getListAppender("EventLogger").clear(); + } + } +diff --git a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java +deleted file mode 100644 +index a6e9fd5..0000000 +--- a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java ++++ /dev/null +@@ -1,69 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache license, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the license for the specific language governing permissions and +- * limitations under the license. +- */ +-package org.apache.logging.slf4j; +- +-import java.util.List; +- +-import org.apache.logging.log4j.junit.LoggerContextRule; +-import org.apache.logging.log4j.test.appender.ListAppender; +-import org.apache.logging.log4j.util.Strings; +-import org.junit.Before; +-import org.junit.ClassRule; +-import org.junit.Test; +-import org.slf4j.Logger; +-import org.slf4j.LoggerFactory; +-import org.slf4j.MDC; +-import org.slf4j.Marker; +-import org.slf4j.MarkerFactory; +- +-import static org.junit.Assert.*; +- +-/** +- * +- */ +-public class OptionalTest { +- +- private static final String CONFIG = "log4j-test1.xml"; +- +- @ClassRule +- public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); +- +- Logger logger = LoggerFactory.getLogger("EventLogger"); +- Marker marker = MarkerFactory.getMarker("EVENT"); +- +- @Test +- public void testEventLogger() { +- logger.info(marker, "This is a test"); +- MDC.clear(); +- verify("EventLogger", "o.a.l.s.OptionalTest This is a test" + Strings.LINE_SEPARATOR); +- } +- +- private void verify(final String name, final String expected) { +- final ListAppender listApp = CTX.getListAppender(name); +- final List events = listApp.getMessages(); +- assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); +- final String actual = events.get(0); +- assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); +- listApp.clear(); +- } +- +- @Before +- public void cleanup() { +- CTX.getListAppender("List").clear(); +- CTX.getListAppender("EventLogger").clear(); +- } +-} +diff --git a/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml b/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml +index a64bdfa..07a2be6 100644 +--- a/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml ++++ b/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml +@@ -6,9 +6,6 @@ + + + +- +- +- + + + +@@ -24,10 +21,6 @@ + + + +- +- +- > +- + + + +diff --git a/src/changes/changes.xml b/src/changes/changes.xml +index 2c701e2..e9d3f3b 100644 +--- a/src/changes/changes.xml ++++ b/src/changes/changes.xml +@@ -134,6 +134,12 @@ + + "Values not bound to statement" when using JDBC appender, appender does not respect bufferSize="0". + ++ ++ Remove unnecessary EventLogger references from log4j-slf4j18-impl due to removal from slf4j. ++ ++ ++ Update log4j-slf4j18-impl slf4j version to 1.8.0-beta4 from 1.8.0-alpha2. ++ + + + diff --git a/logging-log4j-Remove-unsupported-EventDataConverter.patch b/logging-log4j-Remove-unsupported-EventDataConverter.patch new file mode 100644 index 0000000..d8ec5bc --- /dev/null +++ b/logging-log4j-Remove-unsupported-EventDataConverter.patch @@ -0,0 +1,297 @@ +From b017736fa1b58377b8bf1b89599b274a9cfb9956 Mon Sep 17 00:00:00 2001 +From: Dinesh Prasanth M K +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 +--- + .../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 +--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache license, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the license for the specific language governing permissions and +- * limitations under the license. +- */ +-package org.apache.logging.slf4j; +- +-import java.util.Map; +- +-import org.apache.logging.log4j.message.Message; +-import org.apache.logging.log4j.message.ParameterizedMessage; +-import org.apache.logging.log4j.message.StructuredDataMessage; +-import org.slf4j.ext.EventData; +- +-/** +- * +- */ +-public class EventDataConverter { +- +- public Message convertEvent(final String message, final Object[] objects, final Throwable throwable) { +- try { +- final EventData data = objects != null && objects[0] instanceof EventData ? +- (EventData) objects[0] : new EventData(message); +- final StructuredDataMessage msg = +- new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType()); +- for (final Map.Entry entry : data.getEventMap().entrySet()) { +- final String key = entry.getKey(); +- if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) +- || EventData.EVENT_MESSAGE.equals(key)) { +- continue; +- } +- msg.put(key, String.valueOf(entry.getValue())); +- } +- return msg; +- } catch (final Exception ex) { +- return new ParameterizedMessage(message, objects, throwable); +- } +- } +-} +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 ec4decb..21cbbb6 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; + import org.apache.logging.log4j.message.ParameterizedMessage; + import org.apache.logging.log4j.message.SimpleMessage; + import org.apache.logging.log4j.spi.ExtendedLogger; +-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; + +@@ -41,17 +39,11 @@ 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 final boolean eventLogger; + private transient ExtendedLogger logger; + private final String name; +- private transient EventDataConverter converter; +- + public Log4jLogger(final ExtendedLogger logger, final String name) { + this.logger = logger; +- this.eventLogger = "EventLogger".equals(name); + this.name = name; +- this.converter = createConverter(); + } + + @Override +@@ -363,9 +355,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + return; + } + final Message msg; +- if (eventLogger && marker != null && marker.contains(EVENT_MARKER) && converter != null) { +- msg = converter.convertEvent(message, params, throwable); +- } else if (params == null) { ++ if (params == null) { + msg = new SimpleMessage(message); + } else { + msg = new ParameterizedMessage(message, params, throwable); +@@ -400,7 +390,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + // always perform the default de-serialization first + aInputStream.defaultReadObject(); + logger = LogManager.getContext().getLogger(name); +- converter = createConverter(); + } + + /** +@@ -411,15 +400,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + aOutputStream.defaultWriteObject(); + } + +- private static EventDataConverter createConverter() { +- try { +- LoaderUtil.loadClass("org.slf4j.ext.EventData"); +- return new EventDataConverter(); +- } catch (final ClassNotFoundException cnfe) { +- return null; +- } +- } +- + private static Level getLevel(final int i) { + 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 +--- 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; + import static org.junit.Assert.assertTrue; + + 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.slf4j.LoggerFactory; + import org.slf4j.MDC; + import org.slf4j.Marker; +-import org.slf4j.ext.EventData; +-import org.slf4j.ext.EventLogger; + import org.slf4j.ext.XLogger; + import org.slf4j.ext.XLoggerFactory; + import org.slf4j.spi.LocationAwareLogger; +@@ -145,23 +142,6 @@ public class LoggerTest { + verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR); + } + +- @Test +- public void testEventLogger() { +- MDC.put("loginId", "JohnDoe"); +- MDC.put("ipAddress", "192.168.0.120"); +- MDC.put("locale", Locale.US.getDisplayName()); +- final EventData data = new EventData(); +- data.setEventType("Transfer"); +- data.setEventId("Audit@18060"); +- data.setMessage("Transfer Complete"); +- data.put("ToAccount", "123456"); +- data.put("FromAccount", "123457"); +- data.put("Amount", "200.00"); +- EventLogger.logEvent(data); +- MDC.clear(); +- 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() { + MDC.clear(); + ctx.getListAppender("List").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 +--- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java ++++ /dev/null +@@ -1,69 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache license, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the license for the specific language governing permissions and +- * limitations under the license. +- */ +-package org.apache.logging.slf4j; +- +-import java.util.List; +- +-import org.apache.logging.log4j.junit.LoggerContextRule; +-import org.apache.logging.log4j.test.appender.ListAppender; +-import org.apache.logging.log4j.util.Strings; +-import org.junit.Before; +-import org.junit.ClassRule; +-import org.junit.Test; +-import org.slf4j.Logger; +-import org.slf4j.LoggerFactory; +-import org.slf4j.MDC; +-import org.slf4j.Marker; +-import org.slf4j.MarkerFactory; +- +-import static org.junit.Assert.*; +- +-/** +- * +- */ +-public class OptionalTest { +- +- private static final String CONFIG = "log4j-test1.xml"; +- +- @ClassRule +- public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); +- +- Logger logger = LoggerFactory.getLogger("EventLogger"); +- Marker marker = MarkerFactory.getMarker("EVENT"); +- +- @Test +- public void testEventLogger() { +- logger.info(marker, "This is a test"); +- MDC.clear(); +- verify("EventLogger", "o.a.l.s.OptionalTest This is a test" + Strings.LINE_SEPARATOR); +- } +- +- private void verify(final String name, final String expected) { +- final ListAppender listApp = CTX.getListAppender(name); +- final List events = listApp.getMessages(); +- assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); +- final String actual = events.get(0); +- assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); +- listApp.clear(); +- } +- +- @Before +- public void cleanup() { +- CTX.getListAppender("List").clear(); +- CTX.getListAppender("EventLogger").clear(); +- } +-} +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 +--- a/log4j-slf4j-impl/src/test/resources/log4j-test1.xml ++++ b/log4j-slf4j-impl/src/test/resources/log4j-test1.xml +@@ -6,9 +6,6 @@ + + + +- +- +- + + + +@@ -24,10 +21,6 @@ + + + +- +- +- > +- + + + +-- +2.23.0 + From 42ef5f23686907c14a3469a0d3772b927b53bdae Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 2 Mar 2020 11:13:40 +0100 Subject: [PATCH 24/84] update to version 2.13.1 - drop upstream patch that's included in this release - rebase downstream patch for removed slf4j EventDataConverter --- .gitignore | 1 + log4j.spec | 10 +- ...-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch | 307 ------------------ ...emove-unsupported-EventDataConverter.patch | 53 +-- sources | 2 +- 5 files changed, 21 insertions(+), 352 deletions(-) delete mode 100644 logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch diff --git a/.gitignore b/.gitignore index a005cfc..fbeed60 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /apache-log4j-2.11.1-src.tar.gz /apache-log4j-2.12.1-src.tar.gz /apache-log4j-2.13.0-src.tar.gz +/apache-log4j-2.13.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 99f174f..837c8e4 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_without jp_minimal Name: log4j -Version: 2.13.0 -Release: 3%{?dist} +Version: 2.13.1 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -10,7 +10,6 @@ License: ASL 2.0 URL: http://logging.apache.org/%{name} Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz -Patch1: logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch BuildRequires: maven-local @@ -280,6 +279,11 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Mon Mar 02 2020 Fabio Valentini - 2.13.1-1 +- Update to version 2.13.1. +- Drop upstream patch that's included in the new release. +- Rebase patch for removing the unsupported SLF4J EventDataConverter. + * Thu Jan 30 2020 Fabio Valentini - 2.13.0-3 - Add upstream patch for compatibility with the latest slf4j versions. diff --git a/logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch b/logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch deleted file mode 100644 index ae45ad4..0000000 --- a/logging-log4j-LOG4J2-2745-LOG4J2-2744-slf4j.patch +++ /dev/null @@ -1,307 +0,0 @@ -diff --git a/log4j-slf4j18-impl/pom.xml b/log4j-slf4j18-impl/pom.xml -index 8332557..ea25131 100644 ---- a/log4j-slf4j18-impl/pom.xml -+++ b/log4j-slf4j18-impl/pom.xml -@@ -31,7 +31,7 @@ - ${basedir}/.. - SLF4J Documentation - /slf4j18 -- 1.8.0-alpha2 -+ 1.8.0-beta4 - org.apache.logging.log4j.slf4j - - -diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java -deleted file mode 100644 -index 620232a..0000000 ---- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java -+++ /dev/null -@@ -1,50 +0,0 @@ --/* -- * Licensed to the Apache Software Foundation (ASF) under one or more -- * contributor license agreements. See the NOTICE file distributed with -- * this work for additional information regarding copyright ownership. -- * The ASF licenses this file to You under the Apache license, Version 2.0 -- * (the "License"); you may not use this file except in compliance with -- * the License. You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the license for the specific language governing permissions and -- * limitations under the license. -- */ --package org.apache.logging.slf4j; -- --import java.util.Map; -- --import org.apache.logging.log4j.message.Message; --import org.apache.logging.log4j.message.ParameterizedMessage; --import org.apache.logging.log4j.message.StructuredDataMessage; --import org.slf4j.ext.EventData; -- --/** -- * -- */ --public class EventDataConverter { -- -- public Message convertEvent(final String message, final Object[] objects, final Throwable throwable) { -- try { -- final EventData data = objects != null && objects[0] instanceof EventData ? -- (EventData) objects[0] : new EventData(message); -- final StructuredDataMessage msg = -- new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType()); -- for (final Map.Entry entry : data.getEventMap().entrySet()) { -- final String key = entry.getKey(); -- if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) -- || EventData.EVENT_MESSAGE.equals(key)) { -- continue; -- } -- msg.put(key, String.valueOf(entry.getValue())); -- } -- return msg; -- } catch (final Exception ex) { -- return new ParameterizedMessage(message, objects, throwable); -- } -- } --} -diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java -index 6cbb7c4..10ad49c 100644 ---- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java -+++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java -@@ -27,9 +27,7 @@ import org.apache.logging.log4j.message.Message; - import org.apache.logging.log4j.message.ParameterizedMessage; - import org.apache.logging.log4j.message.SimpleMessage; - import org.apache.logging.log4j.spi.ExtendedLogger; --import org.apache.logging.log4j.util.LoaderUtil; - import org.slf4j.Marker; --import org.slf4j.MarkerFactory; - import org.slf4j.spi.LocationAwareLogger; - - /** -@@ -40,19 +38,14 @@ 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 final boolean eventLogger; - private transient ExtendedLogger logger; - private final String name; -- private transient EventDataConverter converter; - private transient Log4jMarkerFactory markerFactory; - - 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; -- this.converter = createConverter(); - } - - @Override -@@ -364,9 +357,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { - return; - } - final Message msg; -- if (eventLogger && marker != null && marker.contains(EVENT_MARKER) && converter != null) { -- msg = converter.convertEvent(message, params, throwable); -- } else if (params == null) { -+ if (params == null) { - msg = new SimpleMessage(message); - } else { - msg = new ParameterizedMessage(message, params, throwable); -@@ -400,7 +391,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { - // always perform the default de-serialization first - aInputStream.defaultReadObject(); - logger = LogManager.getContext().getLogger(name); -- converter = createConverter(); - markerFactory = ((Log4jLoggerFactory) org.slf4j.LoggerFactory.getILoggerFactory()).getMarkerFactory(); - } - -@@ -412,15 +402,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { - aOutputStream.defaultWriteObject(); - } - -- private static EventDataConverter createConverter() { -- try { -- LoaderUtil.loadClass("org.slf4j.ext.EventData"); -- return new EventDataConverter(); -- } catch (final ClassNotFoundException cnfe) { -- return null; -- } -- } -- - private static Level getLevel(final int i) { - switch (i) { - case TRACE_INT: -diff --git a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java -index 0524074..c60f1ad 100644 ---- a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java -+++ b/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java -@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull; - import static org.junit.Assert.assertTrue; - - 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.slf4j.LoggerFactory; - import org.slf4j.MDC; - import org.slf4j.Marker; --import org.slf4j.ext.EventData; --import org.slf4j.ext.EventLogger; - import org.slf4j.ext.XLogger; - import org.slf4j.ext.XLoggerFactory; - import org.slf4j.spi.LocationAwareLogger; -@@ -145,23 +142,6 @@ public class LoggerTest { - verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR); - } - -- @Test -- public void testEventLogger() { -- MDC.put("loginId", "JohnDoe"); -- MDC.put("ipAddress", "192.168.0.120"); -- MDC.put("locale", Locale.US.getDisplayName()); -- final EventData data = new EventData(); -- data.setEventType("Transfer"); -- data.setEventId("Audit@18060"); -- data.setMessage("Transfer Complete"); -- data.put("ToAccount", "123456"); -- data.put("FromAccount", "123457"); -- data.put("Amount", "200.00"); -- EventLogger.logEvent(data); -- MDC.clear(); -- 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() { - MDC.clear(); - ctx.getListAppender("List").clear(); -- ctx.getListAppender("EventLogger").clear(); - } - } -diff --git a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java -deleted file mode 100644 -index a6e9fd5..0000000 ---- a/log4j-slf4j18-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java -+++ /dev/null -@@ -1,69 +0,0 @@ --/* -- * Licensed to the Apache Software Foundation (ASF) under one or more -- * contributor license agreements. See the NOTICE file distributed with -- * this work for additional information regarding copyright ownership. -- * The ASF licenses this file to You under the Apache license, Version 2.0 -- * (the "License"); you may not use this file except in compliance with -- * the License. You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the license for the specific language governing permissions and -- * limitations under the license. -- */ --package org.apache.logging.slf4j; -- --import java.util.List; -- --import org.apache.logging.log4j.junit.LoggerContextRule; --import org.apache.logging.log4j.test.appender.ListAppender; --import org.apache.logging.log4j.util.Strings; --import org.junit.Before; --import org.junit.ClassRule; --import org.junit.Test; --import org.slf4j.Logger; --import org.slf4j.LoggerFactory; --import org.slf4j.MDC; --import org.slf4j.Marker; --import org.slf4j.MarkerFactory; -- --import static org.junit.Assert.*; -- --/** -- * -- */ --public class OptionalTest { -- -- private static final String CONFIG = "log4j-test1.xml"; -- -- @ClassRule -- public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); -- -- Logger logger = LoggerFactory.getLogger("EventLogger"); -- Marker marker = MarkerFactory.getMarker("EVENT"); -- -- @Test -- public void testEventLogger() { -- logger.info(marker, "This is a test"); -- MDC.clear(); -- verify("EventLogger", "o.a.l.s.OptionalTest This is a test" + Strings.LINE_SEPARATOR); -- } -- -- private void verify(final String name, final String expected) { -- final ListAppender listApp = CTX.getListAppender(name); -- final List events = listApp.getMessages(); -- assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); -- final String actual = events.get(0); -- assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); -- listApp.clear(); -- } -- -- @Before -- public void cleanup() { -- CTX.getListAppender("List").clear(); -- CTX.getListAppender("EventLogger").clear(); -- } --} -diff --git a/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml b/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml -index a64bdfa..07a2be6 100644 ---- a/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml -+++ b/log4j-slf4j18-impl/src/test/resources/log4j-test1.xml -@@ -6,9 +6,6 @@ - - - -- -- -- - - - -@@ -24,10 +21,6 @@ - - - -- -- -- > -- - - - -diff --git a/src/changes/changes.xml b/src/changes/changes.xml -index 2c701e2..e9d3f3b 100644 ---- a/src/changes/changes.xml -+++ b/src/changes/changes.xml -@@ -134,6 +134,12 @@ - - "Values not bound to statement" when using JDBC appender, appender does not respect bufferSize="0". - -+ -+ Remove unnecessary EventLogger references from log4j-slf4j18-impl due to removal from slf4j. -+ -+ -+ Update log4j-slf4j18-impl slf4j version to 1.8.0-beta4 from 1.8.0-alpha2. -+ - - - diff --git a/logging-log4j-Remove-unsupported-EventDataConverter.patch b/logging-log4j-Remove-unsupported-EventDataConverter.patch index d8ec5bc..01e5cb7 100644 --- a/logging-log4j-Remove-unsupported-EventDataConverter.patch +++ b/logging-log4j-Remove-unsupported-EventDataConverter.patch @@ -1,22 +1,3 @@ -From b017736fa1b58377b8bf1b89599b274a9cfb9956 Mon Sep 17 00:00:00 2001 -From: Dinesh Prasanth M K -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 ---- - .../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 @@ 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 ec4decb..21cbbb6 100644 +index 1fa8080..90cfe4e 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; @@ -87,44 +68,37 @@ index ec4decb..21cbbb6 100644 import org.slf4j.impl.StaticMarkerBinder; import org.slf4j.spi.LocationAwareLogger; -@@ -41,17 +39,11 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { - public static final String FQCN = Log4jLogger.class.getName(); +@@ -39,18 +37,13 @@ import org.slf4j.spi.LocationAwareLogger; + 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(); + - private final boolean eventLogger; private transient ExtendedLogger logger; private final String name; -- private transient EventDataConverter converter; -- + public Log4jLogger(final ExtendedLogger logger, final String name) { this.logger = logger; - this.eventLogger = "EventLogger".equals(name); this.name = name; -- this.converter = createConverter(); } - @Override -@@ -363,9 +355,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { +@@ -363,9 +356,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { return; } final Message msg; -- if (eventLogger && marker != null && marker.contains(EVENT_MARKER) && converter != null) { -- msg = converter.convertEvent(message, params, throwable); +- if (CONVERTER != null && eventLogger && marker != null && marker.contains(EVENT_MARKER)) { +- msg = CONVERTER.convertEvent(message, params, throwable); - } else if (params == null) { + if (params == null) { msg = new SimpleMessage(message); } else { msg = new ParameterizedMessage(message, params, throwable); -@@ -400,7 +390,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { - // always perform the default de-serialization first - aInputStream.defaultReadObject(); - logger = LogManager.getContext().getLogger(name); -- converter = createConverter(); - } - - /** -@@ -411,15 +400,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { +@@ -410,15 +401,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { aOutputStream.defaultWriteObject(); } @@ -292,6 +266,3 @@ index a64bdfa..07a2be6 100644 --- -2.23.0 - diff --git a/sources b/sources index 9af50d6..a1604c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.13.0-src.tar.gz) = 6f864eaa3f02ce44bcc321d3e3177499dce6de1852e6f9fe57e067bb4adc55fc84cfe3fe869fca82ad5e35289b599cebce5550c3f29ad3a0fc1c96b246415a1b +SHA512 (apache-log4j-2.13.1-src.tar.gz) = 743df19fc2138dd6422a6decb72575230979cd5aae1cb515f654918d667a1713a2f2f25cefa54e80b0f3085bd5e57a345c8f50a6fd37822c742a74da1e8e7f32 From d31e8465f7d8b7bd952b497fcc852dda6b79af2b Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 02:36:02 +0200 Subject: [PATCH 25/84] Rebuilt for JDK-11 --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 837c8e4..68b55ec 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -279,6 +279,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Sat Jul 11 2020 Jiri Vanek - 2.13.1-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon Mar 02 2020 Fabio Valentini - 2.13.1-1 - Update to version 2.13.1. - Drop upstream patch that's included in the new release. From 2e2313f7af6d013d3033dfb80047279aaf019a91 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 20 Jul 2020 18:52:38 +0200 Subject: [PATCH 26/84] add missing javax.activation dependency --- log4j.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 68b55ec..686392d 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -17,6 +17,7 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) 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.activation:jakarta.activation) BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-compress) @@ -164,6 +165,8 @@ rm -rf docs/api %pom_remove_dep -r :%{name}-core-java9 %pom_remove_plugin -r :maven-dependency-plugin +%pom_add_dep com.sun.activation:jakarta.activation + # 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 @@ -279,6 +282,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Mon Jul 20 2020 Fabio Valentini - 2.13.1-3 +- Add missing javax.activation dependency. + * Sat Jul 11 2020 Jiri Vanek - 2.13.1-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 13157128eb308b9cd49010b3c86bba5238ad8899 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:14:21 +0000 Subject: [PATCH 27/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 686392d..fdc505f 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -282,6 +282,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 20 2020 Fabio Valentini - 2.13.1-3 - Add missing javax.activation dependency. From 8043f3448c7680a712efeda93d9f8b4259990bdf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 20 Aug 2020 23:27:05 +0200 Subject: [PATCH 28/84] update to version 2.13.3 --- .gitignore | 1 + log4j.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fbeed60..319ec53 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /apache-log4j-2.12.1-src.tar.gz /apache-log4j-2.13.0-src.tar.gz /apache-log4j-2.13.1-src.tar.gz +/apache-log4j-2.13.3-src.tar.gz diff --git a/log4j.spec b/log4j.spec index fdc505f..1a5c9ed 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_without jp_minimal Name: log4j -Version: 2.13.1 -Release: 4%{?dist} +Version: 2.13.3 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -23,6 +23,8 @@ BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache:apache: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) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) @@ -158,13 +160,7 @@ rm -rf docs/api # artifact for upstream testing of log4j itself, shouldn't be distributed %pom_disable_module %{name}-perf -# needs java 9 to build -%pom_disable_module %{name}-api-java9 -%pom_disable_module %{name}-core-java9 -%pom_remove_dep -r :%{name}-api-java9 -%pom_remove_dep -r :%{name}-core-java9 -%pom_remove_plugin -r :maven-dependency-plugin - +# add dependency for javax.activation package (no longer part of OpenJDK) %pom_add_dep com.sun.activation:jakarta.activation # unavailable com.conversantmedia:disruptor @@ -282,6 +278,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Aug 20 2020 Fabio Valentini - 2.13.3-1 +- Update to version 2.13.3. + * Tue Jul 28 2020 Fedora Release Engineering - 2.13.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a1604c2..ae2619d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.13.1-src.tar.gz) = 743df19fc2138dd6422a6decb72575230979cd5aae1cb515f654918d667a1713a2f2f25cefa54e80b0f3085bd5e57a345c8f50a6fd37822c742a74da1e8e7f32 +SHA512 (apache-log4j-2.13.3-src.tar.gz) = b759f008e99ba3eaeb7f928e66d96529ece6fc9d9532a825775e11a00c256543aaa43a8e7f383b729be23a21ba90df42b8b12aa2802d40a0e227e17b629d8ecc From c4207581073a8be50cc84355399a1ed6e4b8eb30 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Dec 2020 11:41:40 -0700 Subject: [PATCH 29/84] Update jansi dep to jansi1 --- log4j.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/log4j.spec b/log4j.spec index 1a5c9ed..a74851a 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -26,7 +26,7 @@ BuildRequires: mvn(org.apache:apache: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) -BuildRequires: mvn(org.fusesource.jansi:jansi) +BuildRequires: mvn(org.fusesource.jansi:jansi:1) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) @@ -49,7 +49,7 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.eclipse.jetty:jetty-util) BuildRequires: mvn(org.eclipse.persistence:javax.persistence) -BuildRequires: mvn(org.fusesource.jansi:jansi) +BuildRequires: mvn(org.fusesource.jansi:jansi:1) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.lightcouch:lightcouch) @@ -197,6 +197,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # tests are disabled %pom_remove_plugin :maven-failsafe-plugin +# Update required version of jansi 1.x +%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18 + %if %{with jp_minimal} %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui @@ -278,6 +281,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Mon Dec 14 2020 Jerry James - 2.13.3-2 +- Update jansi dep to jansi1 + * Thu Aug 20 2020 Fabio Valentini - 2.13.3-1 - Update to version 2.13.3. From 8c03b67393f9c442906be202d9bb7d3ed20d050b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:38:52 +0000 Subject: [PATCH 30/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index a74851a..20b13ef 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -281,6 +281,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Jerry James - 2.13.3-2 - Update jansi dep to jansi1 From 9db1579af86c1376cd0c62e6410e470ee5b21c21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:06:02 +0000 Subject: [PATCH 31/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 20b13ef..1f05b60 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.13.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -281,6 +281,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.13.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.13.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f19ba5a79af1e0cec2219e628f08f38b26f713d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 2 Aug 2021 04:38:58 +0100 Subject: [PATCH 32/84] Update to 2.14.1 Disable javadoc (#1988896) Build with jansi-2 Remove deps on slf4j-ext (no longer available in Fedora 35) --- .gitignore | 1 + log4j.spec | 29 ++++++++++++++++++++--------- sources | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 319ec53..ba41d8b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /apache-log4j-2.13.0-src.tar.gz /apache-log4j-2.13.1-src.tar.gz /apache-log4j-2.13.3-src.tar.gz +/apache-log4j-2.14.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 1f05b60..56452c8 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_without jp_minimal Name: log4j -Version: 2.13.3 -Release: 4%{?dist} +Version: 2.14.1 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -26,11 +26,10 @@ BuildRequires: mvn(org.apache:apache: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) -BuildRequires: mvn(org.fusesource.jansi:jansi:1) +BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-ext) %if %{without jp_minimal} BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) @@ -180,9 +179,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # we don't have commons-dbcp2 %pom_disable_module %{name}-jdbc-dbcp2 -# We have mongodb 4 -%pom_disable_module %{name}-mongodb2 +# We don't have mmongo-java %pom_disable_module %{name}-mongodb3 +%pom_disable_module %{name}-mongodb4 # System scoped dep provided by JDK %pom_remove_dep :jconsole %{name}-jmx-gui @@ -200,6 +199,10 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # Update required version of jansi 1.x %pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18 +# Remove deps on slf4j-ext, it is no longer available in Fedora 35 +%pom_remove_dep -r :slf4j-ext +%pom_remove_parent + %if %{with jp_minimal} %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui @@ -213,7 +216,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-cassandra %pom_disable_module %{name}-appserver %pom_disable_module %{name}-spring-cloud-config +%pom_disable_module %{name}-spring-boot %pom_disable_module %{name}-kubernetes +%pom_disable_module %{name}-layout-template-json %pom_remove_dep -r :jackson-dataformat-yaml %pom_remove_dep -r :jackson-dataformat-xml @@ -252,7 +257,7 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %build # missing test deps (mockejb) -%mvn_build -f +%mvn_build -f -j %install %mvn_install @@ -276,11 +281,17 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %{_bindir}/%{name}-jmx %endif -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +#%%files javadoc -f .mfiles-javadoc +#%%doc LICENSE.txt NOTICE.txt %changelog +* Sun Aug 01 2021 Sérgio Basto - 2.14.1-1 +- Update to 2.14.1 +- Disable javadoc (#1988896) +- Build with jansi-2 +- Remove deps on slf4j-ext (no longer available in Fedora 35) + * Thu Jul 22 2021 Fedora Release Engineering - 2.13.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index ae2619d..35ceaee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.13.3-src.tar.gz) = b759f008e99ba3eaeb7f928e66d96529ece6fc9d9532a825775e11a00c256543aaa43a8e7f383b729be23a21ba90df42b8b12aa2802d40a0e227e17b629d8ecc +SHA512 (apache-log4j-2.14.1-src.tar.gz) = 5281ba6f615d1b1aa4db25b102f90fd74eb37b07ce8543019c51f9f3fb53a00f85106944c6ef7d9195b4c58806cb403f2f5ce6fb3f9b87603894c678978a4b7d From aadb89a9b88ee443ffe4db51298279ef8ff566e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 2 Aug 2021 18:00:58 +0100 Subject: [PATCH 33/84] we don't need fix jansi version --- log4j.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/log4j.spec b/log4j.spec index 56452c8..a2103c1 100644 --- a/log4j.spec +++ b/log4j.spec @@ -196,9 +196,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka # tests are disabled %pom_remove_plugin :maven-failsafe-plugin -# Update required version of jansi 1.x -%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18 - # Remove deps on slf4j-ext, it is no longer available in Fedora 35 %pom_remove_dep -r :slf4j-ext %pom_remove_parent From 1a5f2821e7e4c4d8fa75604fa992139f713c5f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 12 Dec 2021 02:32:29 +0000 Subject: [PATCH 34/84] Update log4j to 2.15.0 (#2030907) Security fix for CVE-2021-44228 (#2030945) --- .gitignore | 1 + log4j.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ba41d8b..ec06f45 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /apache-log4j-2.13.1-src.tar.gz /apache-log4j-2.13.3-src.tar.gz /apache-log4j-2.14.1-src.tar.gz +/apache-log4j-2.15.0-src.tar.gz diff --git a/log4j.spec b/log4j.spec index a2103c1..2ffa046 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,7 +1,7 @@ %bcond_without jp_minimal Name: log4j -Version: 2.14.1 +Version: 2.15.0 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch @@ -30,6 +30,7 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) %if %{without jp_minimal} BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) @@ -283,6 +284,10 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Sun Dec 12 2021 Sérgio Basto - 2.15.0-1 +- Update log4j to 2.15.0 (#2030907) +- Security fix for CVE-2021-44228 (#2030945) + * Sun Aug 01 2021 Sérgio Basto - 2.14.1-1 - Update to 2.14.1 - Disable javadoc (#1988896) diff --git a/sources b/sources index 35ceaee..7b84279 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.14.1-src.tar.gz) = 5281ba6f615d1b1aa4db25b102f90fd74eb37b07ce8543019c51f9f3fb53a00f85106944c6ef7d9195b4c58806cb403f2f5ce6fb3f9b87603894c678978a4b7d +SHA512 (apache-log4j-2.15.0-src.tar.gz) = 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a From dbe5310aaf1df27bcfb4245e2fbb7e9b407309f0 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 13 Dec 2021 14:51:37 -0500 Subject: [PATCH 35/84] - Update log4j to 2.16.0 - Disables JNDI by default --- .gitignore | 1 + log4j.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ec06f45..7002b69 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /apache-log4j-2.13.3-src.tar.gz /apache-log4j-2.14.1-src.tar.gz /apache-log4j-2.15.0-src.tar.gz +/apache-log4j-2.16.0-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 2ffa046..9b6d64c 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,7 +1,7 @@ %bcond_without jp_minimal Name: log4j -Version: 2.15.0 +Version: 2.16.0 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch @@ -284,6 +284,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Mon Dec 13 2021 Paul Wouters - 2.16.0-1 +- Update log4j to 2.16.0 - Disables JNDI by default + * Sun Dec 12 2021 Sérgio Basto - 2.15.0-1 - Update log4j to 2.15.0 (#2030907) - Security fix for CVE-2021-44228 (#2030945) diff --git a/sources b/sources index 7b84279..9f7eeee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.15.0-src.tar.gz) = 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a +SHA512 (apache-log4j-2.16.0-src.tar.gz) = c520a5af1ac4161f0b0c9cb466a0c6bf349cce567b8c1c1ee01fc0b0258852f0ef4f7a7967f367168f4395e7fdd981fd35b7cb6d5f236b6421699bd2b1ccf919 From 81ad2882636668d8b10db6b0d6959b677b2d387b Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sat, 18 Dec 2021 10:30:49 -0500 Subject: [PATCH 36/84] - Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack --- .gitignore | 1 + log4j.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7002b69..98bad1f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /apache-log4j-2.14.1-src.tar.gz /apache-log4j-2.15.0-src.tar.gz /apache-log4j-2.16.0-src.tar.gz +/apache-log4j-2.17.0-src.tar.gz diff --git a/log4j.spec b/log4j.spec index 9b6d64c..f4ba3fc 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,7 +1,7 @@ %bcond_without jp_minimal Name: log4j -Version: 2.16.0 +Version: 2.17.0 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch @@ -284,6 +284,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Sat Dec 18 2021 Paul Wouters - 2.17.0-1 +- Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack + * Mon Dec 13 2021 Paul Wouters - 2.16.0-1 - Update log4j to 2.16.0 - Disables JNDI by default diff --git a/sources b/sources index 9f7eeee..59e1b34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.16.0-src.tar.gz) = c520a5af1ac4161f0b0c9cb466a0c6bf349cce567b8c1c1ee01fc0b0258852f0ef4f7a7967f367168f4395e7fdd981fd35b7cb6d5f236b6421699bd2b1ccf919 +SHA512 (apache-log4j-2.17.0-src.tar.gz) = 23433baa39a8cc76164ae96307e85b9e4ea671028015df6171bfaf025a1e1aaacf76a94a1beef67aada56952f013a8eae94024869a8530f42a3747ba70cc3a90 From 5409c2c3d51d136807d28f5a1f24cb20f9ba11e4 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 28 Dec 2021 15:56:45 -0500 Subject: [PATCH 37/84] - Update log4j to 2.17.1 for CVE-2021-44832 RCE via JDBC Appender (when attacker controls config) --- .gitignore | 1 + log4j.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 98bad1f..c4e3cdf 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /apache-log4j-2.15.0-src.tar.gz /apache-log4j-2.16.0-src.tar.gz /apache-log4j-2.17.0-src.tar.gz +/apache-log4j-2.17.1-src.tar.gz diff --git a/log4j.spec b/log4j.spec index f4ba3fc..3c43ae5 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,14 +1,14 @@ %bcond_without jp_minimal Name: log4j -Version: 2.17.0 +Version: 2.17.1 Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 -URL: http://logging.apache.org/%{name} -Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz +URL: https://logging.apache.org/%{name} +Source0: https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch @@ -284,6 +284,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Tue Dec 28 2021 Paul Wouters - 2.17.1-1 +- Update log4j to 2.17.1 for CVE-2021-44832 RCE via JDBC Appender (when attacker controls config) + * Sat Dec 18 2021 Paul Wouters - 2.17.0-1 - Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack diff --git a/sources b/sources index 59e1b34..e09283e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.17.0-src.tar.gz) = 23433baa39a8cc76164ae96307e85b9e4ea671028015df6171bfaf025a1e1aaacf76a94a1beef67aada56952f013a8eae94024869a8530f42a3747ba70cc3a90 +SHA512 (apache-log4j-2.17.1-src.tar.gz) = 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177 From 02521f4a35d2bc14b39456b5d8cd434403edc5b8 Mon Sep 17 00:00:00 2001 From: Malcolm Inglis Date: Fri, 7 Jan 2022 01:17:43 +0000 Subject: [PATCH 38/84] Enable GPG signature verification of sources As per Packaging Guideslines. https://docs.fedoraproject.org/en-US/packaging-guidelines/#_source_file_verification --- .gitignore | 2 ++ log4j.spec | 10 +++++++++- sources | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c4e3cdf..8cb53aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /results_* /*.src.rpm +/KEYS /apache-log4j-1.2.16.tar.gz /log4j-1.2.17.tar.gz /apache-log4j-2.0-rc1-src.tar.gz @@ -24,3 +25,4 @@ /apache-log4j-2.16.0-src.tar.gz /apache-log4j-2.17.0-src.tar.gz /apache-log4j-2.17.1-src.tar.gz +/apache-log4j-2.17.1-src.tar.gz.asc diff --git a/log4j.spec b/log4j.spec index 3c43ae5..fe5cf79 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,16 +2,20 @@ Name: log4j Version: 2.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 URL: https://logging.apache.org/%{name} Source0: https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz +Source1: https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz.asc +Source2: https://www.apache.org/dist/logging/KEYS Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch +BuildRequires: gnupg2 + BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) @@ -137,6 +141,7 @@ Obsoletes: %{name}-manual < %{version} %{summary}. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n apache-%{name}-%{version}-src %autopatch -p1 @@ -284,6 +289,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jan 06 2022 Malcolm Inglis - 2.17.1-2 +- Enable GPG signature verification of sources + * Tue Dec 28 2021 Paul Wouters - 2.17.1-1 - Update log4j to 2.17.1 for CVE-2021-44832 RCE via JDBC Appender (when attacker controls config) diff --git a/sources b/sources index e09283e..2877306 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (apache-log4j-2.17.1-src.tar.gz) = 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177 +SHA512 (apache-log4j-2.17.1-src.tar.gz.asc) = 49dd72d741ad669a2db9411bb20e6557d564b4c43873b27acc04cf8f50f9b8c43ddbce871e0a2c6abd79c9b58fa57f4ebcb38798e7965ec59641a7e07de3cdce +SHA512 (KEYS) = c149ef131b44cc261b9efc30510ab40837cd1a26d3c1167cd21be6e3ed1d158de4537b399a09824695fcc6e5280ba73f28f39cdf739815f534c535fd1c42d886 From e0d59aca230c8f6285ea5825d0b695f0d0db8c90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:01:24 +0000 Subject: [PATCH 39/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index fe5cf79..eb6b9a2 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -289,6 +289,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 06 2022 Malcolm Inglis - 2.17.1-2 - Enable GPG signature verification of sources From a304f8ddfb820ed33beb93e0c934e09668dcd708 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 22:28:30 +0100 Subject: [PATCH 40/84] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index eb6b9a2..c4ba15e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -289,6 +289,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Sat Feb 05 2022 Jiri Vanek - 2.17.1-4 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 2.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 450e825d951701f8b264da973d79c6f8013af496 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sun, 27 Feb 2022 13:32:09 -0500 Subject: [PATCH 41/84] - Resolves: rhbz#log4j-2.17.2 is available (1.2 bridge bugfixes) 1.2 bridge does not support system properties 1.2 bridge PropertiesConfiguration.buildAppender not adding filters to custom appender --- .gitignore | 2 ++ log4j.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8cb53aa..d17478d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /apache-log4j-2.17.0-src.tar.gz /apache-log4j-2.17.1-src.tar.gz /apache-log4j-2.17.1-src.tar.gz.asc +/apache-log4j-2.17.2-src.tar.gz +/apache-log4j-2.17.2-src.tar.gz.asc diff --git a/log4j.spec b/log4j.spec index c4ba15e..1d369c1 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ %bcond_without jp_minimal Name: log4j -Version: 2.17.1 -Release: 4%{?dist} +Version: 2.17.2 +Release: 1%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -289,6 +289,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Sun Feb 27 2022 Paul Wouters - 2.17.2-1 +- Resolves: rhbz#log4j-2.17.2 is available (1.2 bridge bugfixes) + * Sat Feb 05 2022 Jiri Vanek - 2.17.1-4 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 2877306..b0a3e84 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (apache-log4j-2.17.1-src.tar.gz) = 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177 -SHA512 (apache-log4j-2.17.1-src.tar.gz.asc) = 49dd72d741ad669a2db9411bb20e6557d564b4c43873b27acc04cf8f50f9b8c43ddbce871e0a2c6abd79c9b58fa57f4ebcb38798e7965ec59641a7e07de3cdce +SHA512 (apache-log4j-2.17.2-src.tar.gz) = ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 +SHA512 (apache-log4j-2.17.2-src.tar.gz.asc) = ad1d0ae72ea26bab286160f6e663cc4e25209f99169f1bb06366e112844282b3154d93d7d57df193527c2821d6e4ce7ad1d4f224d46326a3a1264e289c973a2e SHA512 (KEYS) = c149ef131b44cc261b9efc30510ab40837cd1a26d3c1167cd21be6e3ed1d158de4537b399a09824695fcc6e5280ba73f28f39cdf739815f534c535fd1c42d886 From 58cef2d7e791ef6db969b431884b2bad1b66e07a Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sun, 27 Feb 2022 21:38:18 -0500 Subject: [PATCH 42/84] Fixup changelog line in spec file --- log4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 1d369c1..6635f1e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -290,7 +290,7 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog * Sun Feb 27 2022 Paul Wouters - 2.17.2-1 -- Resolves: rhbz#log4j-2.17.2 is available (1.2 bridge bugfixes) +- Resolves: rhbz#2058949 log4j-2.17.2 is available (1.2 bridge bugfixes) * Sat Feb 05 2022 Jiri Vanek - 2.17.1-4 - Rebuilt for java-17-openjdk as system jdk From 38c27f06bfc24c0559a057a54bc41b2cb64d4f0b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 26 Apr 2022 21:28:21 +0200 Subject: [PATCH 43/84] Fix compatibility with Java 8 --- log4j.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 6635f1e..fb18998 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -206,6 +206,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :slf4j-ext %pom_remove_parent +# Make compiled code compatible with OpenJDK 8 +%pom_xpath_inject 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' "8" + %if %{with jp_minimal} %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui @@ -289,6 +292,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Tue Apr 26 2022 Mikolaj Izdebski - 2.17.2-2 +- Fix compatibility with Java 8 + * Sun Feb 27 2022 Paul Wouters - 2.17.2-1 - Resolves: rhbz#2058949 log4j-2.17.2 is available (1.2 bridge bugfixes) From 635d8cd72335b1cdbe70243ab187025ccf05e0ec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 26 Apr 2022 21:08:40 +0200 Subject: [PATCH 44/84] Onboard package into gating --- .fmf/version | 1 + gating.yaml | 8 ++++++++ plans/Smoke.java | 11 +++++++++++ plans/smoke.fmf | 8 ++++++++ 4 files changed, 28 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/Smoke.java create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..05d1cc5 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/Smoke.java b/plans/Smoke.java new file mode 100644 index 0000000..e9df839 --- /dev/null +++ b/plans/Smoke.java @@ -0,0 +1,11 @@ +import org.apache.logging.log4j.*; + +public class Smoke +{ + public static void main(String[] args) + { + Logger log = LogManager.getLogger(Smoke.class); + log.error("Hello from Log4J"); + System.out.println("SMOKE TEST COMPLETE"); + } +} diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..bc64702 --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,8 @@ +summary: Basic smoke test +prepare: + how: install + package: java-1.8.0-openjdk-devel +execute: + script: + - /usr/lib/jvm/java-1.8.0-openjdk/bin/javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java + - /usr/lib/jvm/java-1.8.0-openjdk/bin/java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke From ab22e681f54142b1065880c222e833b65668ba9e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 May 2022 15:25:37 +0200 Subject: [PATCH 45/84] Update test configuration --- ci.fmf | 1 + gating.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ci.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 05d1cc5..8653363 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,4 +5,4 @@ decision_contexts: - bodhi_update_push_testing - bodhi_update_push_stable rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} From 8f198644fc84033aa2ca642c552731f933f6ca8f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 46/84] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- log4j.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/log4j.spec b/log4j.spec index fb18998..eb2792a 100644 --- a/log4j.spec +++ b/log4j.spec @@ -5,6 +5,7 @@ Version: 2.17.2 Release: 2%{?dist} Summary: Java logging package BuildArch: noarch +ExclusiveArch: %{java_arches} noarch License: ASL 2.0 URL: https://logging.apache.org/%{name} From b2302665b38d44bc89dac5b6908e1795c47631b7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 May 2022 12:16:56 +0200 Subject: [PATCH 47/84] Remove unneeded obsoletes --- log4j.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/log4j.spec b/log4j.spec index eb2792a..44fcffd 100644 --- a/log4j.spec +++ b/log4j.spec @@ -73,9 +73,6 @@ Requires: javapackages-tools # - io.fabric8.kubernetes-client %endif -Obsoletes: %{name}-osgi < 2.9.1-4 -Obsoletes: %{name}-liquibase < 2.9.1-4 - %description Log4j is a tool to help the programmer output log statements to a variety of output targets. @@ -136,7 +133,6 @@ Use NoSQL databases such as MongoDB and CouchDB to append log messages. %package javadoc Summary: API documentation for %{name} -Obsoletes: %{name}-manual < %{version} %description javadoc %{summary}. From 0635f6f62d87a79456c900995a0ebd01eefd37d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:48:25 +0000 Subject: [PATCH 48/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 44fcffd..07f2565 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -289,6 +289,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.17.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Apr 26 2022 Mikolaj Izdebski - 2.17.2-2 - Fix compatibility with Java 8 From bef82dbdab44f5abc35c1a9b97362e8b23f8949d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 07:54:11 +0200 Subject: [PATCH 49/84] Enable javapackages test plan --- gating.yaml | 1 + plans/javapackages.fmf | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 plans/javapackages.fmf diff --git a/gating.yaml b/gating.yaml index 8653363..7b6e38f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -6,3 +6,4 @@ decision_contexts: - bodhi_update_push_stable rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 102f227966eabaf50f7be39c6d6cc463be6903a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 09:38:51 +0200 Subject: [PATCH 50/84] Refactor smoke test --- plans/smoke.fmf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index bc64702..32c8930 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,8 +1,14 @@ summary: Basic smoke test +discover: + how: shell + tests: + - name: /smoke/log-hello + test: | + PATH=/usr/lib/jvm/java-1.8.0-openjdk/bin:${PATH} + javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java + java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke prepare: how: install package: java-1.8.0-openjdk-devel execute: - script: - - /usr/lib/jvm/java-1.8.0-openjdk/bin/javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java - - /usr/lib/jvm/java-1.8.0-openjdk/bin/java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke + how: tmt From 23475b2de7554b1184cd13ada78b71e68a3fd8cf Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 13 Oct 2022 11:48:49 +0200 Subject: [PATCH 51/84] Remove glyphicons zip archive from source package --- .gitignore | 1 + generate-tarball.sh | 28 ++++++++++++++++++++++++++++ log4j.spec | 14 +++++++------- sources | 4 +--- 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index d17478d..ecabb93 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /apache-log4j-2.17.1-src.tar.gz.asc /apache-log4j-2.17.2-src.tar.gz /apache-log4j-2.17.2-src.tar.gz.asc +/log4j-2.17.2.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..ea8279b --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,28 @@ +#!/bin/bash +set -e + +name=log4j +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz.asc" -O "${name}-${version}.orig.tar.gz.asc" +wget "https://www.apache.org/dist/logging/KEYS" -O "${name}-${version}.keyring" + +# VERIFY +$(rpm -E '%{gpgverify}') --keyring="${name}-${version}.keyring" --signature="${name}-${version}.orig.tar.gz.asc" --data="${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete +find -name '*.zip' -delete +find -name '*.dll' -delete + +tar -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/log4j.spec b/log4j.spec index 07f2565..35f032c 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,21 +2,19 @@ Name: log4j Version: 2.17.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch License: ASL 2.0 URL: https://logging.apache.org/%{name} -Source0: https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz -Source1: https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz.asc -Source2: https://www.apache.org/dist/logging/KEYS + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch -BuildRequires: gnupg2 - BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) @@ -138,7 +136,6 @@ Summary: API documentation for %{name} %{summary}. %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n apache-%{name}-%{version}-src %autopatch -p1 @@ -289,6 +286,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Oct 13 2022 Marian Koncek - 2.17.2-4 +- Remove glyphicons zip archive from source package + * Thu Jul 21 2022 Fedora Release Engineering - 2.17.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index b0a3e84..9ba6b74 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (apache-log4j-2.17.2-src.tar.gz) = ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 -SHA512 (apache-log4j-2.17.2-src.tar.gz.asc) = ad1d0ae72ea26bab286160f6e663cc4e25209f99169f1bb06366e112844282b3154d93d7d57df193527c2821d6e4ce7ad1d4f224d46326a3a1264e289c973a2e -SHA512 (KEYS) = c149ef131b44cc261b9efc30510ab40837cd1a26d3c1167cd21be6e3ed1d158de4537b399a09824695fcc6e5280ba73f28f39cdf739815f534c535fd1c42d886 +SHA512 (log4j-2.17.2.tar.gz) = b441989438a57ce83f99a5f28ff739155b41b98813687659ba26781610faa9209785d3264b53aa244a28259f190b62ab7df6670015233522233c1c032b43fcce From 855a63415fcb4a6d79c760c9cd8d66b79f771bca Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 13 Oct 2022 11:49:30 +0200 Subject: [PATCH 52/84] Fix /usr/share/java/log4j file listed twice in %files section --- log4j.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 35f032c..4e98c88 100644 --- a/log4j.spec +++ b/log4j.spec @@ -267,7 +267,6 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %endif %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE.txt NOTICE.txt %files slf4j -f .mfiles-slf4j From 147e4b7e66961277f86a6810ec9087821c6ddac5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 13 Oct 2022 16:17:51 +0200 Subject: [PATCH 53/84] Remove the rest of glyphicons files --- generate-tarball.sh | 1 + log4j.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index ea8279b..6959389 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -22,6 +22,7 @@ find -name '*.jar' -delete find -name '*.class' -delete find -name '*.zip' -delete find -name '*.dll' -delete +rm -rf "apache-log4j-${version}-src/src/site" tar -czf "../${name}-${version}.tar.gz" * popd diff --git a/log4j.spec b/log4j.spec index 4e98c88..8203962 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -285,6 +285,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Oct 13 2022 Marian Koncek - 2.17.2-5 +- Remove the rest of glyphicons files + * Thu Oct 13 2022 Marian Koncek - 2.17.2-4 - Remove glyphicons zip archive from source package diff --git a/sources b/sources index 9ba6b74..a2a4e6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (log4j-2.17.2.tar.gz) = b441989438a57ce83f99a5f28ff739155b41b98813687659ba26781610faa9209785d3264b53aa244a28259f190b62ab7df6670015233522233c1c032b43fcce +SHA512 (log4j-2.17.2.tar.gz) = fd76960224f3441cdbe43a4326bbcf2007d4680e1a29438c00a056376c140d827ed4923df2c97fee4fb567687b93e79f7745403d32dd071c91cd347112f2f303 From 05d12eeb1b91aace463006fffb94463bf4d00dbc Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 24 Oct 2022 13:47:15 +0200 Subject: [PATCH 54/84] Re-add log4j-web subpackage --- log4j.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/log4j.spec b/log4j.spec index 8203962..257966a 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -23,6 +23,7 @@ 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(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache:apache:pom:) @@ -44,7 +45,6 @@ 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(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.apache.logging:logging-parent:pom:) @@ -87,6 +87,12 @@ Summary: Apache Log4j Commons Logging Bridge %description jcl Apache Log4j Commons Logging Bridge. +%package web +Summary: Apache Log4j Web + +%description web +Support for Log4j in a web servlet container. + %if %{without jp_minimal} %package osgi Summary: Apache Log4J Core OSGi Bundles @@ -108,12 +114,6 @@ Requires: java-devel Swing-based client for remotely editing the log4j configuration and remotely monitoring StatusLogger output. Includes a JConsole plug-in. -%package web -Summary: Apache Log4j Web - -%description web -Support for Log4j in a web servlet container. - %package bom Summary: Apache Log4j BOM @@ -207,7 +207,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui %pom_disable_module %{name}-bom -%pom_disable_module %{name}-web %pom_disable_module %{name}-iostreams %pom_disable_module %{name}-jul %pom_disable_module %{name}-core-its @@ -271,9 +270,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 %if %{without jp_minimal} %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 @@ -285,6 +284,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Mon Oct 24 2022 Marian Koncek - 2.17.2-6 +- Re-add log4j-web subpackage + * Thu Oct 13 2022 Marian Koncek - 2.17.2-5 - Remove the rest of glyphicons files From 6e5af8ea01cfaf9515128d35a9b666f914c15642 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:13:48 +0000 Subject: [PATCH 55/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 257966a..c0ad7b5 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -284,6 +284,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.17.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Oct 24 2022 Marian Koncek - 2.17.2-6 - Re-add log4j-web subpackage From 76e5c2c25842ecc2d0e6b5f6a3c946edb330d5de Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 Feb 2023 15:18:37 +0100 Subject: [PATCH 56/84] Remove dependency on jackson in jp_minimal mode --- log4j.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/log4j.spec b/log4j.spec index c0ad7b5..6683384 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -16,9 +16,6 @@ Source0: %{name}-%{version}.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch BuildRequires: maven-local -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) -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.activation:jakarta.activation) BuildRequires: mvn(com.sun.mail:javax.mail) @@ -26,7 +23,6 @@ BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache:apache: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) @@ -34,10 +30,10 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) %if %{without jp_minimal} BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml) @@ -45,6 +41,7 @@ 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.servlet:jakarta.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.apache.logging:logging-parent:pom:) @@ -207,6 +204,7 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %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 %pom_disable_module %{name}-core-its @@ -216,9 +214,13 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-appserver %pom_disable_module %{name}-spring-cloud-config %pom_disable_module %{name}-spring-boot +%pom_disable_module %{name}-docker %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 @@ -227,7 +229,7 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :jeromq %pom_remove_dep -r :commons-csv -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/{jackson,config/yaml,config/json,parser} rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/{db,mom,nosql} rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java rm log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/*Xml*.java @@ -284,6 +286,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Fri Feb 24 2023 Mikolaj Izdebski - 2.17.2-8 +- Remove dependency on jackson in jp_minimal mode + * Thu Jan 19 2023 Fedora Release Engineering - 2.17.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7a07222e56cdb11ef3d283848a616aaa4ca13f57 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 17 Mar 2023 11:36:30 +0100 Subject: [PATCH 57/84] Re-enable javadoc package --- log4j.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/log4j.spec b/log4j.spec index 6683384..902fdbd 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -258,7 +258,7 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %build # missing test deps (mockejb) -%mvn_build -f -j +%mvn_build -f %install %mvn_install @@ -281,11 +281,14 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %{_bindir}/%{name}-jmx %endif -#%%files javadoc -f .mfiles-javadoc -#%%doc LICENSE.txt NOTICE.txt +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt %changelog +* Fri Mar 17 2023 Mikolaj Izdebski - 2.17.2-9 +- Re-enable javadoc package + * Fri Feb 24 2023 Mikolaj Izdebski - 2.17.2-8 - Remove dependency on jackson in jp_minimal mode From 0b882bc5f006d5d256c557c3899df96ceb9f80dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:59:04 +0000 Subject: [PATCH 58/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 902fdbd..2d3f981 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -286,6 +286,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.17.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Mar 17 2023 Mikolaj Izdebski - 2.17.2-9 - Re-enable javadoc package From c6a5b9dfb577a2731ccd2ecb5fd23f5ae73f517a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 9 Aug 2023 16:34:10 +0200 Subject: [PATCH 59/84] Implement bootstrap mode --- log4j.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/log4j.spec b/log4j.spec index 2d3f981..b0bca9d 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,3 +1,4 @@ +%bcond_with bootstrap %bcond_without jp_minimal Name: log4j @@ -15,6 +16,9 @@ Source0: %{name}-%{version}.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(com.sun.activation:jakarta.activation) @@ -30,6 +34,7 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) +%endif %if %{without jp_minimal} BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) From 7c32905f7b452342075b62a33b5ee7dd690492e1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 21 Aug 2023 13:21:03 +0200 Subject: [PATCH 60/84] Update license field to SPDX format --- log4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index b0bca9d..fc76cb1 100644 --- a/log4j.spec +++ b/log4j.spec @@ -7,7 +7,7 @@ Release: 10%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch -License: ASL 2.0 +License: Apache-2.0 URL: https://logging.apache.org/%{name} From 5a58514871bf49dc81f652926b573f50bffff909 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 30 Mar 2023 16:03:24 +0200 Subject: [PATCH 61/84] 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 From 2f401fd7d7d58cd5957383f974eac64495d38760 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 22 Aug 2023 12:56:50 +0200 Subject: [PATCH 62/84] Do not install zip files --- log4j.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 34148d6..753a913 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -264,6 +264,8 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %mvn_package :log4j-core-its __noinstall +%mvn_package ::zip: __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 @@ -307,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Tue Aug 22 2023 Marian Koncek - 2.20.0-2 +- Do not install zip files + * Mon Aug 21 2023 Marian Koncek - 2.20.0-1 - Update to upstream version 2.20.0 From 08a9f519416b42e2197d51a14b4f932860c76694 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:58:22 +0200 Subject: [PATCH 63/84] Rebuild --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 753a913..00dc0f0 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -309,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 2.20.0-3 +- Rebuild + * Tue Aug 22 2023 Marian Koncek - 2.20.0-2 - Do not install zip files From 87910cfe55a5ba0242ba291a89cb9130c7cbc86d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 64/84] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 7eb94a38a6b08f0d17b1f8fe215294e1e40dee57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:08:54 +0000 Subject: [PATCH 65/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 00dc0f0..1ab3b2e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -309,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.20.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 2.20.0-3 - Rebuild From 559863b3bdb72e458855ef3deefd67104f3c0be6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:37:28 +0000 Subject: [PATCH 66/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 1ab3b2e..073f17a 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -309,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.20.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.20.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6ce54894862c8f1c1893898d8d044a51f28caccf Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:24:14 +0100 Subject: [PATCH 67/84] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 073f17a..cc92ba2 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -309,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 2.20.0-6 +- bump of release for for java-21-openjdk as system jdk + * Thu Jan 25 2024 Fedora Release Engineering - 2.20.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ee2793e5b38a9232c019fb8d52828260f3392518 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:55:50 +0100 Subject: [PATCH 68/84] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index cc92ba2..1817fc1 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -309,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 2.20.0-7 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 2.20.0-6 - bump of release for for java-21-openjdk as system jdk From 37b6592d15ba1b9fefefc966b281fca76bcdf4df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Jun 2024 14:24:24 +0200 Subject: [PATCH 69/84] Extract smoke tests out of test plan We want tests to be stored directly in the file system instead of being embedded into tests plans. --- plans/smoke.fmf | 11 +---------- {plans => tests/Sanity/smoke}/Smoke.java | 0 tests/Sanity/smoke/main.fmf | 6 ++++++ tests/Sanity/smoke/runtest.sh | 18 ++++++++++++++++++ tests/main.fmf | 4 ++++ 5 files changed, 29 insertions(+), 10 deletions(-) rename {plans => tests/Sanity/smoke}/Smoke.java (100%) create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh create mode 100644 tests/main.fmf diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 32c8930..a1e7bfd 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,14 +1,5 @@ summary: Basic smoke test discover: - how: shell - tests: - - name: /smoke/log-hello - test: | - PATH=/usr/lib/jvm/java-1.8.0-openjdk/bin:${PATH} - javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java - java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke -prepare: - how: install - package: java-1.8.0-openjdk-devel + how: fmf execute: how: tmt diff --git a/plans/Smoke.java b/tests/Sanity/smoke/Smoke.java similarity index 100% rename from plans/Smoke.java rename to tests/Sanity/smoke/Smoke.java diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..e8a8265 --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,6 @@ +summary: log4j smoke test +description: | + Test basic functionality of log4j. +require: + - log4j + - java-21-openjdk-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..2ebc06f --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + rlPhaseStartTest "hello world" + rlAssertRpm log4j + java_home=/usr/lib/jvm/java-21-openjdk/bin + jar=/usr/share/java/jctools/jctools-core.jar + rlRun "${java_home}/javac -cp /usr/share/java/log4j/log4j-api.jar -d out Smoke.java" + rlRun -s "${java_home}/java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:out Smoke 2>&1" + rlAssertGrep "ERROR Smoke - Hello from Log4J" $rlRun_LOG + rlAssertGrep "SMOKE TEST COMPLETE" $rlRun_LOG + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..99fd67e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0 From e2219eac0e7c7fa82b70377d4a936be6225ab5a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:55:35 +0000 Subject: [PATCH 70/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- log4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index 1817fc1..0c43453 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -309,6 +309,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.20.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 2.20.0-7 - Rebuilt for java-21-openjdk as system jdk From 0fb200fe149f1406f5b988c9882be464e346a869 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 10:46:22 +0200 Subject: [PATCH 71/84] Install license files in licensedir instead of docdir --- log4j.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/log4j.spec b/log4j.spec index 0c43453..fdf666e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -292,7 +292,7 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %endif %files -f .mfiles -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %files slf4j -f .mfiles-slf4j %files jcl -f .mfiles-jcl @@ -306,9 +306,12 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %endif %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 24 2024 Mikolaj Izdebski - 2.20.0-9 +- Install license files in licensedir instead of docdir + * Thu Jul 18 2024 Fedora Release Engineering - 2.20.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9b2d65ce37a91d8870c07b1b44d2303623bd86a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 72/84] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 40c65b758ada0bafc9807f23836560b0a7dde45c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 73/84] Switch from %setup to %autosetup --- log4j.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/log4j.spec b/log4j.spec index fdf666e..ad50a26 100644 --- a/log4j.spec +++ b/log4j.spec @@ -137,9 +137,7 @@ Summary: API documentation for %{name} %{summary}. %prep -%setup -q -n apache-%{name}-%{version}-src -%patch 1 -p1 -%patch 2 -p1 +%autosetup -p1 -C %pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :maven-site-plugin From 4e35a74087bf6f734fd82dbbf0898fd5c8498963 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 74/84] Switch to non-numdered patches --- log4j.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/log4j.spec b/log4j.spec index ad50a26..a2c4b8b 100644 --- a/log4j.spec +++ b/log4j.spec @@ -14,8 +14,8 @@ URL: https://logging.apache.org/%{name} # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -Patch1: logging-log4j-Remove-unsupported-EventDataConverter.patch -Patch2: 0002-Remove-usage-of-toolchains.patch +Patch: logging-log4j-Remove-unsupported-EventDataConverter.patch +Patch: 0002-Remove-usage-of-toolchains.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From f714242f80bb9a99a7e9be2f3b9a3adbc6690926 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:10 +0200 Subject: [PATCH 75/84] Convert to %autorelease and %autochangelog --- changelog | 399 ++++++++++++++++++++++++++++++++++++++++++++++++++++ log4j.spec | 402 +---------------------------------------------------- 2 files changed, 401 insertions(+), 400 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..d9631f6 --- /dev/null +++ b/changelog @@ -0,0 +1,399 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 2.20.0-9 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 2.20.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 2.20.0-7 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.20.0-6 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 2.20.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.20.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.20.0-3 +- Rebuild + +* Tue Aug 22 2023 Marian Koncek - 2.20.0-2 +- Do not install zip files + +* 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 + +* Fri Mar 17 2023 Mikolaj Izdebski - 2.17.2-9 +- Re-enable javadoc package + +* Fri Feb 24 2023 Mikolaj Izdebski - 2.17.2-8 +- Remove dependency on jackson in jp_minimal mode + +* Thu Jan 19 2023 Fedora Release Engineering - 2.17.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Oct 24 2022 Marian Koncek - 2.17.2-6 +- Re-add log4j-web subpackage + +* Thu Oct 13 2022 Marian Koncek - 2.17.2-5 +- Remove the rest of glyphicons files + +* Thu Oct 13 2022 Marian Koncek - 2.17.2-4 +- Remove glyphicons zip archive from source package + +* Thu Jul 21 2022 Fedora Release Engineering - 2.17.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Apr 26 2022 Mikolaj Izdebski - 2.17.2-2 +- Fix compatibility with Java 8 + +* Sun Feb 27 2022 Paul Wouters - 2.17.2-1 +- Resolves: rhbz#2058949 log4j-2.17.2 is available (1.2 bridge bugfixes) + +* Sat Feb 05 2022 Jiri Vanek - 2.17.1-4 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 2.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 06 2022 Malcolm Inglis - 2.17.1-2 +- Enable GPG signature verification of sources + +* Tue Dec 28 2021 Paul Wouters - 2.17.1-1 +- Update log4j to 2.17.1 for CVE-2021-44832 RCE via JDBC Appender (when attacker controls config) + +* Sat Dec 18 2021 Paul Wouters - 2.17.0-1 +- Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack + +* Mon Dec 13 2021 Paul Wouters - 2.16.0-1 +- Update log4j to 2.16.0 - Disables JNDI by default + +* Sun Dec 12 2021 Sérgio Basto - 2.15.0-1 +- Update log4j to 2.15.0 (#2030907) +- Security fix for CVE-2021-44228 (#2030945) + +* Sun Aug 01 2021 Sérgio Basto - 2.14.1-1 +- Update to 2.14.1 +- Disable javadoc (#1988896) +- Build with jansi-2 +- Remove deps on slf4j-ext (no longer available in Fedora 35) + +* Thu Jul 22 2021 Fedora Release Engineering - 2.13.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 14 2020 Jerry James - 2.13.3-2 +- Update jansi dep to jansi1 + +* Thu Aug 20 2020 Fabio Valentini - 2.13.3-1 +- Update to version 2.13.3. + +* Tue Jul 28 2020 Fedora Release Engineering - 2.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Fabio Valentini - 2.13.1-3 +- Add missing javax.activation dependency. + +* Sat Jul 11 2020 Jiri Vanek - 2.13.1-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 2.13.1-1 +- Update to version 2.13.1. +- Drop upstream patch that's included in the new release. +- Rebase patch for removing the unsupported SLF4J EventDataConverter. + +* Thu Jan 30 2020 Fabio Valentini - 2.13.0-3 +- Add upstream patch for compatibility with the latest slf4j versions. + +* Wed Jan 29 2020 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 06 2020 Alexander Scheel - 2.13.0-1 +- Rebase to version 2.13.0 + +* Sun Oct 20 2019 Fabio Valentini - 2.12.1-1 +- Update to version 2.12.1. + +* Mon Sep 30 2019 Fabio Valentini - 2.12.0-1 +- Update to version 2.12.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 2.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 11 2019 Miro Hrončok - 2.11.1-4 +- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui + +* Fri Feb 01 2019 Fedora Release Engineering - 2.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 31 2018 Severin Gehwolf - 2.11.1-2 +- Add explicit requirement on javapackages-tools for log4j-jmx + script. See RHBZ#1600426. + +* Tue Aug 07 2018 Michael Simacek - 2.11.1-1 +- Update to upstream version 2.11.1 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 28 2018 Michael Simacek - 2.9.1-4 +- Disable liquibase to fix FTBFS + +* Thu Feb 08 2018 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Oct 13 2017 Michael Simacek - 2.9.1-2 +- Update to upstream version 2.9.1 + +* Mon Sep 18 2017 Michael Simacek - 2.9.0-1 +- Update to upstream version 2.9.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 06 2017 Michael Simacek - 2.8.2-1 +- Update to upstream version 2.8.2 + +* Wed Mar 29 2017 Michael Simacek - 2.8.1-1 +- Update to upstream version 2.8.1 + +* Wed Mar 15 2017 Michael Simacek - 2.7-4 +- Add jp_minimal conditional + +* Fri Feb 10 2017 Fedora Release Engineering - 2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 2.7-2 +- Cleanup osgi parts +- Add conditional for nosql + +* Wed Nov 09 2016 Michael Simacek - 2.7-1 +- Update to upstream version 2.7 +- Remove stuff marked as "Remove in F24" + +* Thu Jun 23 2016 Michael Simacek - 2.6.1-1 +- Update to upstream version 2.6.1 + +* Thu Jun 16 2016 Mikolaj Izdebski - 2.5-4 +- Remove RAT depenency from BOM package + +* Mon May 23 2016 Michael Simacek - 2.5-3 +- Remove maven-remote-resources-plugin to fix FTBFS + +* Mon Feb 15 2016 Michael Simacek - 2.5-2 +- Split log4j-liquibase into separate subpackage + +* Mon Feb 15 2016 Michael Simacek - 2.5-1 +- Update to upstream version 2.5 + +* Thu Feb 04 2016 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 2 2015 Mikolaj Izdebski - 2.3-1 +- Update to upstream version 2.3 + +* Thu Feb 26 2015 Mikolaj Izdebski - 2.2-1 +- Update to upstream version 2.2 + +* Mon Jan 19 2015 Michael Simacek - 2.0-2 +- Remove site-plugin from all poms + +* Fri Jul 18 2014 Michael Simacek 2.0-1 +- Update to upstream version 2.0 +- Remove osgi subpackage (osgi parts were moved to corresponding artifacts) +- Add web, bom, nosql subpackages (new) + +* Sat Jun 07 2014 Fedora Release Engineering - 2.0-0.3.rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 16 2014 Mikolaj Izdebski - 2.0-0.2.rc1 +- Drop provides for log4j-manual + +* Fri May 09 2014 Michael Simacek - 0:2.0-0.1.rc1 +- Update to upstream version 2.0-rc1 +- Split into subpackages +- Remove logfactor and chainsaw scripts which are no longer shipped +- Remove XML catalogs which are no longer shipped + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.2.17-16 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Feb 20 2014 Michael Simacek - 0:1.2.17-15 +- Set javamail and geronimo-jms dependency scopes to provided (removes requires) + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2.17-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 11 2013 Michal Srb - 0:1.2.17-13 +- Enable tests +- Fix BR + +* Tue May 14 2013 Ville Skyttä - 0:1.2.17-12 +- Add DTD public id to XML and SGML catalogs. + +* Mon Apr 29 2013 Mikolaj Izdebski - 0:1.2.17-11 +- Remove unneeded BR: maven-idea-plugin + +* Thu Apr 11 2013 Mikolaj Izdebski - 0:1.2.17-10 +- Fix manpage names, thanks to Michal Srb for reporting + +* Mon Apr 8 2013 Mikolaj Izdebski - 0:1.2.17-9 +- Reindex sources in more sensible way +- Add manual pages; resolves: rhbz#949413 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.2.17-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:1.2.17-7 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Jan 21 2013 Mikolaj Izdebski - 0:1.2.17-6 +- Build aggregated javadocs with xmvn + +* Fri Jan 18 2013 Michal Srb - 0:1.2.17-5 +- Build with xmvn + +* Mon Sep 24 2012 Mikolaj Izdebski - 0:1.2.17-4 +- Generate javadocs without maven skin + +* Thu Jul 19 2012 Fedora Release Engineering - 0:1.2.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 14 2012 Stanislav Ochotnicky - 0:1.2.17-2 +- Remove "uses" OSGI directives from MANIFEST (related #826776) + +* Mon Jun 04 2012 Stanislav Ochotnicky - 0:1.2.17-1 +- Update to latest version +- Change OSGI bundle symbolic name to org.apache.log4j +- Resolves #826776 + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Alexander Kurtakov 0:1.2.16-10 +- Remove duplicate import-package declaration. +- Adapt to current guidelines. +- Remove no longer needed patches. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Ville Skyttä - 0:1.2.16-8 +- Drop executable file mode bits from icons. + +* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.2.16-7 +- Use package instead of install mvn target to fix build + +* Thu Dec 16 2010 Alexander Kurtakov 0:1.2.16-6 +- Do not require jaxp_parser_impl. Maven build is not using it all and it's provided by every Java5 JVM. + +* Thu Dec 9 2010 Stanislav Ochotnicky - 0:1.2.16-5 +- Add patch to fix ant groupId +- Versionless jars & javadocs + +* Tue Sep 7 2010 Stanislav Ochotnicky - 0:1.2.16-4 +- Fix BRs to include ant-junit +- Fix changed path for javadocs after build run + +* Thu Jul 8 2010 Stanislav Ochotnicky - 0:1.2.16-3 +- Add license to javadoc and manual subpackages + +* Fri May 28 2010 Stanislav Ochotnicky - 0:1.2.16-2 +- Install pom file +- Trim changelog +- Add jpackage-utils to javadoc Requires + +* Mon May 17 2010 Stanislav Ochotnicky - 0:1.2.16-1 +- Complete re-working of whole ebuild to work with maven +- Rebase to new version +- Drop gcj support + +* Sat Jul 25 2009 Fedora Release Engineering - 0:1.2.14-6.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.2.14-5.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.14-4.3 +- drop repotag + +* Thu May 29 2008 Tom "spot" Callaway - 0:1.2.14-4jpp.2 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.14-4jpp.1 +- Autorebuild for GCC 4.3 + +* Sat May 26 2007 Vivek Lakshmanan 0:1.2.14-3jpp.1 +- Upgrade to 1.2.14 +- Modify the categories for the .desktop files so they are only + displayed under the development/programming menus +- Resolves: bug 241447 + +* Fri May 11 2007 Jason Corley 0:1.2.14-3jpp +- rebuild through mock and centos 4 +- replace vendor and distribution with macros + +* Fri Apr 20 2007 Ralph Apel - 0:1.2.14-2jpp +- Patch to allow build of org.apache.log4j.jmx.* with mx4j +- Restore Vendor: and Distribution: + +* Sat Feb 17 2007 Fernando Nasser - 0:1.2.14-1jpp +- Upgrade + +* Mon Feb 12 2007 Ralph Apel - 0:1.2.13-4jpp +- Add bootstrap option to build core + +* Wed Aug 09 2006 Vivek Lakshmanan - 0:1.2.13-3jpp.2 +- Remove patch for BZ #157585 because it doesnt seem to be needed anymore. + +* Tue Aug 08 2006 Vivek Lakshmanan - 0:1.2.13-3jpp.1 +- Re-sync with latest from JPP. +- Update patch for BZ #157585 to apply cleanly. +- Partially adopt new naming convention. + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.2.13-2jpp_2fc +- Rebuilt + +* Fri Jul 21 2006 Vivek Lakshmanan - 0:1.2.13-2jpp_1fc +- Merge spec and patches with latest from JPP. +- Clean source tar ball off prebuilt jars and classes. +- Use classpathx-jaf and jms for buildrequires for the time being. + +* Wed Jul 12 2006 Jesse Keating - 0:1.2.8-7jpp_9fc +- rebuild + +* Mon Mar 6 2006 Jeremy Katz - 0:1.2.8-7jpp_8fc +- fix scriptlet spew + +* Wed Dec 21 2005 Jesse Keating 0:1.2.8-7jpp7fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 3 2005 Archit Shah 0:1.2.8-7jpp_6fc +- Reenable building of example that uses rmic + +* Wed Jun 22 2005 Gary Benson 0:1.2.8-7jpp_5fc +- Reenable building of classes that require jms. +- Remove classes and jarfiles from the tarball. + +* Mon May 23 2005 Gary Benson 0:1.2.8-7jpp_4fc +- Work around chainsaw failure (#157585). + +* Tue Jan 11 2005 Gary Benson 0:1.2.8-7jpp_3fc +- Reenable building of classes that require javax.swing (#130006). + +* Thu Nov 4 2004 Gary Benson 0:1.2.8-7jpp_2fc +- Build into Fedora. diff --git a/log4j.spec b/log4j.spec index a2c4b8b..df20e62 100644 --- a/log4j.spec +++ b/log4j.spec @@ -3,7 +3,7 @@ Name: log4j Version: 2.20.0 -Release: 9%{?dist} +Release: %autorelease Summary: Java logging package BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -307,402 +307,4 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %license LICENSE.txt NOTICE.txt %changelog -* Wed Jul 24 2024 Mikolaj Izdebski - 2.20.0-9 -- Install license files in licensedir instead of docdir - -* Thu Jul 18 2024 Fedora Release Engineering - 2.20.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 2.20.0-7 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 2.20.0-6 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 2.20.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.20.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 2.20.0-3 -- Rebuild - -* Tue Aug 22 2023 Marian Koncek - 2.20.0-2 -- Do not install zip files - -* 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 - -* Fri Mar 17 2023 Mikolaj Izdebski - 2.17.2-9 -- Re-enable javadoc package - -* Fri Feb 24 2023 Mikolaj Izdebski - 2.17.2-8 -- Remove dependency on jackson in jp_minimal mode - -* Thu Jan 19 2023 Fedora Release Engineering - 2.17.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Oct 24 2022 Marian Koncek - 2.17.2-6 -- Re-add log4j-web subpackage - -* Thu Oct 13 2022 Marian Koncek - 2.17.2-5 -- Remove the rest of glyphicons files - -* Thu Oct 13 2022 Marian Koncek - 2.17.2-4 -- Remove glyphicons zip archive from source package - -* Thu Jul 21 2022 Fedora Release Engineering - 2.17.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Apr 26 2022 Mikolaj Izdebski - 2.17.2-2 -- Fix compatibility with Java 8 - -* Sun Feb 27 2022 Paul Wouters - 2.17.2-1 -- Resolves: rhbz#2058949 log4j-2.17.2 is available (1.2 bridge bugfixes) - -* Sat Feb 05 2022 Jiri Vanek - 2.17.1-4 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 2.17.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jan 06 2022 Malcolm Inglis - 2.17.1-2 -- Enable GPG signature verification of sources - -* Tue Dec 28 2021 Paul Wouters - 2.17.1-1 -- Update log4j to 2.17.1 for CVE-2021-44832 RCE via JDBC Appender (when attacker controls config) - -* Sat Dec 18 2021 Paul Wouters - 2.17.0-1 -- Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack - -* Mon Dec 13 2021 Paul Wouters - 2.16.0-1 -- Update log4j to 2.16.0 - Disables JNDI by default - -* Sun Dec 12 2021 Sérgio Basto - 2.15.0-1 -- Update log4j to 2.15.0 (#2030907) -- Security fix for CVE-2021-44228 (#2030945) - -* Sun Aug 01 2021 Sérgio Basto - 2.14.1-1 -- Update to 2.14.1 -- Disable javadoc (#1988896) -- Build with jansi-2 -- Remove deps on slf4j-ext (no longer available in Fedora 35) - -* Thu Jul 22 2021 Fedora Release Engineering - 2.13.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.13.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 14 2020 Jerry James - 2.13.3-2 -- Update jansi dep to jansi1 - -* Thu Aug 20 2020 Fabio Valentini - 2.13.3-1 -- Update to version 2.13.3. - -* Tue Jul 28 2020 Fedora Release Engineering - 2.13.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 20 2020 Fabio Valentini - 2.13.1-3 -- Add missing javax.activation dependency. - -* Sat Jul 11 2020 Jiri Vanek - 2.13.1-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Mar 02 2020 Fabio Valentini - 2.13.1-1 -- Update to version 2.13.1. -- Drop upstream patch that's included in the new release. -- Rebase patch for removing the unsupported SLF4J EventDataConverter. - -* Thu Jan 30 2020 Fabio Valentini - 2.13.0-3 -- Add upstream patch for compatibility with the latest slf4j versions. - -* Wed Jan 29 2020 Fedora Release Engineering - 2.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 06 2020 Alexander Scheel - 2.13.0-1 -- Rebase to version 2.13.0 - -* Sun Oct 20 2019 Fabio Valentini - 2.12.1-1 -- Update to version 2.12.1. - -* Mon Sep 30 2019 Fabio Valentini - 2.12.0-1 -- Update to version 2.12.0. - -* Thu Jul 25 2019 Fedora Release Engineering - 2.11.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 11 2019 Miro Hrončok - 2.11.1-4 -- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui - -* Fri Feb 01 2019 Fedora Release Engineering - 2.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 31 2018 Severin Gehwolf - 2.11.1-2 -- Add explicit requirement on javapackages-tools for log4j-jmx - script. See RHBZ#1600426. - -* Tue Aug 07 2018 Michael Simacek - 2.11.1-1 -- Update to upstream version 2.11.1 - -* Fri Jul 13 2018 Fedora Release Engineering - 2.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon May 28 2018 Michael Simacek - 2.9.1-4 -- Disable liquibase to fix FTBFS - -* Thu Feb 08 2018 Fedora Release Engineering - 2.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Oct 13 2017 Michael Simacek - 2.9.1-2 -- Update to upstream version 2.9.1 - -* Mon Sep 18 2017 Michael Simacek - 2.9.0-1 -- Update to upstream version 2.9.0 - -* Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Apr 06 2017 Michael Simacek - 2.8.2-1 -- Update to upstream version 2.8.2 - -* Wed Mar 29 2017 Michael Simacek - 2.8.1-1 -- Update to upstream version 2.8.1 - -* Wed Mar 15 2017 Michael Simacek - 2.7-4 -- Add jp_minimal conditional - -* Fri Feb 10 2017 Fedora Release Engineering - 2.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Michael Simacek - 2.7-2 -- Cleanup osgi parts -- Add conditional for nosql - -* Wed Nov 09 2016 Michael Simacek - 2.7-1 -- Update to upstream version 2.7 -- Remove stuff marked as "Remove in F24" - -* Thu Jun 23 2016 Michael Simacek - 2.6.1-1 -- Update to upstream version 2.6.1 - -* Thu Jun 16 2016 Mikolaj Izdebski - 2.5-4 -- Remove RAT depenency from BOM package - -* Mon May 23 2016 Michael Simacek - 2.5-3 -- Remove maven-remote-resources-plugin to fix FTBFS - -* Mon Feb 15 2016 Michael Simacek - 2.5-2 -- Split log4j-liquibase into separate subpackage - -* Mon Feb 15 2016 Michael Simacek - 2.5-1 -- Update to upstream version 2.5 - -* Thu Feb 04 2016 Fedora Release Engineering - 2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 2 2015 Mikolaj Izdebski - 2.3-1 -- Update to upstream version 2.3 - -* Thu Feb 26 2015 Mikolaj Izdebski - 2.2-1 -- Update to upstream version 2.2 - -* Mon Jan 19 2015 Michael Simacek - 2.0-2 -- Remove site-plugin from all poms - -* Fri Jul 18 2014 Michael Simacek 2.0-1 -- Update to upstream version 2.0 -- Remove osgi subpackage (osgi parts were moved to corresponding artifacts) -- Add web, bom, nosql subpackages (new) - -* Sat Jun 07 2014 Fedora Release Engineering - 2.0-0.3.rc1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 16 2014 Mikolaj Izdebski - 2.0-0.2.rc1 -- Drop provides for log4j-manual - -* Fri May 09 2014 Michael Simacek - 0:2.0-0.1.rc1 -- Update to upstream version 2.0-rc1 -- Split into subpackages -- Remove logfactor and chainsaw scripts which are no longer shipped -- Remove XML catalogs which are no longer shipped - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.2.17-16 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Feb 20 2014 Michael Simacek - 0:1.2.17-15 -- Set javamail and geronimo-jms dependency scopes to provided (removes requires) - -* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2.17-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 11 2013 Michal Srb - 0:1.2.17-13 -- Enable tests -- Fix BR - -* Tue May 14 2013 Ville Skyttä - 0:1.2.17-12 -- Add DTD public id to XML and SGML catalogs. - -* Mon Apr 29 2013 Mikolaj Izdebski - 0:1.2.17-11 -- Remove unneeded BR: maven-idea-plugin - -* Thu Apr 11 2013 Mikolaj Izdebski - 0:1.2.17-10 -- Fix manpage names, thanks to Michal Srb for reporting - -* Mon Apr 8 2013 Mikolaj Izdebski - 0:1.2.17-9 -- Reindex sources in more sensible way -- Add manual pages; resolves: rhbz#949413 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:1.2.17-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 0:1.2.17-7 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Mon Jan 21 2013 Mikolaj Izdebski - 0:1.2.17-6 -- Build aggregated javadocs with xmvn - -* Fri Jan 18 2013 Michal Srb - 0:1.2.17-5 -- Build with xmvn - -* Mon Sep 24 2012 Mikolaj Izdebski - 0:1.2.17-4 -- Generate javadocs without maven skin - -* Thu Jul 19 2012 Fedora Release Engineering - 0:1.2.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 14 2012 Stanislav Ochotnicky - 0:1.2.17-2 -- Remove "uses" OSGI directives from MANIFEST (related #826776) - -* Mon Jun 04 2012 Stanislav Ochotnicky - 0:1.2.17-1 -- Update to latest version -- Change OSGI bundle symbolic name to org.apache.log4j -- Resolves #826776 - -* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2.16-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Oct 28 2011 Alexander Kurtakov 0:1.2.16-10 -- Remove duplicate import-package declaration. -- Adapt to current guidelines. -- Remove no longer needed patches. - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2.16-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Ville Skyttä - 0:1.2.16-8 -- Drop executable file mode bits from icons. - -* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.2.16-7 -- Use package instead of install mvn target to fix build - -* Thu Dec 16 2010 Alexander Kurtakov 0:1.2.16-6 -- Do not require jaxp_parser_impl. Maven build is not using it all and it's provided by every Java5 JVM. - -* Thu Dec 9 2010 Stanislav Ochotnicky - 0:1.2.16-5 -- Add patch to fix ant groupId -- Versionless jars & javadocs - -* Tue Sep 7 2010 Stanislav Ochotnicky - 0:1.2.16-4 -- Fix BRs to include ant-junit -- Fix changed path for javadocs after build run - -* Thu Jul 8 2010 Stanislav Ochotnicky - 0:1.2.16-3 -- Add license to javadoc and manual subpackages - -* Fri May 28 2010 Stanislav Ochotnicky - 0:1.2.16-2 -- Install pom file -- Trim changelog -- Add jpackage-utils to javadoc Requires - -* Mon May 17 2010 Stanislav Ochotnicky - 0:1.2.16-1 -- Complete re-working of whole ebuild to work with maven -- Rebase to new version -- Drop gcj support - -* Sat Jul 25 2009 Fedora Release Engineering - 0:1.2.14-6.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.2.14-5.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.14-4.3 -- drop repotag - -* Thu May 29 2008 Tom "spot" Callaway - 0:1.2.14-4jpp.2 -- fix license tag - -* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.14-4jpp.1 -- Autorebuild for GCC 4.3 - -* Sat May 26 2007 Vivek Lakshmanan 0:1.2.14-3jpp.1 -- Upgrade to 1.2.14 -- Modify the categories for the .desktop files so they are only - displayed under the development/programming menus -- Resolves: bug 241447 - -* Fri May 11 2007 Jason Corley 0:1.2.14-3jpp -- rebuild through mock and centos 4 -- replace vendor and distribution with macros - -* Fri Apr 20 2007 Ralph Apel - 0:1.2.14-2jpp -- Patch to allow build of org.apache.log4j.jmx.* with mx4j -- Restore Vendor: and Distribution: - -* Sat Feb 17 2007 Fernando Nasser - 0:1.2.14-1jpp -- Upgrade - -* Mon Feb 12 2007 Ralph Apel - 0:1.2.13-4jpp -- Add bootstrap option to build core - -* Wed Aug 09 2006 Vivek Lakshmanan - 0:1.2.13-3jpp.2 -- Remove patch for BZ #157585 because it doesnt seem to be needed anymore. - -* Tue Aug 08 2006 Vivek Lakshmanan - 0:1.2.13-3jpp.1 -- Re-sync with latest from JPP. -- Update patch for BZ #157585 to apply cleanly. -- Partially adopt new naming convention. - -* Sat Jul 22 2006 Jakub Jelinek - 0:1.2.13-2jpp_2fc -- Rebuilt - -* Fri Jul 21 2006 Vivek Lakshmanan - 0:1.2.13-2jpp_1fc -- Merge spec and patches with latest from JPP. -- Clean source tar ball off prebuilt jars and classes. -- Use classpathx-jaf and jms for buildrequires for the time being. - -* Wed Jul 12 2006 Jesse Keating - 0:1.2.8-7jpp_9fc -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 0:1.2.8-7jpp_8fc -- fix scriptlet spew - -* Wed Dec 21 2005 Jesse Keating 0:1.2.8-7jpp7fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Nov 3 2005 Archit Shah 0:1.2.8-7jpp_6fc -- Reenable building of example that uses rmic - -* Wed Jun 22 2005 Gary Benson 0:1.2.8-7jpp_5fc -- Reenable building of classes that require jms. -- Remove classes and jarfiles from the tarball. - -* Mon May 23 2005 Gary Benson 0:1.2.8-7jpp_4fc -- Work around chainsaw failure (#157585). - -* Tue Jan 11 2005 Gary Benson 0:1.2.8-7jpp_3fc -- Reenable building of classes that require javax.swing (#130006). - -* Thu Nov 4 2004 Gary Benson 0:1.2.8-7jpp_2fc -- Build into Fedora. +%autochangelog From 493882104207f9df6ad65665d51e16c87faf5459 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:49:03 +0100 Subject: [PATCH 76/84] Drop explicit requires on javapackages-tools --- log4j.spec | 3 --- plans/javapackages.fmf | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/log4j.spec b/log4j.spec index df20e62..ecafc8e 100644 --- a/log4j.spec +++ b/log4j.spec @@ -64,9 +64,6 @@ BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-ext) BuildRequires: mvn(org.zeromq:jeromq) BuildRequires: mvn(sun.jdk:jconsole) -# Explicit requires for javapackages-tools since log4j-jmx script -# uses /usr/share/java-utils/java-functions -Requires: javapackages-tools # Also needs: # - Various Spring dependencies diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 91348703eba61b0a3884700010b173fd396094bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 15:54:49 +0000 Subject: [PATCH 77/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d11bb11be81700646b0d841b2953c66a80248701 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 Mar 2025 11:04:41 +0100 Subject: [PATCH 78/84] Drop javadoc package --- log4j.spec | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/log4j.spec b/log4j.spec index ecafc8e..c1a05cc 100644 --- a/log4j.spec +++ b/log4j.spec @@ -71,6 +71,9 @@ BuildRequires: mvn(sun.jdk:jconsole) # - io.fabric8.kubernetes-client %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.2.0-18 + %description Log4j is a tool to help the programmer output log statements to a variety of output targets. @@ -127,12 +130,6 @@ Summary: Apache Log4j NoSql Use NoSQL databases such as MongoDB and CouchDB to append log messages. %endif -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. - %prep %autosetup -p1 -C @@ -277,7 +274,7 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %build # missing test deps (mockejb) -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -300,8 +297,5 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %{_bindir}/%{name}-jmx %endif -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From f4d6467553f9a73ea493a963f71fee2574d09f5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 79/84] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 9c283d8f782fa15448c8a8e37aa5dea796b8b2fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 80/84] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 1b31dee5019ee8fb9e433c296ef6eb850fe9c3b2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 81/84] Build with OpenJDK 25 --- log4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index c1a05cc..e1ce889 100644 --- a/log4j.spec +++ b/log4j.spec @@ -20,7 +20,7 @@ Patch: 0002-Remove-usage-of-toolchains.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(jakarta.activation:jakarta.activation-api) From c7a098f39a840cef695b5f0c0345150a13e3a942 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:49:24 +0000 Subject: [PATCH 82/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 914f989f4df5b9d9f7aac155c40524aaf6bec346 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:06:56 +0200 Subject: [PATCH 83/84] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- log4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index e1ce889..542ad0b 100644 --- a/log4j.spec +++ b/log4j.spec @@ -117,7 +117,7 @@ Apache Log4j Tag Library for Web Applications. %package jmx-gui Summary: Apache Log4j JMX GUI -Requires: java-devel +Requires: java-25-devel %description jmx-gui Swing-based client for remotely editing the log4j configuration and remotely From 92a856e31b55dc1e4bdfbb5d2861ef6aca70f653 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 12:51:47 +0200 Subject: [PATCH 84/84] manual bodhi update for jdk25 needed on selected pkgs