Repository: hbase Updated Branches: refs/heads/master 7c1fad499 -> 131ab9b6a
HBASE-20175 hbase-spark needs scala dependency convergance Signed-off-by: Mike Drob <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/131ab9b6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/131ab9b6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/131ab9b6 Branch: refs/heads/master Commit: 131ab9b6a82933b2ba6eac0878297b104cd38c4e Parents: 7c1fad4 Author: Artem Ervits <[email protected]> Authored: Tue Aug 28 12:15:12 2018 -0400 Committer: Mike Drob <[email protected]> Committed: Fri Aug 31 09:41:47 2018 -0500 ---------------------------------------------------------------------- hbase-spark/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/131ab9b6/hbase-spark/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 1042663..27f3ed7 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -117,12 +117,24 @@ <artifactId>scalatest_${scala.binary.version}</artifactId> <version>2.2.4</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.scalamock</groupId> <artifactId>scalamock-scalatest-support_${scala.binary.version}</artifactId> <version>3.1.4</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId>
