From 351382edb60a630ba232bd39403f97460edcf5bc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Apr 2021 15:24:48 +0200 Subject: external/jfreereport: Get rid of remaining apache-commons-logging ...similar to b721a1cecb6ea0013be8402350110822e50b4415 "external/jfreereport: Get rid of apache-commons-logging", but where the external tarballs contain copies of commons-logging-api-1.0.4.jar to compile against, so 6de0b1710adfba82c96b75a5da6f52633a54c692 "Get rid of apache-commons-logging" did not affect them at build- but only at run-time. The sources of the seven new patch files (and which have further been adapted as necessary) are taken from "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", and "add missing patch". Change-Id: I98bbe0e24398d3652cda09b0664b4775661cd939 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114053 Tested-by: Jenkins Reviewed-by: Stephan Bergmann Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127199 Tested-by: Gabor Kelemen Reviewed-by: Gabor Kelemen --- ...serializer-1.1.2-remove-commons-logging.patch.1 | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1 (limited to 'external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1') diff --git a/external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1 b/external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1 new file mode 100644 index 000000000000..52ee76a77491 --- /dev/null +++ b/external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1 @@ -0,0 +1,31 @@ +diff -ru libserializer-1.1.2.orig/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java libserializer-1.1.2/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java +--- libserializer-1.1.2.orig/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java 2021-04-07 11:22:05.509434457 +0100 ++++ libserializer-1.1.2/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java 2021-04-07 11:23:19.102343782 +0100 +@@ -25,8 +25,7 @@ + import java.util.HashMap; + import java.util.Iterator; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.base.config.Configuration; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; + import org.pentaho.reporting.libraries.base.util.DebugLog; +@@ -41,7 +40,7 @@ + */ + public class SerializerHelper + { +- private static final Log logger = LogFactory.getLog(SerializerHelper.class); ++ private static final Logger logger = Logger.getLogger(SerializerHelper.class.getName()); + /** + * The singleton instance of the serialize helper. + */ +@@ -124,7 +123,7 @@ + } + else + { +- logger.warn("Invalid SerializeMethod implementation: " + c); ++ logger.warning("Invalid SerializeMethod implementation: " + c); + } + } + } -- cgit