Accepting request 957713 from Java:packages

1.7.36

OBS-URL: https://build.opensuse.org/request/show/957713
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slf4j?expand=0&rev=28

_service

@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/qos-ch/slf4j.git</param>
-		<param name="revision">v_1.7.32</param>
+		<param name="revision">v_1.7.36</param>
 		<param name="match-tag">v_*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">v_(.*)</param>

build.xml.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a4b31b1488ed43e9239545ea99b6ed9ada625133cf767828afd8f3247680ea7
-size 7880
+oid sha256:055304e12e9ce0b96444ef6c73761af855a06b0ad396ca6f754cfd395d38ff22
+size 7628

slf4j-1.7.32.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3394567be9f31307d69e4d41a62e8be48f8c080ed9ae8ec6911515fe64ab948b
-size 2022484

slf4j-reload4j-bundlename.patch

@@ -0,0 +1,10 @@
+--- slf4j-1.7.36/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF	2022-02-08 14:32:21.000000000 +0100
++++ slf4j-1.7.36/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF	2022-02-24 21:41:59.547775126 +0100
+@@ -1,6 +1,6 @@
+ Implementation-Title: slf4j-reload4j
+ Bundle-ManifestVersion: 2
+-Bundle-SymbolicName: slf4j.reload4k
++Bundle-SymbolicName: slf4j.reload4j
+ Bundle-Name: slf4j-reload4j
+ Bundle-Vendor: SLF4J.ORG
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5

slf4j.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Feb 25 17:24:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 1.7.36
+  * Changes in 1.7.36:
+    + Correct corrupt "Export-Package" declaration in MANIFEST.MF
+      in log4j-over-slf4j module
+    + Starting with version 1.7.36, slf4j releases will be
+      reproducible. By reproducible we mean that anyone checking out
+      the code corresponding to the release version from source code
+      repository and building that local copy, will obtain an
+      identical binary to the published binary.
+  * Changes 1.7.35
+    + In this release, the "slf4j-log4j12" artifact automatically
+      instructs Maven to use the "slf4j-reload4j" artifact instead.
+      As you might have guessed, the "slf4j-reload4j" binding
+      delegates log processing to the reload4j logging framework.
+    + Fix incorrect version number in the relocation element in
+      slf4j-log4j12/pom.ml
+  * Changes in 1.7.34
+    + The relocation element in slf4j-log4j12 had incorrect version
+      number. Version 1.7.34 should not be used.
+  * Changes in 1.7.33
+    + SLF4J now ships with the slf4j-reload4j module delegating to
+      the reload4j backend.
+    + SimpleLogger now prints the thread Id if instructed to do so.
+      This fixes SLF4J-499.
+- Added patch:
+  * slf4j-reload4j-bundlename.patch
+    + fix a typo in source reload4k -> reload4j
+
 -------------------------------------------------------------------
 Thu Feb 24 07:08:36 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

slf4j.spec

@@ -18,7 +18,7 @@
 
 
 Name:           slf4j
-Version:        1.7.32
+Version:        1.7.36
 Release:        0
 Summary:        Simple Logging Facade for Java
 # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
@@ -30,6 +30,7 @@ Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        build.xml.tar.xz
 Patch1:         build-remove-slf4j_api-binder.patch
 Patch2:         slf4j-commons-lang3.patch
+Patch3:         slf4j-reload4j-bundlename.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-junit >= 1.6.5
 BuildRequires:  apache-commons-lang3
@@ -82,13 +83,15 @@ Requires:       mvn(org.slf4j:slf4j-api) = %{version}
 %description jdk14
 SLF4J JDK14 Binding.
 
-%package log4j12
+%package reload4j
 Summary:        SLF4J LOG4J-12 Binding
 Group:          Development/Libraries/Java
-Requires:       mvn(log4j:log4j)
+Requires:       mvn(ch.qos.reload4j:reload4j)
 Requires:       mvn(org.slf4j:slf4j-api) = %{version}
+Provides:       %{name}-log4j12 = %{version}
+Obsoletes:      %{name}-log4j12 < %{version}
 
-%description log4j12
+%description reload4j
 SLF4J LOG4J-12 Binding.
 
 %package jcl
@@ -143,11 +146,15 @@ SLF4J Source JARs.
 %setup -q -a2
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 find . -name "*.jar" | xargs rm
 cp -p %{SOURCE1} APACHE-LICENSE
 
 sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml
 
+sed -i -e "s|\${reload4j.version}|1\.2\.19|g" \
+	log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+
 %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
     %{_bindir}/xargs -t perl -pi -e 's/\r$//g'
 
@@ -185,7 +192,7 @@ ant -Dmaven2.jpp.mode=true \
     package javadoc \
 
 # Sources
-for i in api ext jcl jdk14 log4j12 nop simple; do
+for i in api ext jcl jdk14 reload4j nop simple; do
   mkdir -p %{name}-${i}/target
   jar cf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/java .
   jar uf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/resources .
@@ -201,7 +208,7 @@ done
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/%{name}
 
-for i in api ext jcl jdk14 log4j12 nop simple; do
+for i in api ext jcl jdk14 reload4j nop simple; do
   install -m 644 slf4j-${i}/target/slf4j-${i}-%{version}.jar \
     %{buildroot}%{_javadir}/%{name}/${i}.jar
   ln -sf ${i}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
@@ -211,7 +218,7 @@ for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
   install -m 644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
 done
 
-for i in api ext jcl jdk14 log4j12 nop simple; do
+for i in api ext jcl jdk14 reload4j nop simple; do
   install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar \
     %{buildroot}%{_javadir}/%{name}/%{name}-${i}-sources.jar
 done
@@ -224,7 +231,7 @@ done
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
 
-for i in api ext jcl jdk14 log4j12 nop simple; do
+for i in api ext jcl jdk14 reload4j nop simple; do
   %pom_remove_parent slf4j-${i}
   %pom_xpath_inject "pom:project" "
     <groupId>org.slf4j</groupId>
@@ -244,14 +251,18 @@ for i in api nop simple; do
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
 done
 
-for i in ext jcl jdk14 log4j12 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
+for i in ext jcl jdk14 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
 done
 
-for i in api ext jcl jdk14 log4j12 nop simple; do
+%add_maven_depmap %{name}/reload4j.pom %{name}/reload4j.jar -f reload4j  -a org.slf4j:%{name}-log4j12
+
+for i in api ext jcl jdk14 reload4j nop simple; do
   %add_maven_depmap org.slf4j:%{name}-${i}:jar:sources:%{version} %{name}/%{name}-${i}-sources.jar -f sources
 done
 
+%add_maven_depmap org.slf4j:%{name}-log4j12:jar:sources:%{version} %{name}/%{name}-reload4j-sources.jar -f sources
+
 for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
   %add_maven_depmap org.slf4j:${i}:jar:sources:%{version} %{name}/${i}-sources.jar -f sources
 done
@@ -277,8 +288,8 @@ rm -rf target/site
 %files jdk14 -f .mfiles-jdk14
 %{_javadir}/%{name}/%{name}-jdk14.jar
 
-%files log4j12 -f .mfiles-log4j12
-%{_javadir}/%{name}/%{name}-log4j12.jar
+%files reload4j -f .mfiles-reload4j
+%{_javadir}/%{name}/%{name}-reload4j.jar
 
 %files jcl -f .mfiles-jcl
 %{_javadir}/%{name}/%{name}-jcl.jar