From 3b506cde58452519f69a244def50b604bb934299 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 18 Sep 2017 11:01:33 +0300
Subject: [PATCH] Update to upstream version 2.9.0

---
 .gitignore |  1 +
 log4j.spec | 20 +++++++++++++-------
 sources    |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69af49d..e3a7b73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ apache-log4j-1.2.16.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
+/apache-log4j-2.9.0-src.tar.gz
diff --git a/log4j.spec b/log4j.spec
index f314a54..2db581a 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -1,8 +1,8 @@
 %bcond_with     jp_minimal
 
 Name:           log4j
-Version:        2.8.2
-Release:        2%{?dist}
+Version:        2.9.0
+Release:        1%{?dist}
 Summary:        Java logging package
 BuildArch:      noarch
 License:        ASL 2.0
@@ -19,6 +19,7 @@ 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.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
 BuildRequires:  mvn(org.jctools:jctools-core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
@@ -122,6 +123,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
+%pom_remove_plugin -r :maven-source-plugin
 
 # remove all the stuff we'll build ourselves
 find -name "*.jar" -o -name "*.class" -delete
@@ -136,14 +138,15 @@ 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_remove_dep -r :%{name}-api-java9
+%pom_remove_plugin :maven-dependency-plugin log4j-api
+
 # unavailable com.conversantmedia:disruptor
 rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
 %pom_remove_dep -r com.conversantmedia:disruptor
 
-# unavailable net.alchim31.maven:scala-maven-plugin
-%pom_disable_module log4j-api-scala_2.10
-%pom_disable_module log4j-api-scala_2.11
-
 # kafka not available
 rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
 %pom_remove_dep -r :kafka-clients
@@ -186,7 +189,7 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
 %pom_remove_dep -r :commons-csv
 %pom_remove_dep -r :hibernate-jpa-2.1-api
 
-rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,net/server,net/mom,config/yaml}
+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}
 rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java
 rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
@@ -243,6 +246,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
 
 
 %changelog
+* Mon Sep 18 2017 Michael Simacek <msimacek@redhat.com> - 2.9.0-1
+- Update to upstream version 2.9.0
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 238ac71..973beb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-log4j-2.8.2-src.tar.gz) = 5cd49d4d65ac7c62914a253e5221297b236d2e15b70978a95d6a7a239076aa7c262d259d441375b047549bc8e07531f9d62bb9ee1d5fac770cb04c1feb6586b3
+SHA512 (apache-log4j-2.9.0-src.tar.gz) = 4e42cff6103310191975776cfcf3365fb2bcf99cebe123b7fd80c82630c3943c343507dfbff7fb0076833640bdcc6a524c6d57be11eff634a9b63c6156a4ef32