From 9cce387e453ae7f6dbfa77657e41e98a39a98c98 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 9 Apr 2021 15:15:33 +0200 Subject: external/jfreereport: Get rid of apache-commons-logging ...using Java 1.4 java.util.logging.Logger instead. The two patch files are taken from "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging" and "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", respectively Change-Id: Ie03319568f2cefc8a982c4f9ee9241f8dc0c923e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113850 Tested-by: Jenkins Reviewed-by: Stephan Bergmann Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127197 Tested-by: Gabor Kelemen Reviewed-by: Gabor Kelemen --- external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'external/jfreereport/ExternalProject_jfreereport_liblayout.mk') diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 831711dd44c8..fc96f7c9bb07 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -9,10 +9,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) -$(eval $(call gb_ExternalProject_use_externals,jfreereport_liblayout,\ - commons-logging \ -)) - $(eval $(call gb_ExternalProject_use_external_projects,jfreereport_liblayout,\ jfreereport_sac \ jfreereport_libbase \ @@ -35,9 +31,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : $(if $(verbose),-v,-q) \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(SYSTEM_APACHE_COMMONS),\ - -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar") \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ -- cgit