rpms/slf4j
7
0
Fork 0
Code Issues Pull Requests Releases Activity

port to commons-lang3

Browse Source
This commit is contained in:
Fabio Valentini 2020-07-29 14:53:56 +02:00
parent 2ef46dc13c
commit 06831a1cfd
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slf4j.spec
View File

@ -30,7 +30,7 @@
Name: slf4j Name: slf4j
Version: 1.7.30 Version: 1.7.30
Release: 5%{?dist} Release: 6%{?dist}
Epoch: 0 Epoch: 0
Summary: Simple Logging Facade for Java Summary: Simple Logging Facade for Java
# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
@ -42,10 +42,10 @@ BuildArch: noarch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(ch.qos.cal10n:cal10n-api) BuildRequires: mvn(ch.qos.cal10n:cal10n-api)
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(javassist:javassist)
BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(log4j:log4j:1.2.17)
BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
@ -160,6 +160,12 @@ find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
<phase>skip</phase> <phase>skip</phase>
</execution>" slf4j-api </execution>" slf4j-api
# trivial port to commons-lang3
%pom_change_dep :commons-lang org.apache.commons:commons-lang3:3.8.1 slf4j-ext
sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \
slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java
# The general pattern is that the API package exports API classes and does # 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 # not require impl classes. slf4j was breaking that causing "A cycle was
# detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api." # detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api."
@ -214,6 +220,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
%{_defaultdocdir}/%{name}-manual %{_defaultdocdir}/%{name}-manual
%changelog %changelog
* Thu Jul 30 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7.30-6
- Port to commons-lang3.
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7.30-5 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7.30-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild