Update dependencies (#1184)

driver/src/test/java/org/neo4j/driver/internal/async/DirectConnectionTest.java

@@ -23,14 +23,14 @@
 import io.netty.channel.EventLoop;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.pool.ChannelPool;
-import io.netty.util.internal.ConcurrentSet;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -616,7 +616,7 @@ private static void assertConnectionTerminatedError( IllegalStateException e )
  private static class ThreadTrackingInboundMessageDispatcher extends InboundMessageDispatcher
  {
 
- final Set<String> queueThreadNames = new ConcurrentSet<>();
+ final Set<String> queueThreadNames = ConcurrentHashMap.newKeySet();
  ThreadTrackingInboundMessageDispatcher( Channel channel )
  {
  super( channel, DEV_NULL_LOGGING );

driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplTest.java

@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.neo4j.driver.internal.BoltServerAddress.LOCAL_DEFAULT;
 import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
@@ -59,7 +59,7 @@ void shouldDoNothingWhenRetainOnEmptyPool()
 
  pool.retainAll( singleton( LOCAL_DEFAULT ) );
 
- verifyZeroInteractions( nettyChannelTracker );
+ verifyNoInteractions( nettyChannelTracker );
  }
 
  @Test

driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LeastConnectedLoadBalancingStrategyTest.java

@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.neo4j.driver.internal.cluster.ClusterCompositionUtil.A;
 import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
 
@@ -49,7 +49,7 @@ class LeastConnectedLoadBalancingStrategyTest
  @BeforeEach
  void setUp()
  {
- initMocks( this );
+ openMocks( this );
  strategy = new LeastConnectedLoadBalancingStrategy( connectionPool, DEV_NULL_LOGGING );
  }
 

driver/src/test/java/org/neo4j/driver/internal/handlers/RoutingResponseHandlerTest.java

@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.neo4j.driver.internal.BoltServerAddress.LOCAL_DEFAULT;
 
 class RoutingResponseHandlerTest
@@ -50,7 +50,7 @@ void shouldUnwrapCompletionException()
  Throwable handledError = handle( new CompletionException( error ), errorHandler );
 
  assertEquals( error, handledError );
- verifyZeroInteractions( errorHandler );
+ verifyNoInteractions( errorHandler );
  }
 
  @Test
@@ -86,7 +86,7 @@ void shouldHandleTransientException()
  Throwable handledError = handle( error, errorHandler );
 
  assertEquals( error, handledError );
- verifyZeroInteractions( errorHandler );
+ verifyNoInteractions( errorHandler );
  }
 
  @Test
@@ -122,7 +122,7 @@ void shouldHandleClientException()
  Throwable handledError = handle( error, errorHandler, AccessMode.READ );
 
  assertEquals( error, handledError );
- verifyZeroInteractions( errorHandler );
+ verifyNoInteractions( errorHandler );
  }
 
  @Test
@@ -158,7 +158,7 @@ private void testWriteFailureWithReadAccessMode( String code )
 
  assertThat( handledError, instanceOf( ClientException.class ) );
  assertEquals( "Write queries cannot be performed in READ access mode.", handledError.getMessage() );
- verifyZeroInteractions( errorHandler );
+ verifyNoInteractions( errorHandler );
  }
 
  private void testWriteFailureWithWriteAccessMode( String code )

driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java

@@ -52,7 +52,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
 import static org.neo4j.driver.internal.util.Futures.failedFuture;
@@ -646,7 +646,7 @@ void nothingIsLoggedOnFatalFailure()
  throw new RuntimeException( "Fatal blocking" );
  } ) );
  assertEquals( "Fatal blocking", error.getMessage() );
- verifyZeroInteractions( logger );
+ verifyNoInteractions( logger );
  }
 
  @Test
@@ -662,7 +662,7 @@ void nothingIsLoggedOnFatalFailureAsync()
  await( logic.retryAsync( () -> failedFuture( new RuntimeException( "Fatal async" ) ) ) ) );
 
  assertEquals( "Fatal async", error.getMessage() );
- verifyZeroInteractions( logger );
+ verifyNoInteractions( logger );
  }
 
  @Test

driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java

@@ -18,7 +18,6 @@
  */
 package org.neo4j.driver.v1.stress;
 
-import io.netty.util.internal.ConcurrentSet;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +34,7 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -623,7 +623,7 @@ private static class ResourcesInfo
  private static class LoggerNameTrackingLogging implements Logging
  {
  private final Logging consoleLogging = Logging.console( Level.FINE );
- private final Set<String> acquiredLoggerNames = new ConcurrentSet<>();
+ private final Set<String> acquiredLoggerNames = ConcurrentHashMap.newKeySet();
 
  @Override
  public Logger getLog( String name )

pom.xml

@@ -10,7 +10,7 @@
  <maven.compiler.target>1.8</maven.compiler.target>
  <rootDir>${project.basedir}</rootDir>
  <surefire.and.failsafe.version>2.22.1</surefire.and.failsafe.version>
- <junit.version>5.4.0</junit.version>
+ <junit.version>5.8.2</junit.version>
  <parallelizable.it.forkCount>1C</parallelizable.it.forkCount>
  <!-- All tests tagged are to be executed in parallel -->
  <parallelizable.it.tags>parallelizableIT</parallelizable.it.tags>
@@ -64,14 +64,14 @@
  <dependency>
  <groupId>org.hdrhistogram</groupId>
  <artifactId>HdrHistogram</artifactId>
- <version>2.1.10</version>
+ <version>2.1.12</version>
  </dependency>
 
  <!-- Optional dependencies -->
  <dependency>
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>1.7.36</version>
  </dependency>
 
  <!-- Test dependencies -->
@@ -84,7 +84,7 @@
  <dependency>
  <groupId>org.mockito</groupId>
  <artifactId>mockito-core</artifactId>
- <version>2.18.3</version>
+ <version>4.4.0</version>
  <scope>test</scope>
  </dependency>
  <dependency>
@@ -96,31 +96,31 @@
  <dependency>
  <groupId>org.rauschig</groupId>
  <artifactId>jarchivelib</artifactId>
- <version>0.7.1</version>
+ <version>1.2.0</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcprov-jdk15on</artifactId>
- <version>1.59</version>
+ <version>1.70</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.59</version>
+ <version>1.70</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
  <artifactId>jackson-databind</artifactId>
- <version>2.9.8</version>
+ <version>2.13.2</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
+ <version>1.2.11</version>
  <scope>test</scope>
  </dependency>
  </dependencies>