summaryrefslogtreecommitdiffstats
path: root/external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-04-13 15:24:48 +0200
committerGabor Kelemen <kelemeng@ubuntu.com>2021-12-21 09:15:18 +0100
commit351382edb60a630ba232bd39403f97460edcf5bc (patch)
treeba613c652b2f80439b62bc10199e8f9f92f6cdab /external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1
parentGet rid of apache-commons-logging (diff)
downloadcore-351382edb60a630ba232bd39403f97460edcf5bc.tar.gz
core-351382edb60a630ba232bd39403f97460edcf5bc.zip
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 <https://src.fedoraproject.org/rpms/libbase/blob/4a8cd85e49a0a00d0e0f865a3c841e3f1858a04b> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <https://src.fedoraproject.org/rpms/libfonts/c/c7f7d4ed67b9ca701152732cbdac547db3ada5f4> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <https://src.fedoraproject.org/rpms/libformula/c/feb5be4b393f13b131623339a5868c6b381b2507> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <https://src.fedoraproject.org/rpms/libloader/c/53eeb19460f2ab934cdf4c7c7c73fd681141216c> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <https://src.fedoraproject.org/rpms/librepository/c/9fa7021dfe7dcc76e32c40f99f74c3745013c501> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <https://src.fedoraproject.org/rpms/libserializer/c/027e1a16f7171f7ac5f9da4683d1e1b63794bb06> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", and <https://src.fedoraproject.org/rpms/pentaho-libxml/c/74538ea7cdd0845f8e6dff748f8d4abfe080dbe4> "add missing patch". Change-Id: I98bbe0e24398d3652cda09b0664b4775661cd939 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114053 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127199 Tested-by: Gabor Kelemen <kelemeng@ubuntu.com> Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Diffstat (limited to 'external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.1')
-rw-r--r--external/jfreereport/patches/libserializer-1.1.2-remove-commons-logging.patch.131
1 files changed, 31 insertions, 0 deletions
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);
+ }
+ }
+ }