This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch BZ-63634
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c653fe553fc8bad73343ca654d4972fc98a6fc08
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Mon Aug 5 15:17:32 2019 +0200
BZ 63634: Align setproxy target in build.xml with 8.5/9.0
---
build.xml | 9 +--------
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index a0ca308..179e60d 100644
--- a/build.xml
+++ b/build.xml
@@ -2937,14 +2937,7 @@ skip.installer property in build.properties" />
<!-- =============== Utility Targets to support downloads ================
-->
- <target name="proxyflags">
- <!-- check proxy parameters. -->
- <condition property="useproxy">
- <equals arg1="${proxy.use}" arg2="on" />
- </condition>
- </target>
-
- <target name="setproxy" depends="proxyflags" if="useproxy">
+ <target name="setproxy" if="${proxy.use}">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
<echo message="Using ${proxy.host}:${proxy.port} to download
${sourcefile}"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e315387..ae9d261 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -95,6 +95,10 @@
</subsection>
<subsection name="Other">
<changelog>
+ <update>
+ <bug>63634</bug>: Align setproxy target in build.xml with
+ 8.5/9.0. (michaelo)
+ </update>
<add>
Limit the default JPDA (remote debugging interface) listen address to
<code>localhost:8000</code>. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
