diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-04-11 09:20:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-04-11 10:35:04 +0200 |
| commit | 6de0b1710adfba82c96b75a5da6f52633a54c692 (patch) | |
| tree | cf7255c64f90884a65536bee4af1131231649c91 /RepositoryExternal.mk | |
| parent | d9f10d8f0f6bae31dd5ebd9fa00f989d17fc21da (diff) | |
Get rid of apache-commons-logging
...using Java 1.4 java.util.logging.Logger instead also for the last remaining
uses in reportbuilder.
(The mention in swext/mediawiki/src/THIRDPARTYLICENSEREADME.html was presumably
a leftover from 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 "swext: Wiki Publisher
does not use those apache-commons libraries".)
Change-Id: Ia0bc598fe5844ced11cae497548ec7d09453a99d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113939
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 46b42b5fea32..e30fe9a1bb57 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3723,32 +3723,6 @@ endif # SYSTEM_RHINO endif -ifneq ($(SYSTEM_APACHE_COMMONS),) - -define gb_Jar__use_commons-logging -$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) -endef -gb_ExternalProject__use_commons-logging := - -else # !SYSTEM_APACHE_COMMONS - -ifeq ($(ENABLE_JAVA),TRUE) -$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ - commons-logging-$(COMMONS_LOGGING_VERSION) \ -)) -endif - -define gb_Jar__use_commons-logging -$(call gb_Jar_use_external_project,$(1),apache_commons_logging) -$(call gb_Jar_use_jar,$(1),commons-logging-$(COMMONS_LOGGING_VERSION)) -endef -define gb_ExternalProject__use_commons-logging -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) -endef - -endif # SYSTEM_APACHE_COMMONS - - ifneq ($(SYSTEM_JFREEREPORT),) define gb_Jar__use_flow-engine |