hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [hbase-thirdparty] branch master updated: HBASE-23052 Provide a jdk7 compatible relocated GSON in its own module. (#4)
Date Sat, 21 Sep 2019 15:55:06 GMT
This is an automated email from the ASF dual-hosted git repository.

busbey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git


The following commit(s) were added to refs/heads/master by this push:
     new d341cf4  HBASE-23052 Provide a jdk7 compatible relocated GSON in its own module.
(#4)
d341cf4 is described below

commit d341cf4e9e89f5ac33ec741183c7aafbdfa59b14
Author: Sean Busbey <busbey@apache.org>
AuthorDate: Sat Sep 21 10:55:01 2019 -0500

    HBASE-23052 Provide a jdk7 compatible relocated GSON in its own module. (#4)
    
    Signed-off-by: Peter Somogyi <psomogyi@apache.org>
---
 .../pom.xml                                        | 86 ++--------------------
 hbase-shaded-miscellaneous/pom.xml                 |  8 +-
 hbase-shaded-netty/pom.xml                         |  2 +-
 hbase-shaded-protobuf/pom.xml                      |  2 +-
 pom.xml                                            |  3 +-
 5 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-gson/pom.xml
similarity index 60%
copy from hbase-shaded-miscellaneous/pom.xml
copy to hbase-shaded-gson/pom.xml
index ce498ee..720501d 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-gson/pom.xml
@@ -32,15 +32,18 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>hbase-shaded-miscellaneous</artifactId>
-  <name>Apache HBase Relocated (Shaded) Third-party Miscellaneous Libs</name>
+  <artifactId>hbase-shaded-gson</artifactId>
+  <name>Apache HBase Relocated (Shaded) GSON Libs</name>
   <description>
-    Pulls down a set of libs, relocates them and then makes a fat new jar with them all in
it.
-    See below for what this miscellaney includes.
+    Pulls down GSON, relocates it and makes a far jar.
   </description>
+  <properties>
+    <!-- This GSON is also used by branch-1, so make sure we're jdk7 compatible -->
+    <compileSource>1.7</compileSource>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -70,25 +73,13 @@
               <createSourcesJar>true</createSourcesJar>
               <relocations>
                 <relocation>
-                  <pattern>com.google.common</pattern>
-                  <shadedPattern>${rename.offset}.com.google.common</shadedPattern>
-                </relocation>
-                <relocation>
                   <pattern>com.google.gson</pattern>
                   <shadedPattern>${rename.offset}.com.google.gson</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>com.google.protobuf</pattern>
-                  <shadedPattern>${rename.offset}.com.google.protobuf</shadedPattern>
-                </relocation>
-                <relocation>
                   <pattern>com.google.thirdparty</pattern>
                   <shadedPattern>${rename.offset}.com.google.thirdparty</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>org.apache.commons</pattern>
-                  <shadedPattern>${rename.offset}.org.apache.commons</shadedPattern>
-                </relocation>
               </relocations>
               <artifactSet>
                 <excludes>
@@ -125,66 +116,5 @@
       <artifactId>gson</artifactId>
       <version>2.8.5</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>27.1-jre</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>
-        <!-- Just an empty jar-->
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>listenablefuture</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.checkerframework</groupId>
-          <artifactId>checker-qual</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java-util</artifactId>
-      <!--Version should be same as protobuf in adjacent module
-           except sometimes they publish new protobuf version w/o
-           updating util.-->
-      <version>${protobuf.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.protobuf</groupId>
-          <artifactId>protobuf-java</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>2.3.3</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml
index ce498ee..5a1c808 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-miscellaneous</artifactId>
@@ -104,6 +104,7 @@
                   <exclude>com.google.errorprone:error_prone_annotations</exclude>
                   <exclude>com.google.j2objc:j2objc-annotations</exclude>
                   <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+                  <exclude>com.google.code.gson:gson</exclude>
                 </excludes>
               </artifactSet>
               <transformers>
@@ -121,11 +122,6 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.8.5</version>
-    </dependency>
-    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>27.1-jre</version>
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index 38a8b80..e4e2a30 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-netty</artifactId>
diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index 8d2b91e..f1168f8 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-protobuf</artifactId>
diff --git a/pom.xml b/pom.xml
index ff13c23..885596c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
   </parent>
   <groupId>org.apache.hbase.thirdparty</groupId>
   <artifactId>hbase-thirdparty</artifactId>
-  <version>2.2.2-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <name>Apache HBase Third-Party Libs</name>
   <packaging>pom</packaging>
   <description>
@@ -56,6 +56,7 @@
   <modules>
     <module>hbase-shaded-protobuf</module>
     <module>hbase-shaded-netty</module>
+    <module>hbase-shaded-gson</module>
     <module>hbase-shaded-miscellaneous</module>
   </modules>
   <scm>


Mime
View raw message