commit e07089bee6f51aec65de932b302894507903bd6e Author: Michael Stack Date: Wed Aug 23 15:22:59 2017 -0700 HBASE-18321 [hbase-thirdparty] Fix generation of META-INF/DEPENDENCIES to include dependency list and versions diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml index b616593..aec16f2 100644 --- a/hbase-shaded-miscellaneous/pom.xml +++ b/hbase-shaded-miscellaneous/pom.xml @@ -81,13 +81,16 @@ com.google.protobuf:protobuf-java com.google.code.findbugs:jsr305 com.google.errorprone:error_prone_annotations com.google.j2objc:j2objc-annotations org.codehaus.mojo:animal-sniffer-annotations - org.codehaus.mojo:animal-sniffer-annotations @@ -106,6 +109,24 @@ com.google.guava guava 22.0 + + + com.google.code.findbugs + jsr305 + + + com.google.errorprone + error_prone_annotations + + + com.google.j2objc + j2objc-annotations + + + org.codehaus.mojo + animal-sniffer-annotations + + com.google.protobuf @@ -113,6 +134,12 @@ 3.3.0 + + + com.google.protobuf + protobuf-java + + diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml index f9cf3fe..d762786 100644 --- a/hbase-shaded-protobuf/pom.xml +++ b/hbase-shaded-protobuf/pom.xml @@ -31,6 +31,9 @@ Pulls down protobuf, patches it, compiles, and then relocates/shades. + + 3.3.1 + @@ -92,7 +95,7 @@ com.google.protobuf protobuf-java - 3.3.1 + ${protobuf.version} sources jar true @@ -175,4 +178,11 @@ + + + com.google.protobuf + protobuf-java + ${protobuf.version} + +