hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase-thirdparty git commit: HBASE-18321 [hbase-thirdparty] Fix generation of META-INF/DEPENDENCIES to include dependency list and versions
Date Wed, 23 Aug 2017 22:23:07 GMT
Repository: hbase-thirdparty
Updated Branches:
  refs/heads/master b37531a5f -> e07089bee


HBASE-18321 [hbase-thirdparty] Fix generation of META-INF/DEPENDENCIES to include dependency
list and versions


Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/e07089be
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/e07089be
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/e07089be

Branch: refs/heads/master
Commit: e07089bee6f51aec65de932b302894507903bd6e
Parents: b37531a
Author: Michael Stack <stack@apache.org>
Authored: Wed Aug 23 15:22:59 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Wed Aug 23 15:22:59 2017 -0700

----------------------------------------------------------------------
 hbase-shaded-miscellaneous/pom.xml | 29 ++++++++++++++++++++++++++++-
 hbase-shaded-protobuf/pom.xml      | 12 +++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/e07089be/hbase-shaded-miscellaneous/pom.xml
----------------------------------------------------------------------
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 @@
                 <excludes>
                   <!--Exclude protobuf itself. We get a patched version in adjacent module.
                         Exclude other dependencies of guava, netty, etc.
+
+                      Anything added here needs to be excluded from the jar that pulls it
in
+                      also else we give an odd signal in the META-INF/DEPENDENCIES that we
+                      produce. See below for how to exclusion of transitive dependencies.
                     -->
                   <exclude>com.google.protobuf:protobuf-java</exclude>
                   <exclude>com.google.code.findbugs:jsr305</exclude>
                   <exclude>com.google.errorprone:error_prone_annotations</exclude>
                   <exclude>com.google.j2objc:j2objc-annotations</exclude>
                   <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
-                  <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
                 </excludes>
               </artifactSet>
             </configuration>
@@ -106,6 +109,24 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>22.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.j2objc</groupId>
+          <artifactId>j2objc-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>animal-sniffer-annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -113,6 +134,12 @@
       <!--Version should be same as protobuf except sometimes
            they publish new protobuf version w/o updating util.-->
       <version>3.3.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.protobuf</groupId>
+          <artifactId>protobuf-java</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/e07089be/hbase-shaded-protobuf/pom.xml
----------------------------------------------------------------------
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 @@
   <description>
     Pulls down protobuf, patches it, compiles, and then relocates/shades.
   </description>
+  <properties>
+    <protobuf.version>3.3.1</protobuf.version>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -92,7 +95,7 @@
                 <artifactItem>
                   <groupId>com.google.protobuf</groupId>
                   <artifactId>protobuf-java</artifactId>
-                  <version>3.3.1</version>
+                  <version>${protobuf.version}</version>
                   <classifier>sources</classifier>
                   <type>jar</type>
                   <overWrite>true</overWrite>
@@ -175,4 +178,11 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
+  </dependencies>
 </project>


Mime
View raw message