From 5a41a7bc3d95c3d5df0505a960e49acda43b4f92 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 29 Nov 2018 13:02:12 +0000
Subject: [PATCH 01/16] Remove explicit Epoch

---
 slf4j.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/slf4j.spec b/slf4j.spec
index c16bcea..4baa0bd 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -31,7 +31,6 @@
 Name:           slf4j
 Version:        1.7.25
 Release:        4%{?dist}
-Epoch:          0
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0

From 105b626d3173be7af33161e49c44769799123da8 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 27 Feb 2019 13:59:41 +0100
Subject: [PATCH 02/16] Update to upstream version 1.7.26

---
 .gitignore                                    |  1 +
 ...EventData-deserialization-by-default.patch | 44 -------------------
 slf4j.spec                                    | 10 +++--
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 0001-Disallow-EventData-deserialization-by-default.patch

diff --git a/.gitignore b/.gitignore
index e718820..3df801c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ slf4j-1.6.1.tar.gz
 /slf4j-1.7.21.tar.gz
 /slf4j-1.7.22.tar.gz
 /slf4j-1.7.25.tar.gz
+/slf4j-1.7.26.tar.gz
diff --git a/0001-Disallow-EventData-deserialization-by-default.patch b/0001-Disallow-EventData-deserialization-by-default.patch
deleted file mode 100644
index f77a14e..0000000
--- a/0001-Disallow-EventData-deserialization-by-default.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b1c0ca75ca38a7a8b50bfdfdf2c324169a6ddf02 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 19 Mar 2018 16:01:57 +0100
-Subject: [PATCH] Disallow EventData deserialization by default
-
----
- .../src/main/java/org/slf4j/ext/EventData.java      | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java b/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java
-index dc5b502..fa5c125 100644
---- a/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java
-+++ b/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java
-@@ -76,12 +76,21 @@ public class EventData implements Serializable {
-      */
-     @SuppressWarnings("unchecked")
-     public EventData(String xml) {
--        ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
--        try {
--            XMLDecoder decoder = new XMLDecoder(bais);
--            this.eventData = (Map<String, Object>) decoder.readObject();
--        } catch (Exception e) {
--            throw new EventException("Error decoding " + xml, e);
-+        if ("1".equals(System.getProperty("org.slf4j.ext.allowInsecureDeserialization"))) {
-+            ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
-+            try {
-+                XMLDecoder decoder = new XMLDecoder(bais);
-+                this.eventData = (Map<String, Object>) decoder.readObject();
-+            } catch (Exception e) {
-+                throw new EventException("Error decoding " + xml, e);
-+            }
-+        } else {
-+            throw new UnsupportedOperationException(
-+                    "Constructing EventData from XML is vulnerable to remote " +
-+                    "excution and is not allowed by default. If you're " +
-+                    "completely sure the source data is trusted, you can enable " +
-+                    "it by setting org.slf4j.ext.allowInsecureDeserialization " +
-+                    "JVM property to 1");
-         }
-     }
- 
--- 
-2.14.3
-
diff --git a/slf4j.spec b/slf4j.spec
index 4baa0bd..fa185f2 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -29,15 +29,14 @@
 #
 
 Name:           slf4j
-Version:        1.7.25
-Release:        4%{?dist}
+Version:        1.7.26
+Release:        1%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
 URL:            http://www.slf4j.org/
 Source0:        http://www.slf4j.org/dist/%{name}-%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:         0001-Disallow-EventData-deserialization-by-default.patch
 BuildArch:      noarch
 
 BuildRequires:  maven-local
@@ -124,7 +123,6 @@ SLF4J Source JARs.
 
 %prep
 %setup -q
-%patch0 -p1
 find . -name "*.jar" | xargs rm
 cp -p %{SOURCE1} APACHE-LICENSE
 
@@ -213,6 +211,10 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Wed Feb 27 2019 Marian Koncek <mkoncek@redhat.com> - 0:1.7.26-1
+- Update to upstream version 1.7.26
+- Fixes: RHBZ #1678877
+
 * Mon Mar 19 2018 Michael Simacek <msimacek@redhat.com> - 0:1.7.25-4
 - Disallow EventData deserialization by default (CVE-2018-8088)
 - Resolves rhbz#1549928
diff --git a/sources b/sources
index 39e2943..2b75617 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (slf4j-1.7.25.tar.gz) = 4f6a02ff542b1e8333d06d94d0dd604f6101b67e73bc348c224c26b0f503ac5a6cb14711526a659e3670bd724b65a0d9165aff926e10090b8ef60f34767bbce5
+SHA512 (slf4j-1.7.26.tar.gz) = a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8

From 22fc5ea3882d59562001d88e9cc768ca4d586fb7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 May 2019 16:48:36 +0200
Subject: [PATCH 03/16] Disable slf4j-ext module

---
 slf4j.spec | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/slf4j.spec b/slf4j.spec
index fa185f2..a318dff 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.7.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
@@ -40,10 +40,7 @@ Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(ch.qos.cal10n:cal10n-api)
-BuildRequires:  mvn(commons-lang:commons-lang)
 BuildRequires:  mvn(commons-logging:commons-logging)
-BuildRequires:  mvn(javassist:javassist)
 BuildRequires:  mvn(log4j:log4j:1.2.17)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
@@ -91,12 +88,6 @@ Summary:        SLF4J JCL Binding
 %description jcl
 SLF4J JCL Binding.
 
-%package ext
-Summary:        SLF4J Extensions Module
-
-%description ext
-Extensions to the SLF4J API.
-
 %package -n jcl-over-slf4j
 Summary:        JCL 1.1.1 implemented over SLF4J
 
@@ -129,6 +120,7 @@ cp -p %{SOURCE1} APACHE-LICENSE
 %pom_disable_module integration
 %pom_disable_module osgi-over-slf4j
 %pom_disable_module slf4j-android
+%pom_disable_module slf4j-ext
 %pom_disable_module slf4j-migrator
 
 # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@@ -195,7 +187,6 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %files jdk14 -f .mfiles-%{name}-jdk14
 %files log4j12 -f .mfiles-%{name}-log4j12
 %files jcl -f .mfiles-%{name}-jcl
-%files ext -f .mfiles-%{name}-ext
 %files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j
 %files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j
 %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j
@@ -211,6 +202,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.26-2
+- Disable slf4j-ext module
+
 * Wed Feb 27 2019 Marian Koncek <mkoncek@redhat.com> - 0:1.7.26-1
 - Update to upstream version 1.7.26
 - Fixes: RHBZ #1678877

From bcd7e1399a591d035f4e1d01cc5d5ae408a8dade Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 May 2019 17:01:41 +0200
Subject: [PATCH 04/16] Mass rebuild for javapackages-tools 201901

---
 slf4j.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/slf4j.spec b/slf4j.spec
index a318dff..12fcbbb 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.7.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
@@ -202,6 +202,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.26-3
+- Mass rebuild for javapackages-tools 201901
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.26-2
 - Disable slf4j-ext module
 

From fd1008dadcd004718dbff26ca596624fbac7f5cd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 11:31:33 +0200
Subject: [PATCH 05/16] Use javadoc_package macro

---
 slf4j.spec | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/slf4j.spec b/slf4j.spec
index 12fcbbb..539cded 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -58,11 +58,7 @@ SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively,
 it is possible (and rather easy) to write SLF4J adapters for the given
 API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter..
 
-%package javadoc
-Summary:        API documentation for %{name}
-
-%description javadoc
-This package provides %{summary}.
+%{?javadoc_package}
 
 %package manual
 Summary:        Manual for %{name}
@@ -194,9 +190,6 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %files sources -f .mfiles-sources
 %license LICENSE.txt APACHE-LICENSE
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt APACHE-LICENSE
-
 %files manual
 %license LICENSE.txt APACHE-LICENSE
 %{_defaultdocdir}/%{name}-manual

From d362fce4a996d5104c2931c97fba0fe954989964 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 11:32:24 +0200
Subject: [PATCH 06/16] Namespace slf4j and jcl-over-slf4j binary packages

---
 slf4j.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/slf4j.spec b/slf4j.spec
index 539cded..78acf81 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -58,6 +58,7 @@ SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively,
 it is possible (and rather easy) to write SLF4J adapters for the given
 API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter..
 
+%{?module_package}
 %{?javadoc_package}
 
 %package manual
@@ -84,10 +85,10 @@ Summary:        SLF4J JCL Binding
 %description jcl
 SLF4J JCL Binding.
 
-%package -n jcl-over-slf4j
+%package -n %{?module_prefix}jcl-over-slf4j
 Summary:        JCL 1.1.1 implemented over SLF4J
 
-%description -n jcl-over-slf4j
+%description -n %{?module_prefix}jcl-over-slf4j
 JCL 1.1.1 implemented over SLF4J.
 
 %package -n log4j-over-slf4j
@@ -177,13 +178,13 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 rm -rf target/site/{.htaccess,apidocs}
 cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %license LICENSE.txt APACHE-LICENSE
 
 %files jdk14 -f .mfiles-%{name}-jdk14
 %files log4j12 -f .mfiles-%{name}-log4j12
 %files jcl -f .mfiles-%{name}-jcl
-%files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j
+%files -n %{?module_prefix}jcl-over-slf4j -f .mfiles-jcl-over-slf4j
 %files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j
 %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j
 

From f17965b99edad961b171d6a7d761d60b5f8d63d6 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Tue, 13 Aug 2019 13:11:12 +0200
Subject: [PATCH 07/16] Update to upstream version 1.7.28

---
 .gitignore | 1 +
 slf4j.spec | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3df801c..942146c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ slf4j-1.6.1.tar.gz
 /slf4j-1.7.22.tar.gz
 /slf4j-1.7.25.tar.gz
 /slf4j-1.7.26.tar.gz
+/slf4j-1.7.28.tar.gz
diff --git a/slf4j.spec b/slf4j.spec
index 78acf81..d2fcdb6 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           slf4j
-Version:        1.7.26
-Release:        3%{?dist}
+Version:        1.7.28
+Release:        1%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
@@ -196,6 +196,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Tue Aug 13 2019 Marian Koncek <mkoncek@redhat.com> - 1.7.28-1
+- Update to upstream version 1.7.28
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.26-3
 - Mass rebuild for javapackages-tools 201901
 
diff --git a/sources b/sources
index 2b75617..e47628d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (slf4j-1.7.26.tar.gz) = a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+SHA512 (slf4j-1.7.28.tar.gz) = 3eb81e8fefe85f5cc9acf3ac17d0e7c5d9f82f44e10279e7f623f1bf1301cf55dfb67ee9ad29464739c4fe4ea938aecc8d75b093426e9928de81752f80ef391f
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8

From 34d505119feef80d9c14a22d4c0158be5e045737 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 26 Oct 2019 11:59:30 +0200
Subject: [PATCH 08/16] Set compiler source/target to 1.6

---
 slf4j.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slf4j.spec b/slf4j.spec
index d2fcdb6..a7c975e 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -165,7 +165,7 @@ sed -i "/Import-Package/s/.$/;resolution:=optional&/" slf4j-api/src/main/resourc
 %mvn_package :%{name}-nop
 
 %build
-%mvn_build -f -s
+%mvn_build -f -s -- -Drequired.jdk.version=1.6
 
 %install
 # Compat symlinks

From 96388bbd35ac8f25e912f3658b6940b6994203c9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 5 Nov 2019 17:29:28 +0100
Subject: [PATCH 09/16] Mass rebuild for javapackages-tools 201902

---
 slf4j.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/slf4j.spec b/slf4j.spec
index a7c975e..17343af 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.7.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
@@ -196,6 +196,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.28-2
+- Mass rebuild for javapackages-tools 201902
+
 * Tue Aug 13 2019 Marian Koncek <mkoncek@redhat.com> - 1.7.28-1
 - Update to upstream version 1.7.28
 

From f5439772d1cd6f2a28720cd8ea8c7cdd2cb3a7bd Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 23 Jan 2020 15:59:31 +0100
Subject: [PATCH 10/16] Update to upstream version 1.7.30

---
 .gitignore |  1 +
 slf4j.spec | 15 +++++++++------
 sources    |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 942146c..ab7f87b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ slf4j-1.6.1.tar.gz
 /slf4j-1.7.25.tar.gz
 /slf4j-1.7.26.tar.gz
 /slf4j-1.7.28.tar.gz
+/v_1.7.30.tar.gz
diff --git a/slf4j.spec b/slf4j.spec
index 17343af..6f86310 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -29,14 +29,14 @@
 #
 
 Name:           slf4j
-Version:        1.7.28
-Release:        2%{?dist}
+Version:        1.7.30
+Release:        1%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
 URL:            http://www.slf4j.org/
-Source0:        http://www.slf4j.org/dist/%{name}-%{version}.tar.gz
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source0:        https://github.com/qos-ch/slf4j/archive/v_%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:      noarch
 
 BuildRequires:  maven-local
@@ -110,8 +110,8 @@ Summary:        SLF4J Source JARs
 SLF4J Source JARs.
 
 %prep
-%setup -q
-find . -name "*.jar" | xargs rm
+%setup -q -n %{name}-v_%{version}
+find -name '*.jar' -delete
 cp -p %{SOURCE1} APACHE-LICENSE
 
 %pom_disable_module integration
@@ -196,6 +196,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Thu Jan 23 2020 Marian Koncek <mkoncek@redhat.com> - 1.7.30-1
+- Update to upstream version 1.7.30
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.28-2
 - Mass rebuild for javapackages-tools 201902
 
diff --git a/sources b/sources
index e47628d..2b06959 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (slf4j-1.7.28.tar.gz) = 3eb81e8fefe85f5cc9acf3ac17d0e7c5d9f82f44e10279e7f623f1bf1301cf55dfb67ee9ad29464739c4fe4ea938aecc8d75b093426e9928de81752f80ef391f
+SHA512 (v_1.7.30.tar.gz) = 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8

From 54e957d7b467d5bbf7498bb8ef59834556f7827e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 25 Jan 2020 14:40:08 +0100
Subject: [PATCH 11/16] Build with OpenJDK 8

---
 slf4j.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/slf4j.spec b/slf4j.spec
index 6f86310..098fc84 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.7.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
 License:        MIT and ASL 2.0
@@ -39,7 +39,7 @@ Source0:        https://github.com/qos-ch/slf4j/archive/v_%{version}.tar.gz
 Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:      noarch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(log4j:log4j:1.2.17)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
@@ -196,6 +196,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.30-2
+- Build with OpenJDK 8
+
 * Thu Jan 23 2020 Marian Koncek <mkoncek@redhat.com> - 1.7.30-1
 - Update to upstream version 1.7.30
 

From 36feb1a512db6c9a253d81f34f0cc3917cc1ba3e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 26 Feb 2020 11:55:00 +0100
Subject: [PATCH 12/16] Use correct license file permissions

---
 slf4j.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slf4j.spec b/slf4j.spec
index 098fc84..ce59695 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -112,7 +112,7 @@ SLF4J Source JARs.
 %prep
 %setup -q -n %{name}-v_%{version}
 find -name '*.jar' -delete
-cp -p %{SOURCE1} APACHE-LICENSE
+install -m 0644 %{SOURCE1} APACHE-LICENSE
 
 %pom_disable_module integration
 %pom_disable_module osgi-over-slf4j

From 9056a92b517db9e50323b75cd41019a5beb21ee1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 15 May 2020 08:00:35 +0200
Subject: [PATCH 13/16] Disable Log4j bindings

---
 slf4j.spec | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/slf4j.spec b/slf4j.spec
index ce59695..9b3d91a 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -41,7 +41,6 @@ BuildArch:      noarch
 
 BuildRequires:  maven-local-openjdk8
 BuildRequires:  mvn(commons-logging:commons-logging)
-BuildRequires:  mvn(log4j:log4j:1.2.17)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
@@ -73,12 +72,6 @@ Summary:        SLF4J JDK14 Binding
 %description jdk14
 SLF4J JDK14 Binding.
 
-%package log4j12
-Summary:        SLF4J LOG4J-12 Binding
-
-%description log4j12
-SLF4J LOG4J-12 Binding.
-
 %package jcl
 Summary:        SLF4J JCL Binding
 
@@ -91,12 +84,6 @@ Summary:        JCL 1.1.1 implemented over SLF4J
 %description -n %{?module_prefix}jcl-over-slf4j
 JCL 1.1.1 implemented over SLF4J.
 
-%package -n log4j-over-slf4j
-Summary:        Log4j implemented over SLF4J
-
-%description -n log4j-over-slf4j
-Log4j implemented over SLF4J.
-
 %package -n jul-to-slf4j
 Summary:        JUL to SLF4J bridge
 
@@ -116,8 +103,10 @@ install -m 0644 %{SOURCE1} APACHE-LICENSE
 
 %pom_disable_module integration
 %pom_disable_module osgi-over-slf4j
+%pom_disable_module log4j-over-slf4j
 %pom_disable_module slf4j-android
 %pom_disable_module slf4j-ext
+%pom_disable_module slf4j-log4j12
 %pom_disable_module slf4j-migrator
 
 # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@@ -182,10 +171,8 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %license LICENSE.txt APACHE-LICENSE
 
 %files jdk14 -f .mfiles-%{name}-jdk14
-%files log4j12 -f .mfiles-%{name}-log4j12
 %files jcl -f .mfiles-%{name}-jcl
 %files -n %{?module_prefix}jcl-over-slf4j -f .mfiles-jcl-over-slf4j
-%files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j
 %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j
 
 %files sources -f .mfiles-sources

From 79fc72d534953fcb04cf880599b5d42fc741bb08 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 17 May 2020 12:40:18 +0200
Subject: [PATCH 14/16] Port to maven-antrun-plugin 3.0.0

---
 slf4j.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/slf4j.spec b/slf4j.spec
index 9b3d91a..f584c52 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -109,6 +109,9 @@ install -m 0644 %{SOURCE1} APACHE-LICENSE
 %pom_disable_module slf4j-log4j12
 %pom_disable_module slf4j-migrator
 
+# Port to maven-antrun-plugin 3.0.0
+sed -i s/tasks/target/ slf4j-api/pom.xml
+
 # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
 %pom_xpath_inject "pom:project/pom:properties" "
     <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>"

From ddf46129786e0fabbe608ce9f750d045e134f315 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 16 Apr 2021 15:33:13 +0200
Subject: [PATCH 15/16] Conditionalize buildrequires in bootstrap mode

---
 slf4j.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/slf4j.spec b/slf4j.spec
index f584c52..c5185dc 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -1,3 +1,5 @@
+%bcond_without bootstrap
+
 # Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
@@ -40,10 +42,14 @@ Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:      noarch
 
 BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+%endif
 
 %description
 The Simple Logging Facade for Java or (SLF4J) is intended to serve

From ef7c19688abf142a60692e493d6877a526a4f74a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 13 May 2021 19:08:43 +0200
Subject: [PATCH 16/16] Turn off bootstrap mode by default

---
 slf4j.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slf4j.spec b/slf4j.spec
index c5185dc..330e474 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 # Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.