You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/08/04 04:00:24 UTC
carbondata git commit: [CARBONDATA-1205] Use Spark 2.1 as default
compilation in parent pom
Repository: carbondata
Updated Branches:
refs/heads/master 68d8e5703 -> 7248d0ed1
[CARBONDATA-1205] Use Spark 2.1 as default compilation in parent pom
>From 1.2.0, there are many features developing based on Spark 2.1, so use Spark2.1 as default compilation in parent pom.
This closes #1226
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/7248d0ed
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/7248d0ed
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/7248d0ed
Branch: refs/heads/master
Commit: 7248d0ed194764d38a8a8cdade4d2ea4f9534017
Parents: 68d8e57
Author: Liang Chen <ch...@apache.org>
Authored: Thu Aug 3 11:42:38 2017 +0800
Committer: Ravindra Pesala <ra...@gmail.com>
Committed: Fri Aug 4 09:29:47 2017 +0530
----------------------------------------------------------------------
integration/spark-common-test/pom.xml | 1 -
integration/spark2/pom.xml | 1 -
pom.xml | 8 ++++----
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/7248d0ed/integration/spark-common-test/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml
index fbb4f8d..4c00992 100644
--- a/integration/spark-common-test/pom.xml
+++ b/integration/spark-common-test/pom.xml
@@ -137,7 +137,6 @@
<version>1.0</version>
<!-- Note config is repeated in surefire config -->
<configuration>
- <skipTests>false</skipTests>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>CarbonTestSuite.txt</filereports>
http://git-wip-us.apache.org/repos/asf/carbondata/blob/7248d0ed/integration/spark2/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml
index 2f34c34..8f17d54 100644
--- a/integration/spark2/pom.xml
+++ b/integration/spark2/pom.xml
@@ -143,7 +143,6 @@
<version>1.0</version>
<!-- Note config is repeated in surefire config -->
<configuration>
- <skipTests>false</skipTests>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>CarbonTestSuite.txt</filereports>
http://git-wip-us.apache.org/repos/asf/carbondata/blob/7248d0ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3efdf96..78d5bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,9 +386,6 @@
</profile>
<profile>
<id>spark-1.6</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<spark.version>1.6.2</spark.version>
<scala.binary.version>2.10</scala.binary.version>
@@ -401,6 +398,9 @@
</profile>
<profile>
<id>spark-2.1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
<spark.version>2.1.0</spark.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -485,4 +485,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>