Repository: phoenix Updated Branches: refs/heads/4.4-HBase-0.98 2463ca23c -> cebe0392d
PHOENIX-2040 Mark spark/scala dependencies as 'provided' (Josh Mahonin) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cebe0392 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cebe0392 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cebe0392 Branch: refs/heads/4.4-HBase-0.98 Commit: cebe0392da2c1260527675b7ed829f12025bcd08 Parents: 2463ca2 Author: Nick Dimiduk <ndimi...@apache.org> Authored: Mon Jun 15 16:16:03 2015 -0700 Committer: Nick Dimiduk <ndimi...@apache.org> Committed: Mon Jun 15 16:16:48 2015 -0700 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 4 ++++ phoenix-spark/pom.xml | 51 ++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cebe0392/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 49b0721..bcdb9a7 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -148,6 +148,10 @@ </dependency> <dependency> <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-spark</artifactId> + </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-server</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/phoenix/blob/cebe0392/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index 0fa967f..04439ef 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark/pom.xml @@ -44,12 +44,7 @@ <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-core</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> + <!-- Force import of Spark's servlet API for unit tests --> <dependency> <groupId>javax.servlet</groupId> @@ -58,16 +53,38 @@ <scope>test</scope> </dependency> + <!-- Mark Spark / Scala as provided --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-core_${scala.binary.version}</artifactId> + <version>${spark.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-sql_${scala.binary.version}</artifactId> + <version>${spark.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-core</artifactId> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> @@ -85,18 +102,6 @@ </dependency> <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.binary.version}</artifactId> - <version>${spark.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_${scala.binary.version}</artifactId> - <version>${spark.version}</version> - </dependency> - - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop-two.version}</version>
