Upgrade Dependencies

Author: hyperxpro

client/src/test/java/org/asynchttpclient/CookieStoreTest.java

@@ -28,14 +28,14 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.testng.Assert.assertTrue;
 
-import com.google.common.collect.Sets;
-
 public class CookieStoreTest {
 
   private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -359,7 +359,7 @@ private void shouldCleanExpiredCookieFromUnderlyingDataStructure() throws Except
     store.evictExpired();
     assertTrue(store.getUnderlying().size() == 2);
     Collection<String> unexpiredCookieNames = store.getAll().stream().map(Cookie::name).collect(Collectors.toList());
-    assertTrue(unexpiredCookieNames.containsAll(Sets.newHashSet("UNEXPIRED_BAR", "UNEXPIRED_FOOBAR")));
+    assertTrue(unexpiredCookieNames.containsAll(new HashSet<>(Arrays.asList("UNEXPIRED_BAR", "UNEXPIRED_FOOBAR"))));
   }
 
   private static Cookie getCookie(String key, String value, int maxAge) {

client/src/test/java/org/asynchttpclient/request/body/InputStreamTest.java

@@ -57,7 +57,7 @@ public void testInvalidInputStream() throws IOException, ExecutionException, Int
 
         @Override
         public int available() {
-          return 1; // Fake
+          return readAllowed < 3 ? 1 : 0;
         }
 
         @Override

client/src/test/java/org/asynchttpclient/test/TestUtils.java

@@ -154,7 +154,8 @@ public static ServerConnector addHttpConnector(Server server) {
   public static ServerConnector addHttpsConnector(Server server) throws IOException, URISyntaxException {
 
     String keyStoreFile = resourceAsFile("ssltest-keystore.jks").getAbsolutePath();
-    SslContextFactory sslContextFactory = new SslContextFactory(keyStoreFile);
+    SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
+    sslContextFactory.setKeyStorePath(keyStoreFile);
     sslContextFactory.setKeyStorePassword("changeit");
 
     String trustStoreFile = resourceAsFile("ssltest-cacerts.jks").getAbsolutePath();

pom.xml

@@ -465,22 +465,22 @@
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <source.property>1.8</source.property>
     <target.property>1.8</target.property>
-    <netty.version>4.1.60.Final</netty.version>
-    <slf4j.version>1.7.30</slf4j.version>
-    <reactive-streams.version>1.0.3</reactive-streams.version>
+    <netty.version>4.1.121.Final</netty.version>
+    <slf4j.version>1.7.36</slf4j.version>
+    <reactive-streams.version>1.0.4</reactive-streams.version>
     <activation.version>1.2.2</activation.version>
-    <netty-reactive-streams.version>2.0.4</netty-reactive-streams.version>
+    <netty-reactive-streams.version>2.0.17</netty-reactive-streams.version>
     <rxjava.version>1.3.8</rxjava.version>
-    <rxjava2.version>2.2.19</rxjava2.version>
-    <logback.version>1.2.3</logback.version>
-    <testng.version>7.1.0</testng.version>
+    <rxjava2.version>2.2.21</rxjava2.version>
+    <logback.version>1.2.13</logback.version>
+    <testng.version>7.12.0</testng.version>
     <jetty.version>9.4.18.v20190429</jetty.version>
     <tomcat.version>9.0.31</tomcat.version>
-    <commons-io.version>2.6</commons-io.version>
-    <commons-fileupload.version>1.3.3</commons-fileupload.version>
-    <privilegedaccessor.version>1.2.2</privilegedaccessor.version>
-    <mockito.version>3.4.6</mockito.version>
+    <commons-io.version>2.21.0</commons-io.version>
+    <commons-fileupload.version>1.6.0</commons-fileupload.version>
+    <privilegedaccessor.version>1.3.1</privilegedaccessor.version>
+    <mockito.version>3.12.4</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
-    <kerby.version>2.0.0</kerby.version>
+    <kerby.version>2.1.1</kerby.version>
   </properties>
 </project>