Bump test and build dependencies

(cherry picked from commit d0e1a08)

Author: acogoluegnes

pom.xml

@@ -60,13 +60,13 @@
     <jackson.version>2.9.9.3</jackson.version>
     <logback.version>1.2.3</logback.version>
     <junit.version>4.12</junit.version>
-    <awaitility.version>3.1.6</awaitility.version>
+    <awaitility.version>4.0.1</awaitility.version>
     <mockito.version>3.0.0</mockito.version>
-    <assertj.version>3.12.2</assertj.version>
-    <jetty.version>9.4.19.v20190610</jetty.version>
-    <bouncycastle.version>1.61</bouncycastle.version>
+    <assertj.version>3.13.2</assertj.version>
+    <jetty.version>9.4.20.v20190813</jetty.version>
+    <bouncycastle.version>1.63</bouncycastle.version>
 
-    <maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
+    <maven.javadoc.plugin.version>3.1.1</maven.javadoc.plugin.version>
     <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
     <versions.maven.plugin.version>2.3</versions.maven.plugin.version>
     <maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
@@ -75,9 +75,9 @@
     <groovy.all.version>2.4.8</groovy.all.version>
     <keytool.maven.plugin.version>1.5</keytool.maven.plugin.version>
     <build.helper.maven-plugin.version>1.12</build.helper.maven-plugin.version>
-    <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
-    <maven.surefire.plugin.version>2.22.1</maven.surefire.plugin.version>
-    <maven.failsafe.plugin.version>2.22.1</maven.failsafe.plugin.version>
+    <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+    <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
+    <maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
     <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
     <maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
     <maven.bundle.plugin.version>3.2.0</maven.bundle.plugin.version>

src/test/java/com/rabbitmq/client/test/JavaNioTest.java

@@ -4,6 +4,7 @@
 import com.rabbitmq.client.impl.nio.BlockingQueueNioQueue;
 import com.rabbitmq.client.impl.nio.DefaultByteBufferFactory;
 import com.rabbitmq.client.impl.nio.NioParams;
+import org.assertj.core.api.Condition;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,10 +15,8 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.isOneOf;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -125,19 +124,21 @@ public void shutdownCompleted(ShutdownSignalException cause) {
     public void nioLoopCleaning() throws Exception {
         ConnectionFactory connectionFactory = new ConnectionFactory();
         connectionFactory.useNio();
-        for(int i = 0; i < 10; i++) {
+        for (int i = 0; i < 10; i++) {
             Connection connection = connectionFactory.newConnection();
             connection.abort();
         }
     }
 
-    @Test public void messageSize() throws Exception {
+    @Test
+    public void messageSize() throws Exception {
         for (int i = 0; i < 50; i++) {
             sendAndVerifyMessage(testConnection, 76390);
         }
     }
 
-    @Test public void byteBufferFactory() throws Exception {
+    @Test
+    public void byteBufferFactory() throws Exception {
         ConnectionFactory cf = new ConnectionFactory();
         cf.useNio();
         int baseCapacity = 32768;
@@ -155,12 +156,15 @@ public void nioLoopCleaning() throws Exception {
             sendAndVerifyMessage(c, 100);
         }
 
-        assertThat(byteBuffers, hasSize(2));
-        assertThat(byteBuffers.get(0).capacity(), isOneOf(nioParams.getReadByteBufferSize(), nioParams.getWriteByteBufferSize()));
-        assertThat(byteBuffers.get(1).capacity(), isOneOf(nioParams.getReadByteBufferSize(), nioParams.getWriteByteBufferSize()));
+        assertThat(byteBuffers).hasSize(2);
+        Condition<Integer> condition = new Condition<>(c -> c == nioParams.getReadByteBufferSize() ||
+                c == nioParams.getWriteByteBufferSize(), "capacity set by factory");
+        assertThat(byteBuffers.get(0).capacity()).is(condition);
+        assertThat(byteBuffers.get(1).capacity()).is(condition);
     }
 
-    @Test public void directByteBuffers() throws Exception {
+    @Test
+    public void directByteBuffers() throws Exception {
         ConnectionFactory cf = new ConnectionFactory();
         cf.useNio();
         cf.setNioParams(new NioParams().setByteBufferFactory(new DefaultByteBufferFactory(capacity -> ByteBuffer.allocateDirect(capacity))));
@@ -169,15 +173,16 @@ public void nioLoopCleaning() throws Exception {
         }
     }
 
-    @Test public void customWriteQueue() throws Exception {
+    @Test
+    public void customWriteQueue() throws Exception {
         ConnectionFactory cf = new ConnectionFactory();
         cf.useNio();
         AtomicInteger count = new AtomicInteger(0);
         cf.setNioParams(new NioParams().setWriteQueueFactory(ctx -> {
             count.incrementAndGet();
             return new BlockingQueueNioQueue(
-                new LinkedBlockingQueue<>(ctx.getNioParams().getWriteQueueCapacity()),
-                ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
+                    new LinkedBlockingQueue<>(ctx.getNioParams().getWriteQueueCapacity()),
+                    ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
             );
         }));
         try (Connection c = cf.newConnection()) {
@@ -193,7 +198,7 @@ private void sendAndVerifyMessage(Connection connection, int size) throws Except
     }
 
     private Connection basicGetBasicConsume(ConnectionFactory connectionFactory, String queue, final CountDownLatch latch)
-        throws IOException, TimeoutException {
+            throws IOException, TimeoutException {
         Connection connection = connectionFactory.newConnection();
         Channel channel = connection.createChannel();
         channel.queueDeclare(queue, false, false, false, null);
@@ -213,7 +218,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
     }
 
     private boolean basicGetBasicConsume(Connection connection, String queue, final CountDownLatch latch, int msgSize)
-        throws Exception {
+            throws Exception {
         Channel channel = connection.createChannel();
         channel.queueDeclare(queue, false, false, false, null);
         channel.queuePurge(queue);

src/test/java/com/rabbitmq/client/test/RpcTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-Present Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2017-2019 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
@@ -24,13 +24,12 @@
 import com.rabbitmq.client.impl.recovery.RecordedQueue;
 import com.rabbitmq.client.impl.recovery.TopologyRecoveryFilter;
 import com.rabbitmq.tools.Host;
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -301,7 +300,7 @@ public void handleRecoveryStarted(Recoverable recoverable) {
 
         serverThread.interrupt();
 
-        waitAtMost(Duration.ONE_SECOND).until(() -> !serverThread.isAlive()) ;
+        waitAtMost(Duration.ofSeconds(1)).until(() -> !serverThread.isAlive()) ;
 
         client.close();
     }

src/test/java/com/rabbitmq/client/test/functional/Metrics.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-Present Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
@@ -30,13 +30,13 @@
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.tools.Host;
-import org.awaitility.Duration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -637,7 +637,7 @@ private void sendMessage(Channel channel) throws IOException {
     }
 
     private Duration timeout() {
-        return new Duration(10, TimeUnit.SECONDS);
+        return Duration.ofSeconds(10);
     }
 
     private static class MultipleAckConsumer extends DefaultConsumer {