Repository: carbondata Updated Branches: refs/heads/master 382ff2f99 -> a5e7b41b5
Fix compile issues Fix compile issues with mvn clean package This closes #1232 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/a5e7b41b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/a5e7b41b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/a5e7b41b Branch: refs/heads/master Commit: a5e7b41b519e3ffd423fc7bffff8fb41da898248 Parents: 382ff2f Author: chenliang613 <[email protected]> Authored: Fri Aug 4 18:04:20 2017 +0800 Committer: Ravindra Pesala <[email protected]> Committed: Fri Aug 4 16:09:26 2017 +0530 ---------------------------------------------------------------------- integration/spark-common-cluster-test/pom.xml | 6 +++--- integration/spark-common-test/pom.xml | 6 +++--- pom.xml | 11 ++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/a5e7b41b/integration/spark-common-cluster-test/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common-cluster-test/pom.xml b/integration/spark-common-cluster-test/pom.xml index 837cc99..0081e4e 100644 --- a/integration/spark-common-cluster-test/pom.xml +++ b/integration/spark-common-cluster-test/pom.xml @@ -188,9 +188,6 @@ </profile> <profile> <id>spark-1.6</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <dependencies> <dependency> <groupId>org.apache.carbondata</groupId> @@ -212,6 +209,9 @@ </profile> <profile> <id>spark-2.1</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <dependencies> <dependency> <groupId>org.apache.carbondata</groupId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/a5e7b41b/integration/spark-common-test/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml index 4c00992..dba4f99 100644 --- a/integration/spark-common-test/pom.xml +++ b/integration/spark-common-test/pom.xml @@ -184,9 +184,6 @@ </profile> <profile> <id>spark-1.6</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <dependencies> <dependency> <groupId>org.apache.carbondata</groupId> @@ -208,6 +205,9 @@ </profile> <profile> <id>spark-2.1</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <dependencies> <dependency> <groupId>org.apache.carbondata</groupId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/a5e7b41b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 78d5bb7..c8eec62 100644 --- a/pom.xml +++ b/pom.xml @@ -102,8 +102,6 @@ <module>integration/spark-common</module> <module>integration/spark-common-test</module> <module>assembly</module> - <module>examples/flink</module> - </modules> <properties> @@ -344,9 +342,9 @@ <!-- This profile only should be used for release prepare to cover all the modules --> <id>build-all</id> <properties> - <spark.version>1.6.2</spark.version> - <scala.binary.version>2.10</scala.binary.version> - <scala.version>2.10.4</scala.version> + <spark.version>2.1.0</spark.version> + <scala.binary.version>2.11</scala.binary.version> + <scala.version>2.11.8</scala.version> <maven.test.skip>true</maven.test.skip> </properties> <modules> @@ -357,6 +355,7 @@ <module>examples/spark2</module> <module>integration/hive</module> <module>integration/presto</module> + <module>examples/flink</module> </modules> </profile> <profile> @@ -382,6 +381,7 @@ <modules> <module>integration/spark</module> <module>examples/spark</module> + <module>examples/flink</module> </modules> </profile> <profile> @@ -394,6 +394,7 @@ <modules> <module>integration/spark</module> <module>examples/spark</module> + <module>examples/flink</module> </modules> </profile> <profile>
