diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-07 17:40:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-09 10:14:19 +0200 |
| commit | f7d149a731a0284d3d7b7b1c26c736654e0712fd (patch) | |
| tree | 596eeb5c2264a4f8f89a5edfd655b779f0a4d4e0 /swext/Extension_wiki-publisher.mk | |
| parent | 8e2acdbcbd3afc1777d6e68a83ebbe6d8dd77645 (diff) | |
swext: remove commons-httpclient dependency from Wiki Publisher
JRE 6 has sufficient HttpURLConnection etc. stuff to make this work
without bundling external libraries.
Change-Id: I6c71980c718169024006f02a96c442a71d798d55
Diffstat (limited to 'swext/Extension_wiki-publisher.mk')
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index ffee9acacac0..94ea40bc35e4 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -19,13 +19,11 @@ $(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_httpclient)) $(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,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.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)\ )) |