You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2019/11/14 08:02:50 UTC
[carbondata] branch master updated: [CARBONDATA-3577] Use Spark 2.3
as default version and upgrade Spark 2.3.2 to 2.3.4
This is an automated email from the ASF dual-hosted git repository.
jackylk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
The following commit(s) were added to refs/heads/master by this push:
new 7d82feb [CARBONDATA-3577] Use Spark 2.3 as default version and upgrade Spark 2.3.2 to 2.3.4
7d82feb is described below
commit 7d82feb17e654836d21c3289f8831799064df262
Author: Zhang Zhichao <44...@qq.com>
AuthorDate: Wed Nov 13 20:45:25 2019 +0800
[CARBONDATA-3577] Use Spark 2.3 as default version and upgrade Spark 2.3.2 to 2.3.4
Use Spark 2.3 as default version and upgrade Spark 2.3.2 to 2.3.4
This closes #3450
---
integration/spark-datasource/pom.xml | 10 +++++-----
integration/spark2/pom.xml | 10 +++++-----
pom.xml | 9 +++++----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/integration/spark-datasource/pom.xml b/integration/spark-datasource/pom.xml
index 3052f9b..775129b 100644
--- a/integration/spark-datasource/pom.xml
+++ b/integration/spark-datasource/pom.xml
@@ -180,7 +180,7 @@
<profile>
<id>build-all</id>
<properties>
- <spark.version>2.2.1</spark.version>
+ <spark.version>2.3.4</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>
@@ -233,9 +233,6 @@
</profile>
<profile>
<id>spark-2.2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<spark.version>2.2.1</spark.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -276,8 +273,11 @@
</profile>
<profile>
<id>spark-2.3</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
- <spark.version>2.3.2</spark.version>
+ <spark.version>2.3.4</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>
diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml
index 217f434..87437bf 100644
--- a/integration/spark2/pom.xml
+++ b/integration/spark2/pom.xml
@@ -236,7 +236,7 @@
<profile>
<id>build-all</id>
<properties>
- <spark.version>2.2.1</spark.version>
+ <spark.version>2.3.4</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>
@@ -292,9 +292,6 @@
</profile>
<profile>
<id>spark-2.2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<spark.version>2.2.1</spark.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -338,8 +335,11 @@
</profile>
<profile>
<id>spark-2.3</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
- <spark.version>2.3.2</spark.version>
+ <spark.version>2.3.4</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>
diff --git a/pom.xml b/pom.xml
index 7a3042c..f363906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,7 @@
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
<hadoop.deps.scope>compile</hadoop.deps.scope>
+ <spark.version>2.3.4</spark.version>
<spark.deps.scope>compile</spark.deps.scope>
<scala.deps.scope>compile</scala.deps.scope>
<dev.path>${basedir}/dev</dev.path>
@@ -546,9 +547,6 @@
</profile>
<profile>
<id>spark-2.2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<spark.version>2.2.1</spark.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -598,8 +596,11 @@
</profile>
<profile>
<id>spark-2.3</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
- <spark.version>2.3.2</spark.version>
+ <spark.version>2.3.4</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>