From 3f6b65cc8e196d75d25c108716d986995e6b2a65 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Oct 20 2019 14:24:35 +0000
Subject: update to version 2.12.1


---

diff --git a/.gitignore b/.gitignore
index f1a8d4c..70ccda3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-apache-log4j-1.2.16.tar.gz
+/results_*
+/*.src.rpm
+
+/apache-log4j-1.2.16.tar.gz
 /log4j-1.2.17.tar.gz
 /apache-log4j-2.0-rc1-src.tar.gz
 /apache-log4j-2.0-src.tar.gz
@@ -12,3 +15,4 @@ apache-log4j-1.2.16.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
+/apache-log4j-2.12.1-src.tar.gz
diff --git a/log4j.spec b/log4j.spec
index 8ceadba..7de845b 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -1,22 +1,25 @@
 %bcond_without  jp_minimal
 
 Name:           log4j
-Version:        2.11.1
-Release:        5%{?dist}
+Version:        2.12.1
+Release:        1%{?dist}
 Summary:        Java logging package
 BuildArch:      noarch
 License:        ASL 2.0
+
 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.fasterxml.jackson.core:jackson-annotations)
 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(commons-logging:commons-logging)
 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.apache:apache:pom:)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
 BuildRequires:  mvn(org.jctools:jctools-core)
@@ -32,13 +35,10 @@ 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(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.apache.commons:commons-csv)
-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)
@@ -134,13 +134,15 @@ Obsoletes:      %{name}-manual < %{version}
 %pom_remove_plugin -r :maven-doap-plugin
 %pom_remove_plugin -r :maven-source-plugin
 %pom_remove_plugin -r :maven-toolchains-plugin
+%pom_remove_plugin -r :revapi-maven-plugin
 
 # remove all the stuff we'll build ourselves
 find -name "*.jar" -o -name "*.class" -delete
 rm -rf docs/api
 
-%pom_disable_module %{name}-samples
 %pom_disable_module %{name}-distribution
+%pom_disable_module %{name}-samples
+%pom_disable_module %{name}-spring-cloud-config
 
 # Apache Flume is not in Fedora yet
 %pom_disable_module %{name}-flume-ng
@@ -266,6 +268,12 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
 
 
 %changelog
+* Sun Oct 20 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.1-1
+- Update to version 2.12.1.
+
+* Mon Sep 30 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.0-1
+- Update to version 2.12.0.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 25dfd29..3f94105 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-log4j-2.11.1-src.tar.gz) = 2bd08c8170e36f427a2b39af443c729d933858b68b9bd766fd0a2ec5fcc65cd95d5e0b1f14ae1889120c35fead4ac93cf392b5277cac29ba1230e5c95adef068
+SHA512 (apache-log4j-2.12.1-src.tar.gz) = 305658ef22fb45b4f21fb6d6ee8ba5137abce90e085c59df1a25933a12719490a41bcdbe279a77bcef74c530ba7cc6c6622017a6e08e127f508ab31b2c15315d