Merge branch 'development'

Author: patricioe

client/CHANGES.txt

@@ -1,4 +1,8 @@
 CHANGES
+
+3.3.2 (Jan 24, 2020)
+ - Shade com.google.guava as well
+
 3.3.1 (Nov 1, 2019)
  - Allow client to disable sending the IP address & hostname.
 

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2-SNAPSHOT</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>
@@ -46,6 +46,7 @@
                                     <include>org.apache.httpcomponents:httpclient</include>
                                     <include>org.apache.httpcomponents:httpcore</include>
                                     <include>com.google.code.gson:gson</include>
+                                    <include>com.google.guava:guava</include>
                                     <include>org.yaml.snakeyaml</include>
                                 </includes>
                             </artifactSet>
@@ -55,8 +56,8 @@
                                     <shadedPattern>split.org.apache.http</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>com.google.gson</pattern>
-                                    <shadedPattern>split.com.google.gson</shadedPattern>
+                                    <pattern>com.google</pattern>
+                                    <shadedPattern>split.com.google</shadedPattern>
                                 </relocation>
                             </relocations>
                             <filters>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.split.client</groupId>
     <artifactId>java-client-parent</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.2-SNAPSHOT</version>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -146,6 +146,7 @@
                                 </goals>
                                 <configuration>
                                     <additionalJOptions>-Xdoclint:none</additionalJOptions>
+                                    <source>1.7</source>
                                 </configuration>
                             </execution>
                         </executions>

testing/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-client-testing</artifactId>