From 8043f3448c7680a712efeda93d9f8b4259990bdf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 21 2020 13:47:57 +0000 Subject: update to version 2.13.3 --- 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