diff --git a/apache-log4j-2.13.2-src.tar.gz b/apache-log4j-2.17.2-src.tar.gz similarity index 61% rename from apache-log4j-2.13.2-src.tar.gz rename to apache-log4j-2.17.2-src.tar.gz index e5d64b8..e95d71e 100644 Binary files a/apache-log4j-2.13.2-src.tar.gz and b/apache-log4j-2.17.2-src.tar.gz differ diff --git a/log4j.spec b/log4j.spec index 510b214..2efd6ce 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,5 +1,5 @@ Name: log4j -Version: 2.13.2 +Version: 2.17.2 Release: 1 Summary: Java logging package License: Apache-2.0 @@ -7,7 +7,9 @@ URL: http://logging.apache.org/%{name} Source0: http://archive.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz Patch1: logging-log4j-Remove-unsupported-EventDataConverter.patch BuildRequires: fdupes maven-local mvn(com.fasterxml.jackson.core:jackson-core) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.lmax:disruptor) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) +BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.lmax:disruptor) >= 3.4.4 BuildRequires: mvn(com.sun.mail:javax.mail) mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.logging:logging-parent:pom:) @@ -20,7 +22,7 @@ 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) mvn(commons-logging:commons-logging) -BuildRequires: mvn(javax.servlet.jsp:jsp-api) mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(org.apache.commons:commons-csv) mvn(org.apache.tomcat:tomcat-catalina) BuildRequires: mvn(org.eclipse.jetty:jetty-util) BuildRequires: mvn(org.eclipse.persistence:javax.persistence) @@ -68,11 +70,6 @@ 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. - %package help Summary: API documentation for %{name} Obsoletes: %{name}-manual < %{version} @@ -108,21 +105,40 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-liquibase %pom_disable_module %{name}-slf4j18-impl %pom_disable_module %{name}-jdbc-dbcp2 -%pom_disable_module %{name}-mongodb2 %pom_disable_module %{name}-mongodb3 +%pom_disable_module %{name}-mongodb4 %pom_remove_dep :jconsole %{name}-jmx-gui %pom_add_dep sun.jdk:jconsole %{name}-jmx-gui %pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core %pom_remove_plugin :apache-rat-plugin %{name}-bom -%pom_remove_plugin :maven-failsafe-plugin +%pom_remove_plugin -r :maven-failsafe-plugin %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_disable_module %{name}-spring-boot %pom_disable_module %{name}-spring-cloud-config %pom_disable_module %{name}-kubernetes %pom_disable_module %{name}-jpl + +%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 + +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 + %{mvn_alias} :%{name}-1.2-api %{name}:%{name} %{mvn_file} ':{%{name}-1.2-api}' %{name}/@1 %{name} %{mvn_package} ':%{name}-slf4j-impl' slf4j @@ -136,13 +152,16 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %{mvn_package} ':%{name}-couchdb' nosql %{mvn_package} :log4j-core-its __noinstall +%pom_change_dep javax.servlet:javax.servlet-api jakarta.servlet:jakarta.servlet-api log4j-web +%pom_change_dep javax.servlet:javax.servlet-api jakarta.servlet:jakarta.servlet-api log4j-taglib + %build %{mvn_build} -f -- -Dsource=8 %install %mvn_install %fdupes -s %{buildroot}%{_javadocdir} -%jpackage_script org.apache.logging.log4j.jmx.gui.ClientGUI '' '' %{name}/%{name}-jmx-gui:%{name}/%{name}-core %{name}-jmx false +%jpackage_script org.apache.logging.log4j.jmx.gui.ClientGui '' '' %{name}/%{name}-jmx-gui:%{name}/%{name}-core %{name}-jmx false %files -f .mfiles %doc LICENSE.txt NOTICE.txt @@ -158,8 +177,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %files bom -f .mfiles-bom -%files nosql -f .mfiles-nosql - %files jmx-gui -f .mfiles-jmx-gui %{_bindir}/%{name}-jmx @@ -168,6 +185,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %doc NOTICE.txt %changelog +* Sat Jul 30 2022 wangkai - 2.17.2-1 +- Upgrade to 2.17.2 + * Wed Oct 21 2020 wangyue - 2.13.2-1 - Upgrade to 2.13.2 to fix CVE-2020-9488