Merge pull request #2202 from adamretter/hotfix/xar-downloads-require…

…d-4.x.x (4.x.x) If downloading XARs fails, the build should fail
eXist-db · Jan 21, 2019 · f2e5824 · f2e5824
2 parents be4e053 + 21c6aad
commit f2e5824
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/build/scripts/installer.xml b/build/scripts/installer.xml
@@ -89,14 +89,16 @@
  </target>
 
  <target name="download-xar">
+ <!-- get dest="${apps.dir}" src="${apps.repo}/find?abbrev=${xar}&amp;processor=${project.version}"
+ verbose="on" maxtime="180" usetimestamp="true" tryGzipEncoding="true"/ -->
 
  <taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask">
  <classpath>
  <pathelement location="${asocat-exist.jar}"/>
  </classpath>
  </taskdef>
- <fetch dest="${apps.dir}" url="${apps.repo}/pkg.zip?abbrev=${xar}&amp;zip=yes&amp;processor=${project.version}"
- failonerror="false" maxtime="360">
+ <fetch dest="${apps.dir}" url="${apps.repo}/find?abbrev=${xar}&amp;processor=${project.version}&amp;zip=yes"
+  failonerror="true" maxtime="180">
  <patternset>
  <include name="**/*.xar"/>
  </patternset>

diff --git a/build/scripts/setup.xml b/build/scripts/setup.xml
@@ -21,7 +21,6 @@
 
  <property file="build.properties"/>
 
- <property name="autodeploy.repo" value="http://demo.exist-db.org/exist/apps/public-repo"/>
  <property name="autostart-dir" value="autodeploy"/>
 
  <target name="prepare">
@@ -64,17 +63,20 @@
  </target>
 
  <target name="download-xar" unless="xar-installed">
+ <!-- get dest="${autostart-dir}" src="${autodeploy.repo}/find?abbrev=${xar}&amp;processor=${project.version}"
+ verbose="on" maxtime="180" usetimestamp="true" tryGzipEncoding="true"/ -->
 
  <taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask">
-  <classpath>
-  <pathelement location="${asocat-exist.jar}"/>
-  </classpath>
+ <classpath>
+ <pathelement location="${asocat-exist.jar}"/>
+ </classpath>
  </taskdef>
- <fetch dest="${autostart-dir}" url="${autodeploy.repo}/pkg.zip?abbrev=${xar}&amp;zip=yes&amp;processor=${project.version}"
-  failonerror="false" maxtime="120">
-  <patternset>
-  <include name="**/*.xar"/>
-  </patternset>
+ <fetch dest="${autostart-dir}" url="${autodeploy.repo}/find?abbrev=${xar}&amp;processor=${project.version}&amp;zip=yes"
+ failonerror="true" maxtime="180">
+ <patternset>
+ <include name="**/*.xar"/>
+ </patternset>
  </fetch>
  </target>
+
 </project>