From 12048a2c3564fbe06c73bc4bc1210f0a5000a0e5 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 29 2017 11:29:48 +0000 Subject: Update to upstream version 2.8.1 --- 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