From 687d3cf2b82e6ee08205d34a6f05ddcb3455e6ab Mon Sep 17 00:00:00 2001 From: David Lewis Date: Mon, 26 Apr 2021 16:11:40 -0500 Subject: [PATCH 1/3] Replace bintray --- build/sbt-launch-lib.bash | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/sbt-launch-lib.bash b/build/sbt-launch-lib.bash index c98abd598..9b3f0e934 100755 --- a/build/sbt-launch-lib.bash +++ b/build/sbt-launch-lib.bash @@ -38,7 +38,7 @@ dlog () { acquire_sbt_jar () { SBT_VERSION=`awk -F "=" '/sbt\\.version/ {print $2}' ./project/build.properties` - URL1=https://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar + URL1=https://repo.scala-sbt.org/scalasbt/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar JAR=build/sbt-launch-${SBT_VERSION}.jar sbt_jar=$JAR diff --git a/project/plugins.sbt b/project/plugins.sbt index ec7dc499f..97b52a64d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ // You may use this file to add plugin dependencies for sbt. -resolvers += "Spark Packages repo" at "https://dl.bintray.com/spark-packages/maven/" +resolvers += "Spark Packages repo" at "https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/" addSbtPlugin("org.spark-packages" %% "sbt-spark-package" % "0.2.6") From 20683c1776b9f6fe65294bf907828b455daf96f8 Mon Sep 17 00:00:00 2001 From: David Lewis Date: Tue, 27 Apr 2021 11:10:31 -0500 Subject: [PATCH 2/3] change Spark version to 3.0.2 --- .travis.yml | 2 +- Dockerfile | 2 +- build.sbt | 2 +- dev/release.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50c49793f..49259a56b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: matrix: include: - env: PYSPARK_PYTHON=python3 SCALA_VERSION=2.11.12 SPARK_VERSION=2.4.7 SPARK_BUILD="spark-${SPARK_VERSION}-bin-hadoop2.7" - - env: PYSPARK_PYTHON=python3 SCALA_VERSION=2.12.11 SPARK_VERSION=3.0.1 SPARK_BUILD="spark-${SPARK_VERSION}-bin-hadoop2.7" + - env: PYSPARK_PYTHON=python3 SCALA_VERSION=2.12.11 SPARK_VERSION=3.0.2 SPARK_BUILD="spark-${SPARK_VERSION}-bin-hadoop2.7" before_install: - ./bin/download_travis_dependencies.sh diff --git a/Dockerfile b/Dockerfile index 9594b1baf..31466b446 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ # Install Spark and update env variables. ENV SCALA_VERSION 2.11.12 -ENV SPARK_VERSION "3.0.0" +ENV SPARK_VERSION "3.0.2" ENV SPARK_BUILD "spark-${SPARK_VERSION}-bin-hadoop2.7" ENV SPARK_BUILD_URL "https://dist.apache.org/repos/dist/release/spark/spark-${SPARK_VERSION}/${SPARK_BUILD}.tgz" RUN wget --quiet "$SPARK_BUILD_URL" -O /tmp/spark.tgz && \ diff --git a/build.sbt b/build.sbt index 905585c16..cb49b6948 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import ReleaseTransformations._ resolvers += "Spark snapshot repository" at "https://repository.apache.org/snapshots/" -val sparkVer = sys.props.getOrElse("spark.version", "3.0.0") +val sparkVer = sys.props.getOrElse("spark.version", "3.0.2") val sparkBranch = sparkVer.substring(0, 3) val defaultScalaVer = sparkBranch match { case "3.0" => "2.12.11" diff --git a/dev/release.py b/dev/release.py index 28c73bd1b..e06e79f99 100755 --- a/dev/release.py +++ b/dev/release.py @@ -39,7 +39,7 @@ def verify(prompt, interactive): @click.option("--publish-docs", type=bool, default=PUBLISH_DOCS_DEFAULT, show_default=True, help="Publish docs to github-pages.") @click.option("--spark-version", multiple=True, show_default=True, - default=["2.4.6", "3.0.0"]) + default=["2.4.6", "3.0.2"]) def main(release_version, next_version, publish_to, no_prompt, git_remote, publish_docs, spark_version): interactive = not no_prompt From 0aa1616a97fe7de0bb59444e76e5b121ad827b88 Mon Sep 17 00:00:00 2001 From: David Lewis Date: Wed, 28 Apr 2021 10:10:45 -0500 Subject: [PATCH 3/3] update spark package repo --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 97b52a64d..a27f399b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ // You may use this file to add plugin dependencies for sbt. -resolvers += "Spark Packages repo" at "https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/" +resolvers += "Spark Packages repo" at "https://repos.spark-packages.org/" addSbtPlugin("org.spark-packages" %% "sbt-spark-package" % "0.2.6")