HBASE-17056 Remove checked in PB generated files; ADDENDUM
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6440509d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6440509d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6440509d Branch: refs/heads/branch-2 Commit: 6440509d7d28b0a0ecf027352d64605d7085ff29 Parents: ee70b1d Author: Michael Stack <st...@apache.org> Authored: Wed Aug 2 09:54:03 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Wed Aug 2 09:54:03 2017 -0700 ---------------------------------------------------------------------- hbase-spark/pom.xml | 1 - pom.xml | 5 ----- 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6440509d/hbase-spark/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 8138a5d..806b024 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -184,7 +184,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> ->>>>>>> 7a6de1bd42... HBASE-17056 Remove checked in PB generated files <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/hbase/blob/6440509d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 53092d1..2bd43b9 100644 --- a/pom.xml +++ b/pom.xml @@ -1689,11 +1689,6 @@ <version>${metrics-core.version}</version> </dependency> <dependency> - <groupId>org.apache.hbase.thirdparty</groupId> - <artifactId>hbase-shaded-miscellaneous</artifactId> - <version>${hbase-thirdparty.version}</version> - </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>${collections.version}</version>
