Update to 1.7.36; Replace log4j12 with reload4j

4 files changed, 64 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 452ac60749af..329384e1c16a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,50 +1,49 @@
 pkgbase = slf4j
 	pkgdesc = Simple Logging Facade for Java for various logging frameworks (e.g. java.util.logging, logback, log4j)
-	pkgver = 1.7.32
+	pkgver = 1.7.36
 	pkgrel = 1
 	url = https://www.slf4j.org
 	arch = any
 	license = MIT
 	depends = java-runtime
-	optdepends = log4j
-	noextract = jcl-over-slf4j-1.7.32.jar
-	noextract = jul-to-slf4j-1.7.32.jar
-	noextract = log4j-over-slf4j-1.7.32.jar
-	noextract = slf4j-api-1.7.32.jar
-	noextract = slf4j-ext-1.7.32.jar
-	noextract = slf4j-jcl-1.7.32.jar
-	noextract = slf4j-jdk14-1.7.32.jar
-	noextract = slf4j-log4j12-1.7.32.jar
-	noextract = slf4j-migrator-1.7.32.jar
-	noextract = slf4j-nop-1.7.32.jar
-	noextract = slf4j-simple-1.7.32.jar
-	source = https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.32/LICENSE.txt
-	source = https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/1.7.32/jcl-over-slf4j-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/1.7.32/jul-to-slf4j-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.32/log4j-over-slf4j-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-ext/1.7.32/slf4j-ext-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/1.7.32/slf4j-jcl-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/1.7.32/slf4j-migrator-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/1.7.32/slf4j-nop-1.7.32.jar
-	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar
+	noextract = jcl-over-slf4j-1.7.36.jar
+	noextract = jul-to-slf4j-1.7.36.jar
+	noextract = log4j-over-slf4j-1.7.36.jar
+	noextract = slf4j-api-1.7.36.jar
+	noextract = slf4j-ext-1.7.36.jar
+	noextract = slf4j-jcl-1.7.36.jar
+	noextract = slf4j-jdk14-1.7.36.jar
+	noextract = slf4j-reload4j-1.7.36.jar
+	noextract = slf4j-migrator-1.7.36.jar
+	noextract = slf4j-nop-1.7.36.jar
+	noextract = slf4j-simple-1.7.36.jar
+	source = https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/LICENSE.txt
+	source = https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/1.7.36/jcl-over-slf4j-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/1.7.36/jul-to-slf4j-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.36/log4j-over-slf4j-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-ext/1.7.36/slf4j-ext-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/1.7.36/slf4j-jcl-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/1.7.36/slf4j-migrator-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/1.7.36/slf4j-nop-1.7.36.jar
+	source = https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar
 	source = setClasspath.sh
 	source = migrator.desktop
-	sha256sums = 899cb2e2f92e74ec969e477503c6442fb50bec5d523bc87dc40bad3419113c3b
-	sha256sums = 60f3bda5922e3912889cca1311d1b227753610bf60cb4e5e914e8b2eaa0326b4
-	sha256sums = 6dee8d85ad6943aff0600f14897c469e64bae0413ee33a15c448af00432c0642
-	sha256sums = cef183e051664d53cc8f046fb616ed39eab9e61631e13299c939c995c11e57e3
-	sha256sums = 3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be
-	sha256sums = 1f252dd5c85d901186198ad3e89ab2996182b6cc3aaa17c08c2ab8dcbda46b54
-	sha256sums = 6341e0327931b879215dfd37f6928544b682c95599e8be95caf762b91ea4e725
-	sha256sums = 4e09fd5ace1d3e5d1c9571b8eb7b17a23149e5ac322c11314c688991e2eb6f0b
-	sha256sums = 93b09895667903d6154093b6ce10002529dfe01348e6050bf351e835fdd0f194
-	sha256sums = b818b3af71960c96e6d176981ba1607fee82394d1f3023a0f599b2ca5e82ddcb
-	sha256sums = f2d20b60b2b87fc1ca904e0cd4520deeeebf8a9c5b723ae2493cc4219389d782
-	sha256sums = d2fdd7b73ca2019a2062d145a0d86179a58f98c8c3e35ca7c735a27b3b5621c3
-	sha256sums = 9a1efcd3b99c0ef88e1fbdf361a7832f09a925802a7518629f271ff8e08ae940
+	sha256sums = 6fbe2eaf44b193b8a40eed9208f52848572224ad8d7672dd09418aa174847e73
+	sha256sums = ab57ca8fd223772c17365d121f59e94ecbf0ae59d08c03a3cb5b81071c019195
+	sha256sums = 9e641fb142c5f0b0623d6222c09ea87523a41bf6bed48ac79940724010b989de
+	sha256sums = 0a7e032bf5bcdd5b2bf8bf2e5cf02c5646f2aa6fee66933b8150dbe84e651e8a
+	sha256sums = d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0
+	sha256sums = 9a55e44531b5c623a0c53aaa9f4cabd911bb005c7512a04c5d34e564dbfb37ab
+	sha256sums = 3182f9e81bc08f4fbfa37c5ad481682f51ef86f7c53c37c0d636a075f54eb301
+	sha256sums = 5bf64690af4e59876b8902bb0db3dd39c686a40abfed97d3837eeeec7a2922ac
+	sha256sums = ae6fdd5c9547896114d5ec7fa7503733b7d2890573d3886fb548b3119c4d3f67
+	sha256sums = 9d18eef1a37c2928779bee8ad1c52069e05a298355bb12f29816c8732c232114
+	sha256sums = c214958b07816cb4412b30c7bdbd4308ffdc6ba2a83767b8f3a9229cbd9274d6
+	sha256sums = 2f39bed943d624dfa8f4102d0571283a10870b6aa36f197a8a506f147010c10f
+	sha256sums = 95e460406c5b9416bb51eb452e40b2d8987401e55cdd3da6b062851cd0e56e82
 	sha256sums = 3fa0fb54bd4b0cd91e16b882002943d0ea3d0985ecf8fa870c9afc9b73656dba
 
 pkgname = slf4j
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..58b58b603e84
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*.tar
+*.xz
+*.jar
+*.txt
+*~
+
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 5782413becf3..48f6f3aaab86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,13 @@
 # Contributor: [Vitaliy Berdinskikh](mailto:ur6lad@archlinux.org.ua) aka UR6LAD
 
 pkgname=slf4j
-pkgver=1.7.32
+pkgver=1.7.36
 pkgrel=1
 pkgdesc="Simple Logging Facade for Java for various logging frameworks (e.g. java.util.logging, logback, log4j)"
 arch=('any')
 url="https://www.slf4j.org"
 license=('MIT')
 depends=('java-runtime')
-optdepends=('log4j')
 source=("https://raw.githubusercontent.com/qos-ch/slf4j/v_${pkgver}/LICENSE.txt"
         "https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/${pkgver}/jcl-over-slf4j-${pkgver}.jar"
         "https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/${pkgver}/jul-to-slf4j-${pkgver}.jar"
@@ -19,7 +18,7 @@ source=("https://raw.githubusercontent.com/qos-ch/slf4j/v_${pkgver}/LICENSE.txt"
         "https://repo1.maven.org/maven2/org/slf4j/slf4j-ext/${pkgver}/slf4j-ext-${pkgver}.jar"
         "https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/${pkgver}/slf4j-jcl-${pkgver}.jar"
         "https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/${pkgver}/slf4j-jdk14-${pkgver}.jar"
-        "https://repo1.maven.org/maven2/org/slf4j/slf4j-log4j12/${pkgver}/slf4j-log4j12-${pkgver}.jar"
+        "https://repo1.maven.org/maven2/org/slf4j/slf4j-reload4j/${pkgver}/slf4j-reload4j-${pkgver}.jar"
         "https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/${pkgver}/slf4j-migrator-${pkgver}.jar"
         "https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/${pkgver}/slf4j-nop-${pkgver}.jar"
         "https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/${pkgver}/slf4j-simple-${pkgver}.jar"
@@ -32,7 +31,7 @@ noextract=("jcl-over-slf4j-${pkgver}.jar"
            "slf4j-ext-${pkgver}.jar"
            "slf4j-jcl-${pkgver}.jar"
            "slf4j-jdk14-${pkgver}.jar"
-           "slf4j-log4j12-${pkgver}.jar"
+           "slf4j-reload4j-${pkgver}.jar"
            "slf4j-migrator-${pkgver}.jar"
            "slf4j-nop-${pkgver}.jar"
            "slf4j-simple-${pkgver}.jar")
@@ -49,7 +48,7 @@ package() {
 	for i in jcl-over jul-to log4j-over; do
 		install -m644 ${i}-${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}
 	done
-	for i in api ext jcl jdk14 log4j12 migrator nop simple; do
+	for i in api ext jcl jdk14 reload4j migrator nop simple; do
 		install -m644 ${pkgname}-${i}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}
 	done
 	for i in ${pkgdir}/usr/share/java/${pkgname}/*.jar; do
@@ -58,17 +57,17 @@ package() {
 	done
 }
 
-sha256sums=('899cb2e2f92e74ec969e477503c6442fb50bec5d523bc87dc40bad3419113c3b'
-            '60f3bda5922e3912889cca1311d1b227753610bf60cb4e5e914e8b2eaa0326b4'
-            '6dee8d85ad6943aff0600f14897c469e64bae0413ee33a15c448af00432c0642'
-            'cef183e051664d53cc8f046fb616ed39eab9e61631e13299c939c995c11e57e3'
-            '3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be'
-            '1f252dd5c85d901186198ad3e89ab2996182b6cc3aaa17c08c2ab8dcbda46b54'
-            '6341e0327931b879215dfd37f6928544b682c95599e8be95caf762b91ea4e725'
-            '4e09fd5ace1d3e5d1c9571b8eb7b17a23149e5ac322c11314c688991e2eb6f0b'
-            '93b09895667903d6154093b6ce10002529dfe01348e6050bf351e835fdd0f194'
-            'b818b3af71960c96e6d176981ba1607fee82394d1f3023a0f599b2ca5e82ddcb'
-            'f2d20b60b2b87fc1ca904e0cd4520deeeebf8a9c5b723ae2493cc4219389d782'
-            'd2fdd7b73ca2019a2062d145a0d86179a58f98c8c3e35ca7c735a27b3b5621c3'
-            '9a1efcd3b99c0ef88e1fbdf361a7832f09a925802a7518629f271ff8e08ae940'
+sha256sums=('6fbe2eaf44b193b8a40eed9208f52848572224ad8d7672dd09418aa174847e73'
+            'ab57ca8fd223772c17365d121f59e94ecbf0ae59d08c03a3cb5b81071c019195'
+            '9e641fb142c5f0b0623d6222c09ea87523a41bf6bed48ac79940724010b989de'
+            '0a7e032bf5bcdd5b2bf8bf2e5cf02c5646f2aa6fee66933b8150dbe84e651e8a'
+            'd3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0'
+            '9a55e44531b5c623a0c53aaa9f4cabd911bb005c7512a04c5d34e564dbfb37ab'
+            '3182f9e81bc08f4fbfa37c5ad481682f51ef86f7c53c37c0d636a075f54eb301'
+            '5bf64690af4e59876b8902bb0db3dd39c686a40abfed97d3837eeeec7a2922ac'
+            'ae6fdd5c9547896114d5ec7fa7503733b7d2890573d3886fb548b3119c4d3f67'
+            '9d18eef1a37c2928779bee8ad1c52069e05a298355bb12f29816c8732c232114'
+            'c214958b07816cb4412b30c7bdbd4308ffdc6ba2a83767b8f3a9229cbd9274d6'
+            '2f39bed943d624dfa8f4102d0571283a10870b6aa36f197a8a506f147010c10f'
+            '95e460406c5b9416bb51eb452e40b2d8987401e55cdd3da6b062851cd0e56e82'
             '3fa0fb54bd4b0cd91e16b882002943d0ea3d0985ecf8fa870c9afc9b73656dba')
diff --git a/setClasspath.sh b/setClasspath.sh
index 47b8bb05f0ec..b20f16f921f2 100644
--- a/setClasspath.sh
+++ b/setClasspath.sh
@@ -11,7 +11,8 @@ SLF4J_JCL=/usr/share/java/slf4j/slf4j-jcl.jar
 # Binding for java.util.logging, also referred to as JDK 1.4 logging.
 SLF4J_JDK14=/usr/share/java/slf4j/slf4j-jdk14.jar
 # Binding for log4j version 1.2, a widely used logging framework.
-SLF4J_LOG4J12=/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/log4j-1.2.15.jar
+SLF4J_LOG4J12=/usr/share/java/slf4j/slf4j-reload4j.jar
+SLF4J_RELOAD4J=/usr/share/java/slf4j/slf4j-reload4j.jar
 # Binding for NOP, silently discarding all logging.
 SLF4J_NOP=/usr/share/java/slf4j/slf4j-nop.jar
 # Binding for Simple  implementation, which outputs all events to System.err.