[2/4] ant-ivyde git commit: set better download base url

[hi...@apache.org]

set better download base url


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/6480c483
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/6480c483
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/6480c483

Branch: refs/heads/ivyDECredentials-cleaned
Commit: 6480c483064d04281239f61f4ac3ba67c0f438a8
Parents: 82ea47f
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Tue Jul 11 22:01:30 2017 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Tue Jul 11 22:01:30 2017 +0200

----------------------------------------------------------------------
 build.properties |  7 +++++--
 build.xml        | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/6480c483/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index fd915ea..822535c 100644
--- a/build.properties
+++ b/build.properties
@@ -26,7 +26,8 @@ eclipse.consoleLog=false
 mirror.url=http://archive.apache.org/dist/
 
 # properties for jenkins build environment
-eclipse.download.baseurl=http://www.eclipse.org/downloads/download.php
+eclipse.download.baseurl=http://download.eclipse.org
+eclipse.download.sdk.baseurl=http://archive.eclipse.org
 eclipse.download.sdk.name=eclipse-SDK-4.3.2-win32
 eclipse.download.sdk.dropdir=eclipse/downloads/drops4/R-4.3.2-201402211700
 eclipse.download.sdk.md5=6de9fd3670ecd40b0f8adeb4740dc852
@@ -39,9 +40,11 @@ eclipse.download.emf.md5=498713f53a20d7456042beaa3785baa4
 eclipse.download.xsd.name=xsd-runtime-2.9.2
 eclipse.download.xsd.dropdir=modeling/emf/emf/downloads/drops/2.9.2/R201402031126
 eclipse.download.xsd.md5=1262af8447cb193807cd11c8849b5361
+eclipse.download.gef.baseurl=http://archive.eclipse.org
 eclipse.download.gef.name=GEF-SDK-3.9.100
 eclipse.download.gef.dropdir=tools/gef/downloads/drops/3.9.100/R201405261516
 eclipse.download.gef.md5=d8e4d18eb8512e8ddd92446aca92599b
+eclipse.download.zest.baseurl=http://archive.eclipse.org
 eclipse.download.zest.name=GEF-zest-3.9.100
 eclipse.download.zest.dropdir=tools/gef/downloads/drops/3.9.100/R201405261516
-eclipse.download.zest.md5=e1cb23da55ad6528f5c587d0b6521fb9
\ No newline at end of file
+eclipse.download.zest.md5=e1cb23da55ad6528f5c587d0b6521fb9

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/6480c483/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fdcd31f..426e203 100644
--- a/build.xml
+++ b/build.xml
@@ -585,9 +585,15 @@ You have to specify the Ivy to install with one of the following property:
             <property name="eclipse.download.@{id}.baseurl" value="${eclipse.download.baseurl}" />
             <mkdir dir="${basedir}/dependencies" />
             <delete file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" failonerror="false" />
-            <get src="${eclipse.download.@{id}.baseurl}?file=/${eclipse.download.@{id}.dropdir}/${eclipse.download.@{id}.name}.zip&amp;mirror_id=1"
+            <get src="${eclipse.download.@{id}.baseurl}/${eclipse.download.@{id}.dropdir}/${eclipse.download.@{id}.name}.zip"
                  dest="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" verbose="yes" />
-            <checksum file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" algorithm="MD5" />
+            <fail message="Bad MD5 on downloaded file ${eclipse.download.@{id}.name}">
+                <condition>
+                    <not>
+                        <checksum file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" algorithm="MD5" />
+                    </not>
+                </condition>
+            </fail>
         </sequential>
     </macrodef>