Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2022-02-27 22:42:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slf4j" Sun Feb 27 22:42:44 2022 rev:28 rq:957713 version:1.7.36 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j.changes 2022-02-24 18:18:50.810732144 +0100 +++ /work/SRC/openSUSE:Factory/.slf4j.new.1958/slf4j.changes 2022-02-27 22:42:47.390625159 +0100 @@ -1,0 +2,31 @@ +Fri Feb 25 17:24:17 UTC 2022 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- slf4j-1.7.32.tar.xz New: ---- slf4j-1.7.36.tar.xz slf4j-reload4j-bundlename.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.WxDWXZ/_old 2022-02-27 22:42:48.158625381 +0100 +++ /var/tmp/diff_new_pack.WxDWXZ/_new 2022-02-27 22:42:48.162625383 +0100 @@ -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 @@ 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 @@ %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 @@ %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 @@ 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 @@ # 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 @@ 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 @@ # 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 @@ %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 @@ %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 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.WxDWXZ/_old 2022-02-27 22:42:48.218625399 +0100 +++ /var/tmp/diff_new_pack.WxDWXZ/_new 2022-02-27 22:42:48.222625400 +0100 @@ -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 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integration/maven-build.properties new/integration/maven-build.properties --- old/integration/maven-build.properties 2021-12-29 12:04:25.396677431 +0100 +++ new/integration/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=integration-1.7.32 +maven.build.finalName=integration-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integration/maven-build.xml new/integration/maven-build.xml --- old/integration/maven-build.xml 2021-12-29 12:04:25.404677523 +0100 +++ new/integration/maven-build.xml 2022-02-22 13:39:20.664776463 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="integration-1.7.32"/> + <property name="maven.build.finalName" value="integration-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,7 +44,7 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/> <pathelement location="${maven.repo.local}/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.main/2.0.2/org.apache.felix.main-2.0.2.jar"/> @@ -54,7 +54,7 @@ <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.4.2/org.apache.felix.bundlerepository-1.4.2.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/> <pathelement location="${maven.repo.local}/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.main/2.0.2/org.apache.felix.main-2.0.2.jar"/> @@ -210,9 +210,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jcl-over-slf4j/maven-build.properties new/jcl-over-slf4j/maven-build.properties --- old/jcl-over-slf4j/maven-build.properties 2021-12-29 12:04:25.408677570 +0100 +++ new/jcl-over-slf4j/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=jcl-over-slf4j-1.7.32 +maven.build.finalName=jcl-over-slf4j-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jcl-over-slf4j/maven-build.xml new/jcl-over-slf4j/maven-build.xml --- old/jcl-over-slf4j/maven-build.xml 2021-12-29 12:04:25.416677663 +0100 +++ new/jcl-over-slf4j/maven-build.xml 2022-02-22 13:39:20.664776463 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="jcl-over-slf4j-1.7.32"/> + <property name="maven.build.finalName" value="jcl-over-slf4j-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -242,14 +242,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jul-to-slf4j/maven-build.properties new/jul-to-slf4j/maven-build.properties --- old/jul-to-slf4j/maven-build.properties 2021-12-29 12:04:25.424677755 +0100 +++ new/jul-to-slf4j/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=jul-to-slf4j-1.7.32 +maven.build.finalName=jul-to-slf4j-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jul-to-slf4j/maven-build.xml new/jul-to-slf4j/maven-build.xml --- old/jul-to-slf4j/maven-build.xml 2021-12-29 12:04:25.432677848 +0100 +++ new/jul-to-slf4j/maven-build.xml 2022-02-22 13:39:20.664776463 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="jul-to-slf4j-1.7.32"/> + <property name="maven.build.finalName" value="jul-to-slf4j-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar"/> <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> @@ -246,14 +246,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-reload4j/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4j-over-slf4j/maven-build.properties new/log4j-over-slf4j/maven-build.properties --- old/log4j-over-slf4j/maven-build.properties 2021-12-29 12:04:25.436677894 +0100 +++ new/log4j-over-slf4j/maven-build.properties 2022-02-25 19:46:29.277732837 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=log4j-over-slf4j-1.7.32 +maven.build.finalName=log4j-over-slf4j-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -15,12 +15,11 @@ maven.test.reports=${maven.build.dir}/test-reports maven.build.dir=target maven-site-plugin.version=3.3 -logback.version=1.0.13 +reload4j.version=1.2.19 required.jdk.version=1.6 project.build.outputDirectory=${maven.build.outputDir} cal10n.version=0.8.1 maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4j-over-slf4j/maven-build.xml new/log4j-over-slf4j/maven-build.xml --- old/log4j-over-slf4j/maven-build.xml 2021-12-29 12:04:25.440677941 +0100 +++ new/log4j-over-slf4j/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="log4j-over-slf4j-1.7.32"/> + <property name="maven.build.finalName" value="log4j-over-slf4j-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -242,14 +242,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-build.xml new/maven-build.xml --- old/maven-build.xml 2015-10-23 10:01:49.244333856 +0200 +++ new/maven-build.xml 2022-02-22 13:38:10.416313393 +0100 @@ -26,7 +26,7 @@ <ant antfile="build.xml" dir="slf4j-simple" target="clean"/> <ant antfile="build.xml" dir="slf4j-nop" target="clean"/> <ant antfile="build.xml" dir="slf4j-jdk14" target="clean"/> - <ant antfile="build.xml" dir="slf4j-log4j12" target="clean"/> + <ant antfile="build.xml" dir="slf4j-reload4j" target="clean"/> <ant antfile="build.xml" dir="slf4j-jcl" target="clean"/> <ant antfile="build.xml" dir="slf4j-ext" target="clean"/> <ant antfile="build.xml" dir="jcl-over-slf4j" target="clean"/> @@ -45,7 +45,7 @@ <ant antfile="build.xml" dir="slf4j-simple" target="compile"/> <ant antfile="build.xml" dir="slf4j-nop" target="compile"/> <ant antfile="build.xml" dir="slf4j-jdk14" target="compile"/> - <ant antfile="build.xml" dir="slf4j-log4j12" target="compile"/> + <ant antfile="build.xml" dir="slf4j-reload4j" target="compile"/> <ant antfile="build.xml" dir="slf4j-jcl" target="compile"/> <ant antfile="build.xml" dir="slf4j-ext" target="compile"/> <ant antfile="build.xml" dir="jcl-over-slf4j" target="compile"/> @@ -64,7 +64,7 @@ <ant antfile="build.xml" dir="slf4j-simple" target="compile-tests"/> <ant antfile="build.xml" dir="slf4j-nop" target="compile-tests"/> <ant antfile="build.xml" dir="slf4j-jdk14" target="compile-tests"/> - <ant antfile="build.xml" dir="slf4j-log4j12" target="compile-tests"/> + <ant antfile="build.xml" dir="slf4j-reload4j" target="compile-tests"/> <ant antfile="build.xml" dir="slf4j-jcl" target="compile-tests"/> <ant antfile="build.xml" dir="slf4j-ext" target="compile-tests"/> <ant antfile="build.xml" dir="jcl-over-slf4j" target="compile-tests"/> @@ -83,7 +83,7 @@ <ant antfile="build.xml" dir="slf4j-simple" target="test"/> <ant antfile="build.xml" dir="slf4j-nop" target="test"/> <ant antfile="build.xml" dir="slf4j-jdk14" target="test"/> - <ant antfile="build.xml" dir="slf4j-log4j12" target="test"/> + <ant antfile="build.xml" dir="slf4j-reload4j" target="test"/> <ant antfile="build.xml" dir="slf4j-jcl" target="test"/> <ant antfile="build.xml" dir="slf4j-ext" target="test"/> <ant antfile="build.xml" dir="jcl-over-slf4j" target="test"/> @@ -102,7 +102,7 @@ <ant antfile="build.xml" dir="slf4j-simple" target="javadoc"/> <ant antfile="build.xml" dir="slf4j-nop" target="javadoc"/> <ant antfile="build.xml" dir="slf4j-jdk14" target="javadoc"/> - <ant antfile="build.xml" dir="slf4j-log4j12" target="javadoc"/> + <ant antfile="build.xml" dir="slf4j-reload4j" target="javadoc"/> <ant antfile="build.xml" dir="slf4j-jcl" target="javadoc"/> <ant antfile="build.xml" dir="slf4j-ext" target="javadoc"/> <ant antfile="build.xml" dir="jcl-over-slf4j" target="javadoc"/> @@ -121,7 +121,7 @@ <ant antfile="build.xml" dir="slf4j-simple" target="package"/> <ant antfile="build.xml" dir="slf4j-nop" target="package"/> <ant antfile="build.xml" dir="slf4j-jdk14" target="package"/> - <ant antfile="build.xml" dir="slf4j-log4j12" target="package"/> + <ant antfile="build.xml" dir="slf4j-reload4j" target="package"/> <ant antfile="build.xml" dir="slf4j-jcl" target="package"/> <ant antfile="build.xml" dir="slf4j-ext" target="package"/> <ant antfile="build.xml" dir="jcl-over-slf4j" target="package"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osgi-over-slf4j/maven-build.properties new/osgi-over-slf4j/maven-build.properties --- old/osgi-over-slf4j/maven-build.properties 2021-12-29 12:04:25.448678033 +0100 +++ new/osgi-over-slf4j/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=osgi-over-slf4j-1.7.32 +maven.build.finalName=osgi-over-slf4j-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osgi-over-slf4j/maven-build.xml new/osgi-over-slf4j/maven-build.xml --- old/osgi-over-slf4j/maven-build.xml 2021-12-29 12:04:25.456678126 +0100 +++ new/osgi-over-slf4j/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="osgi-over-slf4j-1.7.32"/> + <property name="maven.build.finalName" value="osgi-over-slf4j-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -46,14 +46,14 @@ <path id="build.classpath"> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.enterprise/4.2.0/org.osgi.enterprise-4.2.0.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.enterprise/4.2.0/org.osgi.enterprise-4.2.0.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -208,14 +208,14 @@ dest="${maven.repo.local}/org/osgi/org.osgi.enterprise/4.2.0/org.osgi.enterprise-4.2.0.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-android/maven-build.properties new/slf4j-android/maven-build.properties --- old/slf4j-android/maven-build.properties 2021-12-29 12:04:25.460678172 +0100 +++ new/slf4j-android/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-android-1.7.32 +maven.build.finalName=slf4j-android-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-android/maven-build.xml new/slf4j-android/maven-build.xml --- old/slf4j-android/maven-build.xml 2021-12-29 12:04:25.468678265 +0100 +++ new/slf4j-android/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-android-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-android-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,7 +44,7 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/com/google/android/android/1.5_r4/android-1.5_r4.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/> @@ -55,7 +55,7 @@ <pathelement location="${maven.repo.local}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/com/google/android/android/1.5_r4/android-1.5_r4.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/> @@ -257,9 +257,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/com/google/android/android/1.5_r4"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-api/maven-build.properties new/slf4j-api/maven-build.properties --- old/slf4j-api/maven-build.properties 2021-12-29 12:04:25.472678311 +0100 +++ new/slf4j-api/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-api-1.7.32 +maven.build.finalName=slf4j-api-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-api/maven-build.xml new/slf4j-api/maven-build.xml --- old/slf4j-api/maven-build.xml 2021-12-29 12:04:25.480678404 +0100 +++ new/slf4j-api/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-api-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-api-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-ext/maven-build.properties new/slf4j-ext/maven-build.properties --- old/slf4j-ext/maven-build.properties 2021-12-29 12:04:25.484678450 +0100 +++ new/slf4j-ext/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-ext-1.7.32 +maven.build.finalName=slf4j-ext-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-ext/maven-build.xml new/slf4j-ext/maven-build.xml --- old/slf4j-ext/maven-build.xml 2021-12-29 12:04:25.492678543 +0100 +++ new/slf4j-ext/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-ext-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-ext-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,14 +44,14 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1.jar"/> <pathelement location="${maven.repo.local}/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar"/> <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> <pathelement location="${maven.repo.local}/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1.jar"/> <pathelement location="${maven.repo.local}/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> @@ -252,14 +252,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-reload4j/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-reload4j/1.7.36/slf4j-reload4j-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jcl/maven-build.properties new/slf4j-jcl/maven-build.properties --- old/slf4j-jcl/maven-build.properties 2021-12-29 12:04:25.496678589 +0100 +++ new/slf4j-jcl/maven-build.properties 2022-02-25 19:41:11.651697523 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-jcl-1.7.32 +maven.build.finalName=slf4j-jcl-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jcl/maven-build.xml new/slf4j-jcl/maven-build.xml --- old/slf4j-jcl/maven-build.xml 2021-12-29 12:04:25.504678682 +0100 +++ new/slf4j-jcl/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-jcl-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-jcl-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> @@ -243,9 +243,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/commons-logging/commons-logging/1.1.1"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jdk14/maven-build.properties new/slf4j-jdk14/maven-build.properties --- old/slf4j-jdk14/maven-build.properties 2021-12-29 12:04:25.508678728 +0100 +++ new/slf4j-jdk14/maven-build.properties 2022-02-25 19:41:11.651697523 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-jdk14-1.7.32 +maven.build.finalName=slf4j-jdk14-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jdk14/maven-build.xml new/slf4j-jdk14/maven-build.xml --- old/slf4j-jdk14/maven-build.xml 2021-12-29 12:04:25.516678820 +0100 +++ new/slf4j-jdk14/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-jdk14-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-jdk14-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32-tests.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36-tests.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -242,14 +242,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32-tests.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32-tests.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36-tests.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36-tests.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-log4j12/build.xml new/slf4j-log4j12/build.xml --- old/slf4j-log4j12/build.xml 2015-10-23 09:49:17.385477055 +0200 +++ new/slf4j-log4j12/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<project name="slf4j-log4j12" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Import maven-build.xml into the current project --> - <!-- ====================================================================== --> - - <import file="maven-build.xml"/> - - <!-- ====================================================================== --> - <!-- Help target --> - <!-- ====================================================================== --> - - <target name="help"> - <echo message="Please run: $ant -projecthelp"/> - </target> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-log4j12/maven-build.properties new/slf4j-log4j12/maven-build.properties --- old/slf4j-log4j12/maven-build.properties 2021-12-29 12:04:25.520678867 +0100 +++ new/slf4j-log4j12/maven-build.properties 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE! -#Fri Oct 23 09:31:42 CEST 2015 -slf4j.api.minimum.compatible.version=1.6.0 -maven.settings.offline=false -maven.build.finalName=slf4j-log4j12-1.7.32 -maven.build.resourceDir.0=src/main/resources -maven.build.testOutputDir=${maven.build.dir}/test-classes -javadoc.plugin.version=2.10.2 -maven.build.testResourceDir.0=src/test/resources -maven.reporting.outputDirectory=${maven.build.dir}/site -project.build.sourceEncoding=UTF-8 -maven.build.srcDir.0=src/main/java -junit.version=4.10 -project.build.directory=${maven.build.dir} -maven.test.reports=${maven.build.dir}/test-reports -maven.build.dir=target -maven-site-plugin.version=3.3 -logback.version=1.0.13 -required.jdk.version=1.6 -project.build.outputDirectory=${maven.build.outputDir} -cal10n.version=0.8.1 -maven.build.testDir.0=src/test/java -maven.settings.interactiveMode=true -maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 -maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-log4j12/maven-build.xml new/slf4j-log4j12/maven-build.xml --- old/slf4j-log4j12/maven-build.xml 2021-12-29 12:04:25.524678913 +0100 +++ new/slf4j-log4j12/maven-build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,271 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<!-- ====================================================================== --> -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> -<!-- ====================================================================== --> -<!-- --> -<!-- Any modifications will be overwritten. --> -<!-- --> -<!-- Generated by Maven Ant Plugin on 10/23/15 9:31 AM --> -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> -<!-- --> -<!-- ====================================================================== --> - -<project name="slf4j-log4j12-from-maven" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <property file="${user.home}/.m2/maven.properties"/> - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="slf4j-log4j12-1.7.32"/> - <property name="maven.build.dir" value="target"/> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> - <property name="maven.build.srcDir.0" value="src/main/java"/> - <property name="maven.build.resourceDir.0" value="src/main/resources"/> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> - <property name="maven.build.testDir.0" value="src/test/java"/> - <property name="maven.build.testResourceDir.0" value="src/test/resources"/> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> - - <property name="maven.repo.local" value="${user.home}/.m2/repository"/> - <property name="maven.settings.offline" value="false"/> - <property name="maven.settings.interactiveMode" value="true"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> - </path> - <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> - <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> - <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> - <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" depends="get-deps" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.6" - verbose="false" - fork="false" - source="1.6"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}"/> - <javac destdir="${maven.build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.6" - verbose="false" - fork="false" - source="1.6"> - <src> - <pathelement location="${maven.build.testDir.0}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - </classpath> - </javac> - <copy todir="${maven.build.testOutputDir}"> - <fileset dir="${maven.build.testResourceDir.0}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${maven.test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - <pathelement location="${maven.build.testOutputDir}"/> - </classpath> - <batchtest todir="${maven.test.reports}" unless="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${maven.test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${maven.test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" - packagenames="*" - destdir="${maven.reporting.outputDirectory}/apidocs" - source="1.6" - additionalparam="-Xdoclint:none" - access="protected" - old="false" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" - compress="true" - index="false" - manifest="target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - - <!-- ====================================================================== --> - <!-- Download dependencies target --> - <!-- ====================================================================== --> - - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${maven.settings.offline}" arg2="true"/> - </condition> - </target> - - <target name="get-deps" - depends="test-offline" - description="Download all dependencies" - unless="maven.mode.offline"> - <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" - usetimestamp="false" - ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> - <get src="https://repo.maven.apache.org/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"; - dest="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" - usetimestamp="false" - ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> - <get src="https://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar"; - dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" - usetimestamp="false" - ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/> - <get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"; - dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" - usetimestamp="false" - ignoreerrors="true"/> - </target> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-migrator/maven-build.properties new/slf4j-migrator/maven-build.properties --- old/slf4j-migrator/maven-build.properties 2021-12-29 12:04:25.532679006 +0100 +++ new/slf4j-migrator/maven-build.properties 2022-02-25 19:41:11.651697523 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-migrator-1.7.32 +maven.build.finalName=slf4j-migrator-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-migrator/maven-build.xml new/slf4j-migrator/maven-build.xml --- old/slf4j-migrator/maven-build.xml 2021-12-29 12:04:25.536679052 +0100 +++ new/slf4j-migrator/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-migrator-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-migrator-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-nop/maven-build.properties new/slf4j-nop/maven-build.properties --- old/slf4j-nop/maven-build.properties 2021-12-29 12:04:25.544679145 +0100 +++ new/slf4j-nop/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-nop-1.7.32 +maven.build.finalName=slf4j-nop-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-nop/maven-build.xml new/slf4j-nop/maven-build.xml --- old/slf4j-nop/maven-build.xml 2021-12-29 12:04:25.548679191 +0100 +++ new/slf4j-nop/maven-build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-nop-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-nop-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,10 +44,10 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -241,9 +241,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-reload4j/build.xml new/slf4j-reload4j/build.xml --- old/slf4j-reload4j/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-reload4j/build.xml 2022-02-22 13:39:20.668776490 +0100 @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<project name="slf4j-reload4j" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Import maven-build.xml into the current project --> + <!-- ====================================================================== --> + + <import file="maven-build.xml"/> + + <!-- ====================================================================== --> + <!-- Help target --> + <!-- ====================================================================== --> + + <target name="help"> + <echo message="Please run: $ant -projecthelp"/> + </target> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-reload4j/maven-build.properties new/slf4j-reload4j/maven-build.properties --- old/slf4j-reload4j/maven-build.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-reload4j/maven-build.properties 2022-02-25 19:41:11.651697523 +0100 @@ -0,0 +1,26 @@ +#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE! +#Fri Oct 23 09:31:42 CEST 2015 +slf4j.api.minimum.compatible.version=1.6.0 +maven.settings.offline=false +maven.build.finalName=slf4j-reload4j-1.7.36 +maven.build.resourceDir.0=src/main/resources +maven.build.testOutputDir=${maven.build.dir}/test-classes +javadoc.plugin.version=2.10.2 +maven.build.testResourceDir.0=src/test/resources +maven.reporting.outputDirectory=${maven.build.dir}/site +project.build.sourceEncoding=UTF-8 +maven.build.srcDir.0=src/main/java +junit.version=4.10 +project.build.directory=${maven.build.dir} +maven.test.reports=${maven.build.dir}/test-reports +maven.build.dir=target +maven-site-plugin.version=3.3 +logback.version=1.0.13 +required.jdk.version=1.6 +project.build.outputDirectory=${maven.build.outputDir} +cal10n.version=0.8.1 +maven.build.testDir.0=src/test/java +maven.settings.interactiveMode=true +maven.repo.local=${user.home}/.m2/repository +reload4j.version=1.2.19 +maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-reload4j/maven-build.xml new/slf4j-reload4j/maven-build.xml --- old/slf4j-reload4j/maven-build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-reload4j/maven-build.xml 2022-02-22 13:39:20.672776517 +0100 @@ -0,0 +1,271 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 10/23/15 9:31 AM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="slf4j-reload4j-from-maven" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="${user.home}/.m2/maven.properties"/> + <property file="maven-build.properties"/> + + <property name="maven.build.finalName" value="slf4j-reload4j-1.7.36"/> + <property name="maven.build.dir" value="target"/> + <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.0" value="src/main/resources"/> + <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> + <property name="maven.build.testDir.0" value="src/test/java"/> + <property name="maven.build.testResourceDir.0" value="src/test/resources"/> + <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> + <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> + <property name="maven.settings.interactiveMode" value="true"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> + </path> + <path id="build.test.classpath"> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> + <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> + <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> + <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${maven.build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> + <javac destdir="${maven.build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.6" + verbose="false" + fork="false" + source="1.6"> + <src> + <pathelement location="${maven.build.srcDir.0}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${maven.build.outputDir}"> + <fileset dir="${maven.build.resourceDir.0}"/> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> + <javac destdir="${maven.build.testOutputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.6" + verbose="false" + fork="false" + source="1.6"> + <src> + <pathelement location="${maven.build.testDir.0}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + </classpath> + </javac> + <copy todir="${maven.build.testOutputDir}"> + <fileset dir="${maven.build.testResourceDir.0}"/> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${maven.test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/AllTest.java"/> + <exclude name="**/PackageTest.java"/> + </fileset> + </batchtest> + <batchtest todir="${maven.test.reports}" if="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/${test}.java"/> + <exclude name="**/AllTest.java"/> + <exclude name="**/PackageTest.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${maven.build.srcDir.0}" + packagenames="*" + destdir="${maven.reporting.outputDirectory}/apidocs" + source="1.6" + additionalparam="-Xdoclint:none" + access="protected" + old="false" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" + manifest="target/classes/META-INF/MANIFEST.MF" + basedir="${maven.build.outputDir}" + excludes="**/package.html"/> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + + <target name="get-deps" + depends="test-offline" + description="Download all dependencies" + unless="maven.mode.offline"> + <mkdir dir="${maven.repo.local}"/> + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" + usetimestamp="false" + ignoreerrors="true"/> + <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> + <get src="https://repo.maven.apache.org/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"; + dest="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" + usetimestamp="false" + ignoreerrors="true"/> + <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> + <get src="https://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar"; + dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" + usetimestamp="false" + ignoreerrors="true"/> + <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/> + <get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"; + dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" + usetimestamp="false" + ignoreerrors="true"/> + </target> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-simple/maven-build.properties new/slf4j-simple/maven-build.properties --- old/slf4j-simple/maven-build.properties 2021-12-29 12:04:25.556679284 +0100 +++ new/slf4j-simple/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-simple-1.7.32 +maven.build.finalName=slf4j-simple-1.7.36 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-simple/maven-build.xml new/slf4j-simple/maven-build.xml --- old/slf4j-simple/maven-build.xml 2021-12-29 12:04:25.560679330 +0100 +++ new/slf4j-simple/maven-build.xml 2022-02-22 13:39:20.672776517 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-simple-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-simple-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,10 +44,10 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -244,9 +244,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"; - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"; + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-site/maven-build.properties new/slf4j-site/maven-build.properties --- old/slf4j-site/maven-build.properties 2021-12-29 12:04:25.568679422 +0100 +++ new/slf4j-site/maven-build.properties 2022-02-25 19:41:11.647697497 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-site-1.7.32 +maven.build.finalName=slf4j-site-1.7.36 maven.build.resourceDir.0=src/site/pages maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 @@ -22,5 +22,5 @@ maven.build.testDir.0=src/test/java maven.settings.interactiveMode=true maven.repo.local=${user.home}/.m2/repository -log4j.version=1.2.17 +reload4j.version=1.2.19 maven.build.outputDir=${maven.build.dir}/classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-site/maven-build.xml new/slf4j-site/maven-build.xml --- old/slf4j-site/maven-build.xml 2021-12-29 12:04:25.572679469 +0100 +++ new/slf4j-site/maven-build.xml 2022-02-22 13:39:20.672776517 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-site-1.7.32"/> + <property name="maven.build.finalName" value="slf4j-site-1.7.36"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> ++++++ slf4j-1.7.32.tar.xz -> slf4j-1.7.36.tar.xz ++++++ ++++ 4131 lines of diff (skipped) ++++++ slf4j-reload4j-bundlename.patch ++++++ --- 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
