rpms/log4j
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 2.11.1

Browse Source
This commit is contained in:
Michael Simacek 2018-08-07 16:34:37 +02:00
parent e1a29cf29a
commit 264963e2e4
3 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

59
log4j.spec
View File

@ -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 <msimacek@redhat.com> - 2.11.1-1
- Update to upstream version 2.11.1
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (apache-log4j-2.9.1-src.tar.gz) = 2a1d6c11601b4f96967db16e5f84896b843a6a38b1b2520622ea793a22e2e375d64751d71f0c0f68ae99a9ee2448d1aea25bf57908f18a44a987334f7a0e0b8b
SHA512 (apache-log4j-2.11.1-src.tar.gz) = 2bd08c8170e36f427a2b39af443c729d933858b68b9bd766fd0a2ec5fcc65cd95d5e0b1f14ae1889120c35fead4ac93cf392b5277cac29ba1230e5c95adef068