diff --git a/_service b/_service index 12ff674..9f63fa3 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/qos-ch/slf4j.git - v_1.7.32 + v_1.7.36 v_* @PARENT_TAG@ v_(.*) diff --git a/build.xml.tar.xz b/build.xml.tar.xz index 307baa0..7f1a2a7 100644 --- a/build.xml.tar.xz +++ b/build.xml.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a4b31b1488ed43e9239545ea99b6ed9ada625133cf767828afd8f3247680ea7 -size 7880 +oid sha256:dd511a2221df4e753a8e7a340a2031d686126b690cc0f185fa84ca287b5e3cc1 +size 7500 diff --git a/slf4j-1.7.32.tar.xz b/slf4j-1.7.32.tar.xz deleted file mode 100644 index 62228eb..0000000 --- a/slf4j-1.7.32.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3394567be9f31307d69e4d41a62e8be48f8c080ed9ae8ec6911515fe64ab948b -size 2022484 diff --git a/slf4j-1.7.36.tar.xz b/slf4j-1.7.36.tar.xz new file mode 100644 index 0000000..7661edd --- /dev/null +++ b/slf4j-1.7.36.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12093f5891b610b72d3d8147c9a763cbdf284a2d6b46ddbcfa2b1291bf77f5cd +size 2021864 diff --git a/slf4j.spec b/slf4j.spec index c905000..92dc339 100644 --- a/slf4j.spec +++ b/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 @@ -82,13 +82,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 @@ -185,7 +187,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 +203,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 +213,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 +226,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" " org.slf4j @@ -244,14 +246,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 +283,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