RATIS-47. Shade google guava, and combine ratis-netty-shaded with ratis-proto-shaded. Contributed by Tsz Wo Nicholas Sze.

Author: Jing9

pom.xml

@@ -52,7 +52,6 @@
     <module>ratis-hadoop</module>
     <module>ratis-hadoop-shaded</module>
     <module>ratis-netty</module>
-    <module>ratis-netty-shaded</module>
     <module>ratis-proto-shaded</module>
     <module>ratis-server</module>
   </modules>
@@ -145,6 +144,7 @@
     <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
     <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
+    <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
     <maven-site-plugin.version>3.5</maven-site-plugin.version>
     <maven-source-plugin.version>2.3</maven-source-plugin.version>
     <maven-stylus-skin.version>1.5</maven-stylus-skin.version>
@@ -263,11 +263,6 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <artifactId>ratis-netty-shaded</artifactId>
-        <groupId>org.apache.ratis</groupId>
-        <version>${project.version}</version>
-      </dependency>
 
       <dependency>
         <artifactId>ratis-proto-shaded</artifactId>
@@ -300,12 +295,6 @@
         <version>1.7.10</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>20.0</version>
-      </dependency>
-
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -316,6 +305,12 @@
         <artifactId>mockito-all</artifactId>
         <version>1.8.5</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.jctools</groupId>
+        <artifactId>jctools-core</artifactId>
+        <version>1.2.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

ratis-common/pom.xml

@@ -43,11 +43,6 @@
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

ratis-common/src/main/java/org/apache/ratis/util/StringUtils.java

@@ -17,8 +17,8 @@
  */
 package org.apache.ratis.util;
 
-import com.google.common.collect.Interner;
-import com.google.common.collect.Interners;
+import org.apache.ratis.shaded.com.google.common.collect.Interner;
+import org.apache.ratis.shaded.com.google.common.collect.Interners;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

ratis-examples/pom.xml

@@ -110,11 +110,6 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-    <dependency>
-      <artifactId>ratis-netty-shaded</artifactId>
-      <groupId>org.apache.ratis</groupId>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>

ratis-grpc/pom.xml

@@ -83,5 +83,10 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.jctools</groupId>
+      <artifactId>jctools-core</artifactId>
+    </dependency>
   </dependencies>
 </project>

ratis-hadoop-shaded/pom.xml

@@ -133,7 +133,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>2.4.3</version>
+            <version>${maven-shade-plugin.version}</version>
             <executions>
               <execution>
                 <phase>package</phase>