[CARBONDATA-1280] Solve HiveExample dependency issues and fix spark 1.6 CI This closes #1150
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ff7eba0b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ff7eba0b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ff7eba0b Branch: refs/heads/streaming_ingest Commit: ff7eba0b838bbf4b9361d5a6a0859d7af104b9a5 Parents: c7e7f70 Author: chenliang613 <[email protected]> Authored: Sat Jul 8 23:53:02 2017 +0800 Committer: chenliang613 <[email protected]> Committed: Sat Jul 8 23:58:57 2017 +0800 ---------------------------------------------------------------------- integration/hive/pom.xml | 18 ++++++++++++++++++ pom.xml | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff7eba0b/integration/hive/pom.xml ---------------------------------------------------------------------- diff --git a/integration/hive/pom.xml b/integration/hive/pom.xml index 5a33958..3f1d6ef 100644 --- a/integration/hive/pom.xml +++ b/integration/hive/pom.xml @@ -78,6 +78,24 @@ <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-spark2</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.spark</groupId> + <artifactId>spark-hive-thriftserver_2.10</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.spark</groupId> + <artifactId>spark-repl_2.10</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.spark</groupId> + <artifactId>spark-sql_2.10</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-sql_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff7eba0b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7065bee..7af7b64 100644 --- a/pom.xml +++ b/pom.xml @@ -103,8 +103,6 @@ <module>integration/spark-common-test</module> <module>assembly</module> <module>examples/flink</module> - <module>integration/hive</module> - <module>integration/presto</module> </modules> @@ -312,6 +310,8 @@ <module>examples/spark</module> <module>integration/spark2</module> <module>examples/spark2</module> + <module>integration/hive</module> + <module>integration/presto</module> </modules> </profile> <profile> @@ -363,6 +363,8 @@ </properties> <modules> <module>integration/spark2</module> + <module>integration/hive</module> + <module>integration/presto</module> <module>examples/spark2</module> </modules> </profile>
