Accepting request 957222 from Java:packages

really remove the patch

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

_service

@@ -0,0 +1,15 @@
+<services>
+	<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="match-tag">v_*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">v_(.*)</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

build.xml.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:748214c48efa50088936dd57575a72555dde17bf79f0b24240e5e62605e7d9c6
-size 9405

build.xml.tar.xz

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

slf4j-1.7.32.tar.xz

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

slf4j-reload4j.patch

@@ -1,10 +0,0 @@
---- slf4j-v_1.7.32/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java	2021-07-29 20:27:41.000000000 +0200
-+++ slf4j-v_1.7.32/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java	2022-02-22 10:46:34.151501274 +0100
-@@ -10,7 +10,6 @@
- 	public static void fixForJava9() {
- 		if (MDC.mdc.tlm == null) {
- 			MDC.mdc.tlm = new ThreadLocalMap();
--			MDC.mdc.java1 = false;
- 			setRemoveMethod(MDC.mdc);
- 		}
- 

slf4j-sources.changes

@@ -1,188 +0,0 @@
--------------------------------------------------------------------
-Tue Feb 22 09:50:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
-
-- Added patch:
-  * slf4j-reload4j.patch
-    + fix build against reload4j
-
--------------------------------------------------------------------
-Wed Dec 29 10:53:06 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
-
-- Update to upstream version 1.7.32
-  * In the slf4j-simple module, SimpleLogger now caters for
-    concurrent access.
-- Update to upstream version 1.7.31
-  * In the jcl-over-slf4j module avoid Object to String conversion.
-  * In the log4j-over-slf4j module added empty constructors for
-    ConsoleAppender.
-
--------------------------------------------------------------------
-Sat Apr 11 19:11:24 UTC 2020 - Fridrich Strba <fstrba@suse.com>
-
-- Don't use %%mvn_artifact, but %%add_maven_depmap for the
-  sources artifacts, so that they don't suck in half of the xmvn*
-  stack in order to build
-
--------------------------------------------------------------------
-Wed Feb 26 12:40:57 UTC 2020 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to upstream version 1.7.30
-- Removed patch:
-  * slf4j-Disallow-EventData-deserialization-by-default.patch
-    + not needed any more
-
--------------------------------------------------------------------
-Wed Dec 18 09:09:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
-
-- Use the source tarball from github, since the previous one is
-  not accessible anymore
-- Modified patches:
-  * slf4j-Disallow-EventData-deserialization-by-default.patch
-    + Adapt to unix line-ends
-  * slf4j-commons-lang3.patch
-    + Adapt to unix line-ends
-    + Do not patch inexisting files
-
--------------------------------------------------------------------
-Sat Oct  5 12:59:06 UTC 2019 - Fridrich Strba <fstrba@suse.com>
-
-- Remove references to parent from all pom files
-- Avoid dependencies without version tag
-
--------------------------------------------------------------------
-Tue Oct  1 09:01:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>
-
-- Build against the compatibility log4j12-mini package
-- Depend on mvn(log4j:log4j:1.2.17) provided by the compatibility
-  packages
-
--------------------------------------------------------------------
-Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba <fstrba@suse.com>
-
-- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the
-  manifests.
-
--------------------------------------------------------------------
-Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba <fstrba@suse.com>
-
-- Split slf4j package into several sub-packages leaving only
-  parent, api, simple and nop in the main package
-- Package slf4j source jar files in a separate spec file
-
--------------------------------------------------------------------
-Tue Feb 26 09:24:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
-
-- Clean up the maven pom installation
-
--------------------------------------------------------------------
-Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to 1.7.25
-- Modify the build.xml file tarball to correspond to the right
-  version
-- Modify slf4j-commons-lang3.patch to the new context
-
--------------------------------------------------------------------
-Mon Oct 15 14:52:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
-
-- Install the maven artefacts to have mvn dependencies/provides
-  generated automatically
-
--------------------------------------------------------------------
-Fri May 18 09:17:44 UTC 2018 - pmonrealgonzalez@suse.com
-
-- Security fix:  [bsc#1085970, CVE-2018-8088]
-  * Disallow EventData deserialization by default
-  * Added slf4j-Disallow-EventData-deserialization-by-default.patch
-    refreshed from Fedora [ https://src.fedoraproject.org/rpms/slf4j/
-    blob/d7cd96bc7a8e8d8d62c8bc62baa7df02cef56c63/f/
-    0001-Disallow-EventData-deserialization-by-default.patch ]
-
--------------------------------------------------------------------
-Wed Oct 11 09:08:10 UTC 2017 - fstrba@suse.com
-
-- Adeed patch:
-  * slf4j-commons-lang3.patch
-    + Use apache-commons-lang3 instead of apache-commons-lang
-
--------------------------------------------------------------------
-Sun Sep 10 13:38:22 UTC 2017 - fstrba@suse.com
-
-- Specify java source and target levels 1.6 in order to allow
-  building with jdk9
-- Disable doclint to avoid bailing out on formatting errors
-- Recompress the build.xml.tar.bz2, so that it is a real tar.bz2 
-
--------------------------------------------------------------------
-Fri May 19 16:49:25 UTC 2017 - tchvatal@suse.com
-
-- Remove some not-needed deps
-
--------------------------------------------------------------------
-Tue Nov 10 09:07:58 UTC 2015 - dmacvicar@suse.de
-
-- note:
-  slf4j-pom_xml.patch was removed (not relevant anymore)
-
--------------------------------------------------------------------
-Fri Oct 23 10:14:51 UTC 2015 - dmacvicar@suse.de
-
-- remove all unnecessary maven depmap metadata
-
--------------------------------------------------------------------
-Fri Oct 23 08:56:21 UTC 2015 - dmacvicar@suse.de
-
-- update to version 1.7.12
-
--------------------------------------------------------------------
-Wed Mar 18 09:46:20 UTC 2015 - tchvatal@suse.com
-
-- Fix build with new javapackages-tools
-
--------------------------------------------------------------------
-Fri Aug 29 12:50:01 UTC 2014 - coolo@suse.com
-
-- build against log4j-mini to avoid a cycle
-
--------------------------------------------------------------------
-Thu Sep 19 14:22:54 UTC 2013 - mvyskocil@suse.com
-
-- self-provide osgi(slf4j.api) symbol 
-
--------------------------------------------------------------------
-Fri Sep 13 10:51:12 UTC 2013 - mvyskocil@suse.com
-
-- fix build with apache-commons-lang 
-
--------------------------------------------------------------------
-Wed Sep 11 07:49:42 UTC 2013 - mvyskocil@suse.com
-
-- use add_maven_depmap from javapackages-tools
-
--------------------------------------------------------------------
-Mon Sep  9 11:06:22 UTC 2013 - tchvatal@suse.com
-
-- Move from jpackage-utils to javapackage-tools
-
--------------------------------------------------------------------
-Fri Apr 27 09:59:40 UTC 2012 - mvyskocil@suse.cz
-
-- format spec file to be suitable for Factory 
-
--------------------------------------------------------------------
-Mon Dec 12 19:31:15 UTC 2011 - dmacvicar@suse.de
-
-- Fix absolute path in maven-build.xml that prevented
-  package task in newer versions of openSUSE
-- Fix javadoc group
-
--------------------------------------------------------------------
-Wed Jul 27 09:08:44 UTC 2011 - dmacvicar@suse.de
-
-- Completely remove all maven build parts. Build with ant
-
--------------------------------------------------------------------
-Mon Jul  4 21:18:38 UTC 2011 - dmacvicar@suse.de
-
-- add BuildRoot tag
-

slf4j-sources.spec

@@ -1,81 +0,0 @@
-#
-# spec file
-#
-# Copyright (c) 2022 SUSE LLC
-# Copyright (c) 2000-2009, JPackage Project
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%global base_name slf4j
-Name:           %{base_name}-sources
-Version:        1.7.32
-Release:        0
-Summary:        SLF4J Source JARs
-# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
-License:        Apache-2.0 AND MIT
-Group:          Development/Libraries/Java
-URL:            https://www.slf4j.org/
-Source0:        https://github.com/qos-ch/%{base_name}/archive/v_%{version}.tar.gz
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch2:         slf4j-commons-lang3.patch
-Patch3:         slf4j-reload4j.patch
-BuildRequires:  javapackages-local
-BuildArch:      noarch
-
-%description
-SLF4J Source JARs.
-
-%prep
-%setup -q -n %{base_name}-v_%{version}
-%patch2 -p1
-%patch3 -p1
-find . -name "*.jar" | xargs rm
-cp -p %{SOURCE1} APACHE-LICENSE
-
-# Compat symlinks
-%{mvn_file} ':{*}' %{base_name}/@1
-%{mvn_package} :::sources:
-
-%build
-rm -f */src/main/resources/META-INF/MANIFEST.MF
-for i in api ext jcl jdk14 log4j12 nop simple; do
-  mkdir -p %{base_name}-${i}/target
-  jar cf %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar -C %{base_name}-${i}/src/main/java .
-  jar uf %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar -C %{base_name}-${i}/src/main/resources .
-#  %{mvn_artifact} org.slf4j:%{base_name}-${i}:jar:sources:%{version} %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar
-done
-for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
-  mkdir -p ${i}/target
-  jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java .
-  jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources .
-#  %{mvn_artifact} org.slf4j:${i}:jar:sources:%{version} ${i}/target/${i}-%{version}-sources.jar
-done
-
-%install
-install -dm 0755 %{buildroot}%{_javadir}/%{base_name}
-for i in api ext jcl jdk14 log4j12 nop simple; do
-  install -pm 0644 %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar \
-    %{buildroot}%{_javadir}/%{base_name}/%{base_name}-${i}-sources.jar
-  %add_maven_depmap org.slf4j:%{base_name}-${i}:jar:sources:%{version} %{base_name}/%{base_name}-${i}-sources.jar
-done
-for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
-  install -pm 0644 ${i}/target/${i}-%{version}-sources.jar \
-    %{buildroot}%{_javadir}/%{base_name}/${i}-sources.jar
-  %add_maven_depmap org.slf4j:${i}:jar:sources:%{version} %{base_name}/${i}-sources.jar
-done
-
-%files -f .mfiles
-%license LICENSE.txt APACHE-LICENSE
-
-%changelog

slf4j.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Feb 24 07:08:36 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Do not use a separate spec file for sources, since now they
+  can be built in the same run as the other artifacts
+
+-------------------------------------------------------------------
+Wed Feb 23 07:17:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * slf4j-reload4j.patch
+    + the incompatibility is now handled in reload4j itself
+
+-------------------------------------------------------------------
+Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Fetch sources using source service
+- Depend for build on reload4j
+- Fix dependencies of the module slf4j-log4j12
+
 -------------------------------------------------------------------
 Tue Feb 22 09:50:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

slf4j.spec

@@ -25,12 +25,11 @@ Summary:        Simple Logging Facade for Java
 License:        Apache-2.0 AND MIT
 Group:          Development/Libraries/Java
 URL:            https://www.slf4j.org/
-Source0:        https://github.com/qos-ch/%{name}/archive/v_%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Source2:        build.xml.tar.bz2
+Source2:        build.xml.tar.xz
 Patch1:         build-remove-slf4j_api-binder.patch
 Patch2:         slf4j-commons-lang3.patch
-Patch3:         slf4j-reload4j.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-junit >= 1.6.5
 BuildRequires:  apache-commons-lang3
@@ -41,7 +40,7 @@ BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  javassist >= 3.4
 BuildRequires:  junit >= 3.8.2
-BuildRequires:  log4j12-mini
+BuildRequires:  reload4j
 Requires:       cal10n
 Requires:       java
 # this is ugly hack, which creates package which requires the same,
@@ -86,6 +85,7 @@ SLF4J JDK14 Binding.
 %package log4j12
 Summary:        SLF4J LOG4J-12 Binding
 Group:          Development/Libraries/Java
+Requires:       mvn(log4j:log4j)
 Requires:       mvn(org.slf4j:slf4j-api) = %{version}
 
 %description log4j12
@@ -132,11 +132,17 @@ Requires:       mvn(org.slf4j:slf4j-api) = %{version}
 %description -n jul-to-slf4j
 JUL to SLF4J bridge.
 
+%package sources
+Summary:        SLF4J Source JARs
+Group:          Development/Libraries/Java
+
+%description sources
+SLF4J Source JARs.
+
 %prep
-%setup -q -n %{name}-v_%{version} -a2
+%setup -q -a2
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 find . -name "*.jar" | xargs rm
 cp -p %{SOURCE1} APACHE-LICENSE
 
@@ -166,7 +172,7 @@ sed -i "/Import-Package/s/$/;resolution:=optional/" slf4j-api/src/main/resources
 %pom_change_dep -r -f ::::: :::::
 
 %build
-export CLASSPATH=$(build-classpath log4j12/log4j-12 \
+export CLASSPATH=$(build-classpath reload4j \
                    commons-logging \
                    commons-lang3 \
                    javassist-3.14.0 \
@@ -178,20 +184,46 @@ ant -Dmaven2.jpp.mode=true \
     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
     package javadoc \
 
+# Sources
+for i in api ext jcl jdk14 log4j12 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 .
+done
+
+for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
+  mkdir -p ${i}/target
+  jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java .
+  jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources .
+done
+
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/%{name}
+
 for i in api ext jcl jdk14 log4j12 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
 done
+
 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
+  install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar \
+    %{buildroot}%{_javadir}/%{name}/%{name}-${i}-sources.jar
+done
+
+for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
+  install -pm 0644 ${i}/target/${i}-%{version}-sources.jar \
+    %{buildroot}%{_javadir}/%{name}/${i}-sources.jar
+done
+
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
+
 for i in api ext jcl jdk14 log4j12 nop simple; do
   %pom_remove_parent slf4j-${i}
   %pom_xpath_inject "pom:project" "
@@ -199,6 +231,7 @@ for i in api ext jcl jdk14 log4j12 nop simple; do
     <version>%{version}</version>" slf4j-${i}
   install -pm 644 slf4j-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
 done
+
 for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
   %pom_remove_parent ${i}
   %pom_xpath_inject "pom:project" "
@@ -206,13 +239,23 @@ for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
     <version>%{version}</version>" ${i}
   install -pm 644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
 done
+
 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
   %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 org.slf4j:%{name}-${i}:jar:sources:%{version} %{name}/%{name}-${i}-sources.jar -f sources
+done
+
+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
+
 # manual
 install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
 rm -f target/site/.htaccess
@@ -249,6 +292,8 @@ rm -rf target/site
 
 %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j
 
+%files sources -f .mfiles-sources
+
 %files javadoc
 %{_javadocdir}/%{name}
 

v_1.7.32.tar.gz

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