HBASE-17056 Remove checked in PB generated files; ADDENDUM

This commit is contained in:
Michael Stack 2017-08-02 09:54:03 -07:00
parent ee70b1d2e0
commit 6440509d7d
2 changed files with 0 additions and 6 deletions

View File

@ -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>

View File

@ -1688,11 +1688,6 @@
<artifactId>metrics-core</artifactId>
<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>