From d244c74c3350e63484b48da05acfe52645e58967 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Mon, 6 Jan 2020 22:44:20 -0500
Subject: [PATCH] Rebase to upstream version v2.13.0

Signed-off-by: Alexander Scheel <ascheel@redhat.com>
---
 .gitignore |  1 +
 log4j.spec | 15 +++++++++++++--
 sources    |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70ccda3..a005cfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /apache-log4j-2.9.1-src.tar.gz
 /apache-log4j-2.11.1-src.tar.gz
 /apache-log4j-2.12.1-src.tar.gz
+/apache-log4j-2.13.0-src.tar.gz
diff --git a/log4j.spec b/log4j.spec
index 7de845b..8648dc1 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -1,7 +1,7 @@
 %bcond_without  jp_minimal
 
 Name:           log4j
-Version:        2.12.1
+Version:        2.13.0
 Release:        1%{?dist}
 Summary:        Java logging package
 BuildArch:      noarch
@@ -56,6 +56,11 @@ BuildRequires:  mvn(sun.jdk:jconsole)
 # Explicit requires for javapackages-tools since log4j-jmx script
 # uses /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
+
+# Also needs:
+# - Various Spring dependencies
+# - javax.jms
+# - io.fabric8.kubernetes-client
 %endif
 
 Obsoletes:      %{name}-osgi < 2.9.1-4
@@ -142,7 +147,6 @@ rm -rf docs/api
 
 %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
@@ -203,6 +207,8 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
 %pom_disable_module %{name}-couchdb
 %pom_disable_module %{name}-cassandra
 %pom_disable_module %{name}-appserver
+%pom_disable_module %{name}-spring-cloud-config
+%pom_disable_module %{name}-kubernetes
 
 %pom_remove_dep -r :jackson-dataformat-yaml
 %pom_remove_dep -r :jackson-dataformat-xml
@@ -215,7 +221,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
 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,nosql}
 rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java
+rm log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/*Xml*.java
 rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
+rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
 %endif
 
 %mvn_alias :%{name}-1.2-api %{name}:%{name}
@@ -268,6 +276,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
 
 
 %changelog
+* Mon Jan 06 2020 Alexander Scheel <ascheel@redhat.com> - 2.13.0-1
+- Rebase to version 2.13.0
+
 * Sun Oct 20 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.1-1
 - Update to version 2.12.1.
 
diff --git a/sources b/sources
index 3f94105..9af50d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-log4j-2.12.1-src.tar.gz) = 305658ef22fb45b4f21fb6d6ee8ba5137abce90e085c59df1a25933a12719490a41bcdbe279a77bcef74c530ba7cc6c6622017a6e08e127f508ab31b2c15315d
+SHA512 (apache-log4j-2.13.0-src.tar.gz) = 6f864eaa3f02ce44bcc321d3e3177499dce6de1852e6f9fe57e067bb4adc55fc84cfe3fe869fca82ad5e35289b599cebce5550c3f29ad3a0fc1c96b246415a1b