Repository: carbondata Updated Branches: refs/heads/master f49e1c397 -> 8dc7f402b
Reverted spark 2.1 to 1.6 as build-all profile cannot work This closes #1305 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/8dc7f402 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/8dc7f402 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/8dc7f402 Branch: refs/heads/master Commit: 8dc7f402bb5beff152141a0e0ef2ae7267548082 Parents: f49e1c3 Author: Ravindra Pesala <[email protected]> Authored: Thu Aug 31 14:52:46 2017 +0530 Committer: chenliang613 <[email protected]> Committed: Thu Aug 31 22:08:15 2017 +0800 ---------------------------------------------------------------------- integration/spark2/pom.xml | 8 ++++++++ pom.xml | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/8dc7f402/integration/spark2/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml index c4572c5..1897339 100644 --- a/integration/spark2/pom.xml +++ b/integration/spark2/pom.xml @@ -162,6 +162,14 @@ </build> <profiles> <profile> + <id>build-all</id> + <properties> + <spark.version>2.1.0</spark.version> + <scala.binary.version>2.11</scala.binary.version> + <scala.version>2.11.8</scala.version> + </properties> + </profile> + <profile> <id>sdvtest</id> <properties> <maven.test.skip>true</maven.test.skip> http://git-wip-us.apache.org/repos/asf/carbondata/blob/8dc7f402/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 63f8b2f..5c74555 100644 --- a/pom.xml +++ b/pom.xml @@ -404,9 +404,9 @@ <!-- This profile only should be used for release prepare to cover all the modules --> <id>build-all</id> <properties> - <spark.version>2.1.0</spark.version> - <scala.binary.version>2.11</scala.binary.version> - <scala.version>2.11.8</scala.version> + <spark.version>1.6.2</spark.version> + <scala.binary.version>2.10</scala.binary.version> + <scala.version>2.10.4</scala.version> <maven.test.skip>true</maven.test.skip> </properties> <modules>
