diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-07 18:25:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-09 10:14:20 +0200 |
| commit | 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 (patch) | |
| tree | 82691ab0b582d0f58b1f4669792c63c0ff7d28fc /swext | |
| parent | f7d149a731a0284d3d7b7b1c26c736654e0712fd (diff) | |
swext: Wiki Publisher does not use those apache-commons libraries
... itself, they were apparently just dependencies of
commons-httpclient, so remove them.
Change-Id: I8fd5c85db058c4aa14c4f5fea20fd17ba361b0b2
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 13 | ||||
| -rw-r--r-- | swext/Jar_mediawiki.mk | 6 |
2 files changed, 0 insertions, 19 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 94ea40bc35e4..ec31c9691c26 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -16,19 +16,6 @@ $(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml)) $(eval $(call gb_Extension_use_default_description,wiki-publisher,swext/mediawiki/src/description-en-US.txt)) $(eval $(call gb_Extension_use_default_license,wiki-publisher)) -ifeq ($(SYSTEM_APACHE_COMMONS),) -$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_logging)) -$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_codec)) -$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang)) - -$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar),\ -$(call gb_UnpackedTarball_get_dir,apache_commons_codec)$(if $(filter TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6-SNAPSHOT.jar)\ -)) -$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\ -$(call gb_UnpackedTarball_get_dir,apache_commons_lang)$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar)\ -)) -$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-$(COMMONS_LOGGING_VERSION).jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar)) -endif $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))) $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))) diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index 49f0a8bc2c7b..234158013de8 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -14,12 +14,6 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com)) $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF)) -$(eval $(call gb_Jar_use_externals,mediawiki,\ - commons-codec \ - commons-lang \ - commons-logging \ -)) - $(eval $(call gb_Jar_use_jars,mediawiki,\ juh \ jurt \ |