Skip to content

Commit 0ebef59

Browse files
injectivesinjectives
committed
Update dependencies
1 parent b6cb453 commit 0ebef59

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import io.netty.channel.EventLoop;
2424
import io.netty.channel.embedded.EmbeddedChannel;
2525
import io.netty.channel.pool.ChannelPool;
26-
import io.netty.util.internal.ConcurrentSet;
2726
import org.junit.jupiter.api.AfterEach;
2827
import org.junit.jupiter.api.Test;
2928
import org.mockito.ArgumentCaptor;
3029

3130
import java.util.Set;
3231
import java.util.concurrent.CompletableFuture;
3332
import java.util.concurrent.CompletionStage;
33+
import java.util.concurrent.ConcurrentHashMap;
3434
import java.util.concurrent.ExecutorService;
3535
import java.util.concurrent.Executors;
3636
import java.util.concurrent.TimeUnit;
@@ -616,7 +616,7 @@ private static void assertConnectionTerminatedError( IllegalStateException e )
616616
private static class ThreadTrackingInboundMessageDispatcher extends InboundMessageDispatcher
617617
{
618618

619-
final Set<String> queueThreadNames = new ConcurrentSet<>();
619+
final Set<String> queueThreadNames = ConcurrentHashMap.newKeySet();
620620
ThreadTrackingInboundMessageDispatcher( Channel channel )
621621
{
622622
super( channel, DEV_NULL_LOGGING );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import static org.mockito.Mockito.mock;
4040
import static org.mockito.Mockito.never;
4141
import static org.mockito.Mockito.verify;
42-
import static org.mockito.Mockito.verifyZeroInteractions;
42+
import static org.mockito.Mockito.verifyNoInteractions;
4343
import static org.mockito.Mockito.when;
4444
import static org.neo4j.driver.internal.BoltServerAddress.LOCAL_DEFAULT;
4545
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
@@ -59,7 +59,7 @@ void shouldDoNothingWhenRetainOnEmptyPool()
5959

6060
pool.retainAll( singleton( LOCAL_DEFAULT ) );
6161

62-
verifyZeroInteractions( nettyChannelTracker );
62+
verifyNoInteractions( nettyChannelTracker );
6363
}
6464

6565
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import static org.mockito.Mockito.mock;
3737
import static org.mockito.Mockito.verify;
3838
import static org.mockito.Mockito.when;
39-
import static org.mockito.MockitoAnnotations.initMocks;
39+
import static org.mockito.MockitoAnnotations.openMocks;
4040
import static org.neo4j.driver.internal.cluster.ClusterCompositionUtil.A;
4141
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
4242

@@ -49,7 +49,7 @@ class LeastConnectedLoadBalancingStrategyTest
4949
@BeforeEach
5050
void setUp()
5151
{
52-
initMocks( this );
52+
openMocks( this );
5353
strategy = new LeastConnectedLoadBalancingStrategy( connectionPool, DEV_NULL_LOGGING );
5454
}
5555

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import static org.junit.jupiter.api.Assertions.assertEquals;
3737
import static org.mockito.Mockito.mock;
3838
import static org.mockito.Mockito.verify;
39-
import static org.mockito.Mockito.verifyZeroInteractions;
39+
import static org.mockito.Mockito.verifyNoInteractions;
4040
import static org.neo4j.driver.internal.BoltServerAddress.LOCAL_DEFAULT;
4141

4242
class RoutingResponseHandlerTest
@@ -50,7 +50,7 @@ void shouldUnwrapCompletionException()
5050
Throwable handledError = handle( new CompletionException( error ), errorHandler );
5151

5252
assertEquals( error, handledError );
53-
verifyZeroInteractions( errorHandler );
53+
verifyNoInteractions( errorHandler );
5454
}
5555

5656
@Test
@@ -86,7 +86,7 @@ void shouldHandleTransientException()
8686
Throwable handledError = handle( error, errorHandler );
8787

8888
assertEquals( error, handledError );
89-
verifyZeroInteractions( errorHandler );
89+
verifyNoInteractions( errorHandler );
9090
}
9191

9292
@Test
@@ -122,7 +122,7 @@ void shouldHandleClientException()
122122
Throwable handledError = handle( error, errorHandler, AccessMode.READ );
123123

124124
assertEquals( error, handledError );
125-
verifyZeroInteractions( errorHandler );
125+
verifyNoInteractions( errorHandler );
126126
}
127127

128128
@Test
@@ -158,7 +158,7 @@ private void testWriteFailureWithReadAccessMode( String code )
158158

159159
assertThat( handledError, instanceOf( ClientException.class ) );
160160
assertEquals( "Write queries cannot be performed in READ access mode.", handledError.getMessage() );
161-
verifyZeroInteractions( errorHandler );
161+
verifyNoInteractions( errorHandler );
162162
}
163163

164164
private void testWriteFailureWithWriteAccessMode( String code )

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import static org.mockito.Mockito.never;
5353
import static org.mockito.Mockito.times;
5454
import static org.mockito.Mockito.verify;
55-
import static org.mockito.Mockito.verifyZeroInteractions;
55+
import static org.mockito.Mockito.verifyNoInteractions;
5656
import static org.mockito.Mockito.when;
5757
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
5858
import static org.neo4j.driver.internal.util.Futures.failedFuture;
@@ -646,7 +646,7 @@ void nothingIsLoggedOnFatalFailure()
646646
throw new RuntimeException( "Fatal blocking" );
647647
} ) );
648648
assertEquals( "Fatal blocking", error.getMessage() );
649-
verifyZeroInteractions( logger );
649+
verifyNoInteractions( logger );
650650
}
651651

652652
@Test
@@ -662,7 +662,7 @@ void nothingIsLoggedOnFatalFailureAsync()
662662
await( logic.retryAsync( () -> failedFuture( new RuntimeException( "Fatal async" ) ) ) ) );
663663

664664
assertEquals( "Fatal async", error.getMessage() );
665-
verifyZeroInteractions( logger );
665+
verifyNoInteractions( logger );
666666
}
667667

668668
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.neo4j.driver.v1.stress;
2020

21-
import io.netty.util.internal.ConcurrentSet;
2221
import org.junit.jupiter.api.AfterEach;
2322
import org.junit.jupiter.api.BeforeEach;
2423
import org.junit.jupiter.api.Test;
@@ -35,6 +34,7 @@
3534
import java.util.Set;
3635
import java.util.concurrent.CompletableFuture;
3736
import java.util.concurrent.CompletionStage;
37+
import java.util.concurrent.ConcurrentHashMap;
3838
import java.util.concurrent.ExecutorService;
3939
import java.util.concurrent.Executors;
4040
import java.util.concurrent.Future;
@@ -623,7 +623,7 @@ private static class ResourcesInfo
623623
private static class LoggerNameTrackingLogging implements Logging
624624
{
625625
private final Logging consoleLogging = Logging.console( Level.FINE );
626-
private final Set<String> acquiredLoggerNames = new ConcurrentSet<>();
626+
private final Set<String> acquiredLoggerNames = ConcurrentHashMap.newKeySet();
627627

628628
@Override
629629
public Logger getLog( String name )

‎pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<maven.compiler.target>1.8</maven.compiler.target>
1111
<rootDir>${project.basedir}</rootDir>
1212
<surefire.and.failsafe.version>2.22.1</surefire.and.failsafe.version>
13-
<junit.version>5.4.0</junit.version>
13+
<junit.version>5.8.2</junit.version>
1414
<parallelizable.it.forkCount>1C</parallelizable.it.forkCount>
1515
<!-- All tests tagged are to be executed in parallel -->
1616
<parallelizable.it.tags>parallelizableIT</parallelizable.it.tags>
@@ -59,19 +59,19 @@
5959
<dependency>
6060
<groupId>io.netty</groupId>
6161
<artifactId>netty-handler</artifactId>
62-
<version>4.1.22.Final</version>
62+
<version>4.1.75.Final</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.hdrhistogram</groupId>
6666
<artifactId>HdrHistogram</artifactId>
67-
<version>2.1.10</version>
67+
<version>2.1.12</version>
6868
</dependency>
6969

7070
<!-- Optional dependencies -->
7171
<dependency>
7272
<groupId>org.slf4j</groupId>
7373
<artifactId>slf4j-api</artifactId>
74-
<version>1.7.25</version>
74+
<version>1.7.36</version>
7575
</dependency>
7676

7777
<!-- Test dependencies -->
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>org.mockito</groupId>
8686
<artifactId>mockito-core</artifactId>
87-
<version>2.18.3</version>
87+
<version>4.4.0</version>
8888
<scope>test</scope>
8989
</dependency>
9090
<dependency>
@@ -96,31 +96,31 @@
9696
<dependency>
9797
<groupId>org.rauschig</groupId>
9898
<artifactId>jarchivelib</artifactId>
99-
<version>0.7.1</version>
99+
<version>1.2.0</version>
100100
<scope>test</scope>
101101
</dependency>
102102
<dependency>
103103
<groupId>org.bouncycastle</groupId>
104104
<artifactId>bcprov-jdk15on</artifactId>
105-
<version>1.59</version>
105+
<version>1.70</version>
106106
<scope>test</scope>
107107
</dependency>
108108
<dependency>
109109
<groupId>org.bouncycastle</groupId>
110110
<artifactId>bcpkix-jdk15on</artifactId>
111-
<version>1.59</version>
111+
<version>1.70</version>
112112
<scope>test</scope>
113113
</dependency>
114114
<dependency>
115115
<groupId>com.fasterxml.jackson.core</groupId>
116116
<artifactId>jackson-databind</artifactId>
117-
<version>2.9.8</version>
117+
<version>2.13.2</version>
118118
<scope>test</scope>
119119
</dependency>
120120
<dependency>
121121
<groupId>ch.qos.logback</groupId>
122122
<artifactId>logback-classic</artifactId>
123-
<version>1.2.3</version>
123+
<version>1.2.11</version>
124124
<scope>test</scope>
125125
</dependency>
126126
</dependencies>

0 commit comments

Comments
 (0)