You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mi...@apache.org on 2019/08/05 13:21:34 UTC
[tomcat] branch BZ-63634 updated (371be58 -> c653fe5)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch BZ-63634
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
discard 371be58 BZ 63634: Align setproxy target in build.xml with 8.5/9.0
new c653fe5 BZ 63634: Align setproxy target in build.xml with 8.5/9.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (371be58)
\
N -- N -- N refs/heads/BZ-63634 (c653fe5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webapps/docs/changelog.xml | 4 ++++
1 file changed, 4 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/01: BZ 63634: Align setproxy target in build.xml with
8.5/9.0
Posted by mi...@apache.org.
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 <mi...@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org