This is an automated email from the ASF dual-hosted git repository.
violetagg pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new d13d3f6 Use Apache archives when downloading commons-logging
dependency.
d13d3f6 is described below
commit d13d3f6d7bdabab543e134bbf7e29621524db3ca
Author: Violeta Georgieva <violet...@apache.org>
AuthorDate: Mon May 18 14:15:59 2020 +0100
Use Apache archives when downloading commons-logging dependency.
---
build.properties.default | 3 +--
build.xml | 5 ++---
webapps/docs/changelog.xml | 7 +++++++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 150bdd3..18f8340 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -107,8 +107,7 @@ commons-logging-src.checksum.enabled=true
commons-logging-src.checksum.algorithm=MD5|SHA-1
commons-logging-src.checksum.value=e8e197d628436490886d17cffa108fe3|95f0805de0be927c42f5f6eb14b643cb37e7caad
commons-logging.home=${base.path}/commons-logging-${commons-logging.version}
-commons-logging-src.loc.1=${base-commons.loc.1}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
-commons-logging-src.loc.2=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-logging.version}-src.tar.gz
# ----- Avalon Framework (required by commons logging) -----
diff --git a/build.xml b/build.xml
index 973646e..67b8bcc 100644
--- a/build.xml
+++ b/build.xml
@@ -1686,9 +1686,8 @@
depends="extras-prepare"
description="Prepare to build web services extras package">
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
- <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${commons-logging-src.loc}"/>
<param name="destfile" value="${commons-logging-src.tar.gz}"/>
<param name="destdir" value="${commons-logging.home}"/>
<param name="checksum.enabled"
value="${commons-logging-src.checksum.enabled}"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 132fc5b..f635c22 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -69,6 +69,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Use Apache archives when downloading commons-logging dependency.
(violetagg)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.104 (violetagg)" rtext="released 2020-05-16">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
