From fbd24621ce56e76b3782427471b79df7e356dd45 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 16 Sep 2021 05:10:54 -0700 Subject: [PATCH] [SPARK-36759][BUILD][FOLLOWUP] Update version in scala-2.12 profile and doc ### What changes were proposed in this pull request? This is a follow-up to fix the leftover during switching the Scala version. ### Why are the changes needed? This should be consistent. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? This is not tested by UT. We need to check manually. There is no more `2.12.14`. ``` $ git grep 2.12.14 R/pkg/tests/fulltests/test_sparkSQL.R: c(as.Date("2012-12-14"), as.Date("2013-12-15"), as.Date("2014-12-16"))) data/mllib/ridge-data/lpsa.data:3.5307626,0.987291634724086 -0.36279314978779 -0.922212414640967 0.232904453212813 -0.522940888712441 1.79270085261407 0.342627053981254 1.26288870310799 sql/hive/src/test/resources/data/files/over10k:-3|454|65705|4294967468|62.12|14.32|true|mike white|2013-03-01 09:11:58.703087|40.18|joggying ``` Closes #34020 from dongjoon-hyun/SPARK-36759-2. Authored-by: Dongjoon Hyun Signed-off-by: Dongjoon Hyun (cherry picked from commit adbea252db0f61ed3aaa45ea20b704bad6c47408) Signed-off-by: Dongjoon Hyun --- docs/_config.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index d6f09385a7..aa858175dd 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -22,7 +22,7 @@ include: SPARK_VERSION: 3.2.1-SNAPSHOT SPARK_VERSION_SHORT: 3.2.1 SCALA_BINARY_VERSION: "2.12" -SCALA_VERSION: "2.12.14" +SCALA_VERSION: "2.12.15" MESOS_VERSION: 1.0.0 SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_GITHUB_URL: https://github.com/apache/spark diff --git a/pom.xml b/pom.xml index 9f2b2c923c..5adbe8ab0e 100644 --- a/pom.xml +++ b/pom.xml @@ -3360,7 +3360,7 @@ SPARK-34774 Add this property to ensure change-scala-version.sh can replace the public `scala.version` property correctly. --> - 2.12.14 + 2.12.15