From 718a57eddada25c7770145b5a2c070c510886bcfe94b0076760d9521e98a3203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?=
import org.slf4j.MDC; +-import org.apache.commons.lang.time.DateUtils; ++import org.apache.commons.lang3.time.DateUtils; + + import javax.servlet.Filter; + import javax.servlet.FilterConfig; +@@ -832,7 +832,7 @@ +Some classes may misbehave when being rendered with "object.toString()" so they may be explicitly disabled + in the logback configuration file permanently. For instance the ToStringBuilder in the Apache Jakarta commons lang + package is a prime candidate for this. For logback add this snippet to logback.xml: +-
<logger name="org.apache.commons.lang.builder" level="OFF" />++<logger name="org.apache.commons.lang3.builder" level="OFF" />+ + + +--- slf4j-1.7.25/slf4j-site/src/site/pages/news.html 2017-03-16 17:16:09.000000000 +0100 ++++ slf4j-1.7.25/slf4j-site/src/site/pages/news.html 2018-10-22 12:34:02.785643241 +0200 +@@ -966,7 +966,7 @@ + used with Apache Commons Lang'sStrSubstitutor
class to + inject values in the SLF4J MDC into strings. Information on + StrSubstitutor can be found at StrSubstitutor ++ href="http://commons.apache.org/lang/api-release/org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor + javadoc. + + diff --git a/slf4j-reload4j-bundlename.patch b/slf4j-reload4j-bundlename.patch new file mode 100644 index 0000000..be84dab --- /dev/null +++ b/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 diff --git a/slf4j.changes b/slf4j.changes new file mode 100644 index 0000000..045ee81 --- /dev/null +++ b/slf4j.changes @@ -0,0 +1,256 @@ +------------------------------------------------------------------- +Tue May 30 16:41:16 UTC 2023 - Fridrich Strba+ +- Do not require junit and ant-junit, since we don't run tests + during the build + +------------------------------------------------------------------- +Wed Jul 6 12:30:15 UTC 2022 - Fridrich Strba + +- Add symlink to reload4j -> log4j12 for applications that expect + that name. + +------------------------------------------------------------------- +Sat Mar 19 08:06:45 UTC 2022 - Fridrich Strba + +- Build with source/target levels 8 + +------------------------------------------------------------------- +Fri Feb 25 17:24:17 UTC 2022 - Fridrich Strba + +- 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 + +- 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 + +- Removed patch: + * slf4j-reload4j.patch + + the incompatibility is now handled in reload4j itself + +------------------------------------------------------------------- +Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba + +- 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 + +- Added patch: + * slf4j-reload4j.patch + + fix build against reload4j + +------------------------------------------------------------------- +Wed Dec 29 10:53:06 UTC 2021 - Pedro Monreal + +- 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 + +- 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 + +- 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 + +- 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 + +- Remove references to parent from all pom files +- Avoid dependencies without version tag + +------------------------------------------------------------------- +Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba + +- 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 + +- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the + manifests. + +------------------------------------------------------------------- +Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba + +- 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 + +- Clean up the maven pom installation + +------------------------------------------------------------------- +Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba + +- 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 + +- 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 + diff --git a/slf4j.spec b/slf4j.spec new file mode 100644 index 0000000..56f0807 --- /dev/null +++ b/slf4j.spec @@ -0,0 +1,316 @@ +# +# spec file for package slf4j +# +# Copyright (c) 2023 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/ +# + + +Name: slf4j +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 +License: Apache-2.0 AND MIT +Group: Development/Libraries/Java +URL: https://www.slf4j.org/ +Source0: %{name}-%{version}.tar.xz +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: apache-commons-lang3 +BuildRequires: apache-commons-logging +BuildRequires: cal10n +BuildRequires: java-devel >= 1.5.0 +BuildRequires: javapackages-local +BuildRequires: javassist >= 3.4 +BuildRequires: reload4j +Requires: cal10n +Requires: java +# this is ugly hack, which creates package which requires the same, +# however slf4j is not splitted between -api and -impl, but pom files are modeled as it was +Provides: osgi(slf4j.api) +BuildArch: noarch + +%description +The Simple Logging Facade for Java or (SLF4J) is intended to serve +as a simple facade for various logging APIs allowing to the end-user +to plug in the desired implementation at deployment time. SLF4J also +allows for a gradual migration path away from +Jakarta Commons Logging (JCL). + +Logging API implementations can either choose to implement the +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: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +API documentation for %{name}. + +%package manual +Summary: Documents for %{name} +Group: Documentation/Other + +%description manual +Manual for %{name}. + +%package jdk14 +Summary: SLF4J JDK14 Binding +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description jdk14 +SLF4J JDK14 Binding. + +%package reload4j +Summary: SLF4J LOG4J-12 Binding +Group: Development/Libraries/Java +Requires: mvn(ch.qos.reload4j:reload4j) +Requires: mvn(org.slf4j:slf4j-api) = %{version} +Provides: %{name}-log4j12 = %{version} +Obsoletes: %{name}-log4j12 < %{version} + +%description reload4j +SLF4J LOG4J-12 Binding. + +%package jcl +Summary: SLF4J JCL Binding +Group: Development/Libraries/Java +Requires: mvn(commons-logging:commons-logging) +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description jcl +SLF4J JCL Binding. + +%package ext +Summary: SLF4J Extensions Module +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description ext +Extensions to the SLF4J API. + +%package -n jcl-over-slf4j +Summary: JCL 1.1.1 implemented over SLF4J +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description -n jcl-over-slf4j +JCL 1.1.1 implemented over SLF4J. + +%package -n log4j-over-slf4j +Summary: Log4j implemented over SLF4J +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description -n log4j-over-slf4j +Log4j implemented over SLF4J. + +%package -n jul-to-slf4j +Summary: JUL to SLF4J bridge +Group: Development/Libraries/Java +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 -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' + +# Unexpanded variable in the manifests +for i in */src/main/resources/META-INF/MANIFEST.MF; do + echo "" >> ${i} + echo "Bundle-Version: %{version}" >> ${i} + sed -i '/^$/d' ${i} + perl -pi -e 's#\$\{parsedVersion\.osgiVersion\}#%{version}#g' ${i} + perl -pi -e 's#\$\{slf4j\.api\.minimum\.compatible\.version\}#1\.6\.0#g' ${i} +done + +# The general pattern is that the API package exports API classes and does +# # not require impl classes. slf4j was breaking that causing "A cycle was +# # detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api." +# # The API bundle requires impl package, so to avoid cyclic dependencies +# # during build time, it is necessary to mark the imported package as an +# # optional one. +# # Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283 +sed -i "/Import-Package/s/$/;resolution:=optional/" slf4j-api/src/main/resources/META-INF/MANIFEST.MF + +%pom_change_dep -r -f ::::: ::::: + +%build +export CLASSPATH=$(build-classpath reload4j \ + commons-logging \ + commons-lang3 \ + javassist-3.14.0 \ + cal10n) +export CLASSPATH=$CLASSPATH:$(pwd)/slf4j-api/target/slf4j-api-%{version}.jar +export MAVEN_REPO_LOCAL=$(pwd)/.m2 +ant -Dmaven2.jpp.mode=true \ + -Dmaven.test.skip=true \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + package javadoc \ + +# Sources +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 . +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 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 +done + +# Compatibility symlink +ln -sf reload4j.jar %{buildroot}%{_javadir}/%{name}/log4j12.jar +ln -sf reload4j.jar %{buildroot}%{_javadir}/%{name}/%{name}-log4j12.jar + +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 reload4j 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 reload4j nop simple; do + %pom_remove_parent slf4j-${i} + %pom_xpath_inject "pom:project" " + org.slf4j +%{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" " +org.slf4j +%{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 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} +done + +%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 + +# manual +install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} +rm -f target/site/.htaccess +cp -pr target/site %{buildroot}%{_docdir}/%{name}-%{version}/ +install -m 644 LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/ + +# javadoc +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/ +rm -rf target/site + +%files -f .mfiles +%dir %{_docdir}/%{name}-%{version} +%license %{_docdir}/%{name}-%{version}/LICENSE.txt +%{_javadir}/%{name}/%{name}-api.jar +%{_javadir}/%{name}/%{name}-nop.jar +%{_javadir}/%{name}/%{name}-simple.jar + +%files jdk14 -f .mfiles-jdk14 +%{_javadir}/%{name}/%{name}-jdk14.jar + +%files reload4j -f .mfiles-reload4j +%{_javadir}/%{name}/%{name}-reload4j.jar +%{_javadir}/%{name}/*log4j12.jar + +%files jcl -f .mfiles-jcl +%{_javadir}/%{name}/%{name}-jcl.jar + +%files ext -f .mfiles-ext +%{_javadir}/%{name}/%{name}-ext.jar + +%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 + +%files sources -f .mfiles-sources + +%files javadoc +%{_javadocdir}/%{name} + +%files manual +%{_docdir}/%{name}-%{version}/site + +%changelog