Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2021-12-30 15:55:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slf4j" Thu Dec 30 15:55:34 2021 rev:25 rq:943057 version:1.7.32 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j-sources.changes 2020-04-23 18:29:14.819951067 +0200 +++ /work/SRC/openSUSE:Factory/.slf4j.new.1896/slf4j-sources.changes 2021-12-30 15:55:59.072680634 +0100 @@ -1,0 +2,11 @@ +Wed Dec 29 10:53:06 UTC 2021 - Pedro Monreal <pmonr...@suse.com> + +- Update to upstream version 1.7.32 + * In the slf4j-simple module, SimpleLogger now caters for + concurrent access. +- Update to upstream version 1.7.31 + * In the jcl-over-slf4j module avoid Object to String conversion. + * In the log4j-over-slf4j module added empty constructors for + ConsoleAppender. + +------------------------------------------------------------------- slf4j.changes: same change Old: ---- v_1.7.30.tar.gz New: ---- v_1.7.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j-sources.spec ++++++ --- /var/tmp/diff_new_pack.W3TxFe/_old 2021-12-30 15:55:59.724681137 +0100 +++ /var/tmp/diff_new_pack.W3TxFe/_new 2021-12-30 15:55:59.728681139 +0100 @@ -1,7 +1,7 @@ # -# spec file for package slf4j-sources +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -19,11 +19,11 @@ %global base_name slf4j Name: %{base_name}-sources -Version: 1.7.30 +Version: 1.7.32 Release: 0 Summary: SLF4J Source JARs # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT -License: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ Source0: https://github.com/qos-ch/%{base_name}/archive/v_%{version}.tar.gz ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.W3TxFe/_old 2021-12-30 15:55:59.744681152 +0100 +++ /var/tmp/diff_new_pack.W3TxFe/_new 2021-12-30 15:55:59.748681155 +0100 @@ -1,7 +1,7 @@ # # spec file for package slf4j # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,11 +18,11 @@ Name: slf4j -Version: 1.7.30 +Version: 1.7.32 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: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ Source0: https://github.com/qos-ch/%{name}/archive/v_%{version}.tar.gz ++++++ build.xml.tar.bz2 ++++++ 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 2020-02-26 13:38:51.445570720 +0100 +++ new/integration/maven-build.properties 2021-12-29 12:04:25.396677431 +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.30 +maven.build.finalName=integration-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.445570720 +0100 +++ new/integration/maven-build.xml 2021-12-29 12:04:25.404677523 +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.30"/> + <property name="maven.build.finalName" value="integration-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"/> @@ -44,7 +44,7 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/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 2020-02-26 13:38:51.445570720 +0100 +++ new/jcl-over-slf4j/maven-build.properties 2021-12-29 12:04:25.408677570 +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.30 +maven.build.finalName=jcl-over-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.445570720 +0100 +++ new/jcl-over-slf4j/maven-build.xml 2021-12-29 12:04:25.416677663 +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.30"/> + <property name="maven.build.finalName" value="jcl-over-slf4j-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"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.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-jdk14/1.7.32/slf4j-jdk14-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/org/slf4j/slf4j-jdk14/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar" + <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" 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 2020-02-26 13:38:51.445570720 +0100 +++ new/jul-to-slf4j/maven-build.properties 2021-12-29 12:04:25.424677755 +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.30 +maven.build.finalName=jul-to-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.445570720 +0100 +++ new/jul-to-slf4j/maven-build.xml 2021-12-29 12:04:25.432677848 +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.30"/> + <property name="maven.build.finalName" value="jul-to-slf4j-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"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.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-log4j12/1.7.32/slf4j-log4j12-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"/> @@ -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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/org/slf4j/slf4j-log4j12/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar" + <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" 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 2020-02-26 13:38:51.441570700 +0100 +++ new/log4j-over-slf4j/maven-build.properties 2021-12-29 12:04:25.436677894 +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.30 +maven.build.finalName=log4j-over-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.445570720 +0100 +++ new/log4j-over-slf4j/maven-build.xml 2021-12-29 12:04:25.440677941 +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.30"/> + <property name="maven.build.finalName" value="log4j-over-slf4j-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"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.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-jdk14/1.7.32/slf4j-jdk14-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/org/slf4j/slf4j-jdk14/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar" + <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" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> 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 2020-02-26 13:38:51.441570700 +0100 +++ new/osgi-over-slf4j/maven-build.properties 2021-12-29 12:04:25.448678033 +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.30 +maven.build.finalName=osgi-over-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.441570700 +0100 +++ new/osgi-over-slf4j/maven-build.xml 2021-12-29 12:04:25.456678126 +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.30"/> + <property name="maven.build.finalName" value="osgi-over-slf4j-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"/> @@ -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.30/slf4j-simple-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.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"/> </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.30/slf4j-simple-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.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}/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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar" + <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" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-android/maven-build.properties 2021-12-29 12:04:25.460678172 +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.30 +maven.build.finalName=slf4j-android-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-android/maven-build.xml 2021-12-29 12:04:25.468678265 +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.30"/> + <property name="maven.build.finalName" value="slf4j-android-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"/> @@ -44,7 +44,7 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-api/maven-build.properties 2021-12-29 12:04:25.472678311 +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.30 +maven.build.finalName=slf4j-api-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-api/maven-build.xml 2021-12-29 12:04:25.480678404 +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.30"/> + <property name="maven.build.finalName" value="slf4j-api-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"/> 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 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-ext/maven-build.properties 2021-12-29 12:04:25.484678450 +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.30 +maven.build.finalName=slf4j-ext-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-ext/maven-build.xml 2021-12-29 12:04:25.492678543 +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.30"/> + <property name="maven.build.finalName" value="slf4j-ext-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"/> @@ -44,14 +44,14 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.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-log4j12/1.7.32/slf4j-log4j12-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/org/slf4j/slf4j-log4j12/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar" + <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" 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jcl/maven-build.properties 2021-12-29 12:04:25.496678589 +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.30 +maven.build.finalName=slf4j-jcl-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jcl/maven-build.xml 2021-12-29 12:04:25.504678682 +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.30"/> + <property name="maven.build.finalName" value="slf4j-jcl-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"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jdk14/maven-build.properties 2021-12-29 12:04:25.508678728 +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.30 +maven.build.finalName=slf4j-jdk14-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jdk14/maven-build.xml 2021-12-29 12:04:25.516678820 +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.30"/> + <property name="maven.build.finalName" value="slf4j-jdk14-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"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.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-api/1.7.32/slf4j-api-1.7.32-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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar" + <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" 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/maven-build.properties new/slf4j-log4j12/maven-build.properties --- old/slf4j-log4j12/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-log4j12/maven-build.properties 2021-12-29 12:04:25.520678867 +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-log4j12-1.7.30 +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 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 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-log4j12/maven-build.xml 2021-12-29 12:04:25.524678913 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-log4j12-1.7.30"/> + <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"/> @@ -44,11 +44,11 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <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.30/slf4j-api-1.7.30.jar"/> + <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"/> @@ -246,9 +246,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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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"/> 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-migrator/maven-build.properties 2021-12-29 12:04:25.532679006 +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.30 +maven.build.finalName=slf4j-migrator-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-migrator/maven-build.xml 2021-12-29 12:04:25.536679052 +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.30"/> + <property name="maven.build.finalName" value="slf4j-migrator-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"/> 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 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-nop/maven-build.properties 2021-12-29 12:04:25.544679145 +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.30 +maven.build.finalName=slf4j-nop-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-nop/maven-build.xml 2021-12-29 12:04:25.548679191 +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.30"/> + <property name="maven.build.finalName" value="slf4j-nop-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"/> @@ -44,10 +44,10 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/junit/junit/4.10"/> 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 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-simple/maven-build.properties 2021-12-29 12:04:25.556679284 +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.30 +maven.build.finalName=slf4j-simple-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-simple/maven-build.xml 2021-12-29 12:04:25.560679330 +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.30"/> + <property name="maven.build.finalName" value="slf4j-simple-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"/> @@ -44,10 +44,10 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.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.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <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}/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 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-site/maven-build.properties 2021-12-29 12:04:25.568679422 +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.30 +maven.build.finalName=slf4j-site-1.7.32 maven.build.resourceDir.0=src/site/pages maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 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 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-site/maven-build.xml 2021-12-29 12:04:25.572679469 +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.30"/> + <property name="maven.build.finalName" value="slf4j-site-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"/> ++++++ v_1.7.30.tar.gz -> v_1.7.32.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/integration/pom.xml new/slf4j-v_1.7.32/integration/pom.xml --- old/slf4j-v_1.7.30/integration/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/integration/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>integration</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jcl-over-slf4j/pom.xml new/slf4j-v_1.7.32/jcl-over-slf4j/pom.xml --- old/slf4j-v_1.7.30/jcl-over-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jcl-over-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <modelVersion>4.0.0</modelVersion> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java new/slf4j-v_1.7.32/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java --- old/slf4j-v_1.7.30/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java 2021-07-29 20:27:41.000000000 +0200 @@ -104,7 +104,9 @@ * the message to log. Converted to {@link String} */ public void trace(Object message) { - logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, null); + if (isTraceEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, null); + } } /** @@ -117,7 +119,9 @@ * the exception to log */ public void trace(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, t); + if (isTraceEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, t); + } } /** @@ -128,7 +132,9 @@ * the message to log. Converted to {@link String} */ public void debug(Object message) { - logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, null); + if (isDebugEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, null); + } } /** @@ -141,7 +147,9 @@ * the exception to log */ public void debug(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, t); + if (isDebugEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, t); + } } /** @@ -152,7 +160,9 @@ * the message to log. Converted to {@link String} */ public void info(Object message) { - logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, null); + if (isInfoEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, null); + } } /** @@ -165,7 +175,9 @@ * the exception to log */ public void info(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, t); + if (isInfoEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, t); + } } /** @@ -176,7 +188,9 @@ * the message to log. Converted to {@link String} */ public void warn(Object message) { - logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, null); + if (isWarnEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, null); + } } /** @@ -189,7 +203,9 @@ * the exception to log */ public void warn(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, t); + if (isWarnEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, t); + } } /** @@ -200,7 +216,9 @@ * the message to log. Converted to {@link String} */ public void error(Object message) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + } } /** @@ -213,7 +231,9 @@ * the exception to log */ public void error(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + } } /** @@ -224,7 +244,9 @@ * the message to log. Converted to {@link String} */ public void fatal(Object message) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + } } /** @@ -237,7 +259,9 @@ * the exception to log */ public void fatal(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java new/slf4j-v_1.7.32/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java --- old/slf4j-v_1.7.30/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java 2021-07-29 20:27:41.000000000 +0200 @@ -27,6 +27,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; import org.junit.Test; @@ -85,4 +86,56 @@ log.fatal(null, e); log.fatal("fatal message", e); } + + @Test + public void testAvoidConvertingObjectToString() { + Log log = LogFactory.getLog(InvokeJCLTest.class); + Exception e = new Exception("just testing"); + + TestMessage fatalMsg = new TestMessage("fatal msg"); + TestMessage errorMsg = new TestMessage("error msg"); + TestMessage warnMsg = new TestMessage("warn msg"); + TestMessage infoMsg = new TestMessage("info msg"); + TestMessage debugMsg = new TestMessage("debug msg"); + TestMessage traceMsg = new TestMessage("trace msg"); + + log.fatal(fatalMsg); + log.fatal(fatalMsg, e); + assertEquals(2, fatalMsg.invokedCount); + + log.error(errorMsg); + log.error(errorMsg, e); + assertEquals(2, errorMsg.invokedCount); + + log.warn(warnMsg); + log.warn(warnMsg, e); + assertEquals(2, warnMsg.invokedCount); + + log.info(infoMsg); + log.info(infoMsg, e); + assertEquals(2, infoMsg.invokedCount); + + log.debug(debugMsg); + log.debug(debugMsg, e); + assertEquals(0, debugMsg.invokedCount); + + log.trace(traceMsg); + log.trace(traceMsg, e); + assertEquals(0, traceMsg.invokedCount); + } + + static class TestMessage { + + private final String msg; + int invokedCount = 0; + + TestMessage(String msg) {this.msg = msg;} + + @Override + public String toString() { + invokedCount++; + return msg; + } + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jul-to-slf4j/pom.xml new/slf4j-v_1.7.32/jul-to-slf4j/pom.xml --- old/slf4j-v_1.7.30/jul-to-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jul-to-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>jul-to-slf4j</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/log4j-over-slf4j/pom.xml new/slf4j-v_1.7.32/log4j-over-slf4j/pom.xml --- old/slf4j-v_1.7.30/log4j-over-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/log4j-over-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java new/slf4j-v_1.7.32/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java --- old/slf4j-v_1.7.30/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java 2021-07-29 20:27:41.000000000 +0200 @@ -15,6 +15,18 @@ */ package org.apache.log4j; +/** + * Skeleton implementation of ConsoleAppender + */ public class ConsoleAppender extends WriterAppender { + public ConsoleAppender() { + } + + public ConsoleAppender(Layout layout) { + } + + public ConsoleAppender(Layout layout, String target) { + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/osgi-over-slf4j/pom.xml new/slf4j-v_1.7.32/osgi-over-slf4j/pom.xml --- old/slf4j-v_1.7.30/osgi-over-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/osgi-over-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>osgi-over-slf4j</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/pom.xml new/slf4j-v_1.7.32/pom.xml --- old/slf4j-v_1.7.30/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -6,7 +6,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> <packaging>pom</packaging> <name>SLF4J</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-android/pom.xml new/slf4j-v_1.7.32/slf4j-android/pom.xml --- old/slf4j-v_1.7.30/slf4j-android/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-android/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-android</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-api/pom.xml new/slf4j-v_1.7.32/slf4j-api/pom.xml --- old/slf4j-v_1.7.30/slf4j-api/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-api/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-api</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-ext/pom.xml new/slf4j-v_1.7.32/slf4j-ext/pom.xml --- old/slf4j-v_1.7.30/slf4j-ext/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-ext/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-ext</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-jcl/pom.xml new/slf4j-v_1.7.32/slf4j-jcl/pom.xml --- old/slf4j-v_1.7.30/slf4j-jcl/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-jcl/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-jcl</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-jdk14/pom.xml new/slf4j-v_1.7.32/slf4j-jdk14/pom.xml --- old/slf4j-v_1.7.30/slf4j-jdk14/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-jdk14/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-jdk14</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-log4j12/pom.xml new/slf4j-v_1.7.32/slf4j-log4j12/pom.xml --- old/slf4j-v_1.7.30/slf4j-log4j12/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-log4j12/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-log4j12</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-migrator/pom.xml new/slf4j-v_1.7.32/slf4j-migrator/pom.xml --- old/slf4j-v_1.7.30/slf4j-migrator/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-migrator/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-migrator</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-nop/pom.xml new/slf4j-v_1.7.32/slf4j-nop/pom.xml --- old/slf4j-v_1.7.30/slf4j-nop/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-nop/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-nop</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/pom.xml new/slf4j-v_1.7.32/slf4j-simple/pom.xml --- old/slf4j-v_1.7.30/slf4j-simple/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-simple</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java new/slf4j-v_1.7.32/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java --- old/slf4j-v_1.7.30/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java 2021-07-29 20:27:41.000000000 +0200 @@ -157,7 +157,7 @@ protected static final int LOG_LEVEL_OFF = LOG_LEVEL_ERROR + 10; private static boolean INITIALIZED = false; - static SimpleLoggerConfiguration CONFIG_PARAMS = null; + static final private SimpleLoggerConfiguration CONFIG_PARAMS = new SimpleLoggerConfiguration(); static void lazyInit() { if (INITIALIZED) { @@ -170,7 +170,6 @@ // external software might be invoking this method directly. Do not rename // or change its semantics. static void init() { - CONFIG_PARAMS = new SimpleLoggerConfiguration(); CONFIG_PARAMS.init(); } @@ -312,12 +311,22 @@ throw new IllegalStateException("Unrecognized level [" + level + "]"); } + /** + * To avoid intermingling of log messages and associated stack traces, the two + * operations are done in a synchronized block. + * + * @param buf + * @param t + */ void write(StringBuilder buf, Throwable t) { PrintStream targetStream = CONFIG_PARAMS.outputChoice.getTargetPrintStream(); - targetStream.println(buf.toString()); - writeThrowable(t, targetStream); - targetStream.flush(); + synchronized (CONFIG_PARAMS) { + targetStream.println(buf.toString()); + writeThrowable(t, targetStream); + targetStream.flush(); + } + } protected void writeThrowable(Throwable t, PrintStream targetStream) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java --- old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java 2021-07-29 20:27:41.000000000 +0200 @@ -0,0 +1,128 @@ +/** + * Copyright (c) 2004-2021 QOS.ch + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package org.slf4j.simple.multiThreadedExecution; + +import java.io.PrintStream; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Tests that output in multi-threaded environments is not mingled. + * + * See also https://jira.qos.ch/browse/SLF4J-515 + */ +public class MultithereadedExecutionTest { + + private static int THREAD_COUNT = 2; + private static long TEST_DURATION_IN_MILLIS = 100; + + private Thread[] threads = new Thread[THREAD_COUNT]; + + private final PrintStream oldOut = System.out; + StateCheckingPrintStream scps = new StateCheckingPrintStream(oldOut); + + volatile boolean signal = false; + + @Before + public void setup() { + System.setErr(scps); + // System.setProperty(SimpleLogger.LOG_FILE_KEY, "System.err"); + // LoggerFactoryFriend.reset(); + } + + @After + public void tearDown() throws Exception { + // LoggerFactoryFriend.reset(); + // System.clearProperty(SimpleLogger.LOG_FILE_KEY); + System.setErr(oldOut); + } + + @Test + public void test() throws Throwable { + WithException withException = new WithException(); + Other other = new Other(); + threads[0] = new Thread(withException); + threads[1] = new Thread(other); + threads[0].start(); + threads[1].start(); + Thread.sleep(TEST_DURATION_IN_MILLIS); + signal = true; + threads[0].join(); + threads[1].join(); + + if (withException.throwable != null) { + throw withException.throwable; + } + + if (other.throwable != null) { + throw other.throwable; + } + + } + + class WithException implements Runnable { + + volatile Throwable throwable; + Logger logger = LoggerFactory.getLogger(WithException.class); + + public void run() { + int i = 0; + + while (!signal) { + try { + logger.info("Hello {}", i, new Throwable("i=" + i)); + i++; + } catch (Throwable t) { + throwable = t; + MultithereadedExecutionTest.this.signal = true; + return; + } + } + + } + } + + class Other implements Runnable { + volatile Throwable throwable; + Logger logger = LoggerFactory.getLogger(Other.class); + + public void run() { + int i = 0; + while (!signal) { + try { + logger.info("Other {}", i++); + } catch (Throwable t) { + throwable = t; + MultithereadedExecutionTest.this.signal = true; + return; + } + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java --- old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java 2021-07-29 20:27:41.000000000 +0200 @@ -0,0 +1,141 @@ +/** + * Copyright (c) 2004-2021 QOS.ch + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package org.slf4j.simple.multiThreadedExecution; + +import java.io.PrintStream; +import java.util.regex.Pattern; + +/** + * This PrintStream checks that output lines are in an expected order. + * + * @author ceki + */ +public class StateCheckingPrintStream extends PrintStream { + + enum State { + INITIAL, UNKNOWN, HELLO, THROWABLE, AT1, AT2, OTHER; + } + + volatile State currentState = State.INITIAL; + + public StateCheckingPrintStream(PrintStream ps) { + super(ps); + } + + public void print(String s) { + } + + public void println(String s) { + + State next = computeState(s); + //System.out.println(next + " " + s); + switch (currentState) { + case INITIAL: + currentState = next; + break; + + case UNKNOWN: + // ignore garbage + currentState = next; + break; + + case OTHER: + if (next == State.UNKNOWN) { + currentState = State.UNKNOWN; + return; + } + + if (next != State.OTHER && next != State.HELLO) { + throw badState(s, currentState, next); + } + currentState = next; + break; + + case HELLO: + if (next != State.THROWABLE) { + throw badState(s, currentState, next); + } + currentState = next; + break; + case THROWABLE: + if (next != State.AT1) { + throw badState(s, currentState, next); + } + currentState = next; + break; + + case AT1: + if (next != State.AT2) { + throw badState(s, currentState, next); + } + currentState = next; + break; + + case AT2: + currentState = next; + break; + default: + throw new IllegalStateException("Unreachable code"); + } + } + + private IllegalStateException badState(String s, State currentState2, State next) { + return new IllegalStateException("Unexpected state " + next + " for current state " + currentState2 + " for " + s); + + } + + String OTHER_PATTERN_STR = ".*Other \\d{1,5}"; + String HELLO_PATTERN_STR = ".*Hello \\d{1,5}"; + String THROWABLE_PATTERN_STR = "java.lang.Throwable: i=\\d{1,5}"; + String AT1_PATTERN_STR = "\\s*at " + this.getClass().getPackage().getName() + ".*"; + String AT2_PATTERN_STR = "\\s*at " + ".*Thread.java.*"; + + Pattern PATTERN_OTHER = Pattern.compile(OTHER_PATTERN_STR); + Pattern PATTERN_HELLO = Pattern.compile(HELLO_PATTERN_STR); + Pattern PATTERN_THROWABLE = Pattern.compile(THROWABLE_PATTERN_STR); + Pattern PATTERN_AT1 = Pattern.compile(AT1_PATTERN_STR); + Pattern PATTERN_AT2 = Pattern.compile(AT2_PATTERN_STR); + + private State computeState(String s) { + + if (PATTERN_OTHER.matcher(s).matches()) { + return State.OTHER; + } else if (PATTERN_HELLO.matcher(s).matches()) { + return State.HELLO; + } else if (PATTERN_THROWABLE.matcher(s).matches()) { + return State.THROWABLE; + } else if (PATTERN_AT1.matcher(s).matches()) { + return State.AT1; + } else if (PATTERN_AT2.matcher(s).matches()) { + return State.AT2; + } else { + return State.UNKNOWN; + } + } + + public void println(Object o) { + println(o.toString()); + } +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-site/pom.xml new/slf4j-v_1.7.32/slf4j-site/pom.xml --- old/slf4j-v_1.7.30/slf4j-site/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-site/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-site</artifactId>