Repository: spark Updated Branches: refs/heads/branch-1.2 1c38d4254 -> e23843c06
[SPARK-9633] [BUILD] SBT download locations outdated; need an update Remove 2 defunct SBT download URLs and replace with the 1 known download URL. Also, use https. Follow up on https://github.com/apache/spark/pull/7792 Author: Sean Owen <so...@cloudera.com> Closes #7956 from srowen/SPARK-9633 and squashes the following commits: caa40bd [Sean Owen] Remove 2 defunct SBT download URLs and replace with the 1 known download URL. Also, use https. Conflicts: sbt/sbt-launch-lib.bash Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e23843c0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e23843c0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e23843c0 Branch: refs/heads/branch-1.2 Commit: e23843c0603bb7d278ba21abde0dd92661b2fac8 Parents: 1c38d42 Author: Sean Owen <so...@cloudera.com> Authored: Thu Aug 6 23:43:52 2015 +0100 Committer: Davies Liu <davies....@gmail.com> Committed: Mon Aug 10 13:10:40 2015 -0700 ---------------------------------------------------------------------- sbt/sbt-launch-lib.bash | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e23843c0/sbt/sbt-launch-lib.bash ---------------------------------------------------------------------- diff --git a/sbt/sbt-launch-lib.bash b/sbt/sbt-launch-lib.bash index 055e206..eb6b415 100755 --- a/sbt/sbt-launch-lib.bash +++ b/sbt/sbt-launch-lib.bash @@ -38,8 +38,7 @@ dlog () { acquire_sbt_jar () { SBT_VERSION=`awk -F "=" '/sbt\\.version/ {print $2}' ./project/build.properties` - URL1=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar - URL2=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar + URL1=https://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar JAR=sbt/sbt-launch-${SBT_VERSION}.jar sbt_jar=$JAR @@ -51,9 +50,9 @@ acquire_sbt_jar () { printf "Attempting to fetch sbt\n" JAR_DL="${JAR}.part" if hash curl 2>/dev/null; then - (curl --silent ${URL1} > "${JAR_DL}" || curl --silent ${URL2} > "${JAR_DL}") && mv "${JAR_DL}" "${JAR}" + curl --fail --location --silent ${URL1} > "${JAR_DL}" && mv "${JAR_DL}" "${JAR}" elif hash wget 2>/dev/null; then - (wget --quiet ${URL1} -O "${JAR_DL}" || wget --quiet ${URL2} -O "${JAR_DL}") && mv "${JAR_DL}" "${JAR}" + wget --quiet ${URL1} -O "${JAR_DL}" && mv "${JAR_DL}" "${JAR}" else printf "You do not have curl or wget installed, please install sbt manually from http://www.scala-sbt.org/\n"; exit -1 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
