From ad66e936be0d25bf64f260e251c6302961eb5c65 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Apr 06 2017 12:46:23 +0000 Subject: Update to upstream version 2.8.2 --- 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