From 78a24673229c54e83b8b4f1cd1df2de22b10e91b Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <11927660+injectives@users.noreply.github.com>
Date: Fri, 27 Jan 2023 10:13:36 +0000
Subject: [PATCH] Update dependencies (#1368)
---
bundle/pom.xml | 4 +---
driver/pom.xml | 10 ++-------
driver/src/main/java/module-info.java | 3 ++-
.../inbound/InboundMessageDispatcherTest.java | 20 ++++++++++++++++-
examples/LICENSES.txt | 1 -
examples/NOTICE.txt | 1 -
examples/pom.xml | 4 ----
pom.xml | 22 ++++++-------------
8 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/bundle/pom.xml b/bundle/pom.xml
index cb41f3ec1c..5a601499db 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -69,9 +69,7 @@
-
-
-
+
diff --git a/driver/pom.xml b/driver/pom.xml
index e4b8670932..62192ed510 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -122,11 +122,7 @@
--add-exports
- jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder
- --add-exports
- org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver
- --add-exports
- org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver
+ org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver
@@ -135,9 +131,7 @@
maven-javadoc-plugin
-
-
-
+
diff --git a/driver/src/main/java/module-info.java b/driver/src/main/java/module-info.java
index ba5b0b1ce9..51c7453da9 100644
--- a/driver/src/main/java/module-info.java
+++ b/driver/src/main/java/module-info.java
@@ -38,6 +38,7 @@
requires transitive java.logging;
requires transitive org.reactivestreams;
requires static micrometer.core;
- requires static org.graalvm.nativeimage.builder;
+ requires static org.graalvm.sdk;
requires static org.slf4j;
+ requires static java.management;
}
diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java
index 99496b93e5..5166b5e8d4 100644
--- a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java
+++ b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java
@@ -34,6 +34,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.only;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.neo4j.driver.Values.value;
@@ -365,16 +366,33 @@ void shouldCreateChannelActivityLoggerAndLogDebugMessageOnMessageHandling(Class<
InboundMessageDispatcher dispatcher = new InboundMessageDispatcher(channel, logging);
ResponseHandler handler = mock(ResponseHandler.class);
dispatcher.enqueue(handler);
+ Runnable loggerVerification = () -> {};
// WHEN
if (SuccessMessage.class.isAssignableFrom(message)) {
dispatcher.handleSuccessMessage(new HashMap<>());
+ loggerVerification = () -> {
+ verify(logger).isDebugEnabled();
+ verify(logger).debug(anyString(), any(Map.class));
+ };
} else if (FailureMessage.class.isAssignableFrom(message)) {
dispatcher.handleFailureMessage(FAILURE_CODE, FAILURE_MESSAGE);
+ loggerVerification = () -> {
+ verify(logger).isDebugEnabled();
+ verify(logger).debug(anyString(), anyString(), anyString());
+ };
} else if (RecordMessage.class.isAssignableFrom(message)) {
dispatcher.handleRecordMessage(Values.values());
+ loggerVerification = () -> {
+ verify(logger, times(2)).isDebugEnabled();
+ verify(logger).debug(anyString(), anyString());
+ };
} else if (IgnoredMessage.class.isAssignableFrom(message)) {
dispatcher.handleIgnoredMessage();
+ loggerVerification = () -> {
+ verify(logger).isDebugEnabled();
+ verify(logger).debug(anyString());
+ };
} else {
fail("Unexpected message type parameter provided");
}
@@ -382,7 +400,7 @@ void shouldCreateChannelActivityLoggerAndLogDebugMessageOnMessageHandling(Class<
// THEN
assertTrue(dispatcher.getLog() instanceof ChannelActivityLogger);
assertTrue(dispatcher.getErrorLog() instanceof ChannelErrorLogger);
- verify(logger).debug(anyString(), any(Object.class));
+ loggerVerification.run();
}
@Test
diff --git a/examples/LICENSES.txt b/examples/LICENSES.txt
index f486f441d4..f33622e81c 100644
--- a/examples/LICENSES.txt
+++ b/examples/LICENSES.txt
@@ -13,7 +13,6 @@ Apache Software License, Version 2.0
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM
- RxJava
------------------------------------------------------------------------------
Apache License
diff --git a/examples/NOTICE.txt b/examples/NOTICE.txt
index a32379b76c..54dc44c3a6 100644
--- a/examples/NOTICE.txt
+++ b/examples/NOTICE.txt
@@ -28,7 +28,6 @@ Apache Software License, Version 2.0
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM
- RxJava
MIT No Attribution License
reactive-streams
diff --git a/examples/pom.xml b/examples/pom.xml
index e130760ac9..ac37578d78 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,10 +34,6 @@
io.projectreactor
reactor-core
-
- io.reactivex.rxjava2
- rxjava
-
diff --git a/pom.xml b/pom.xml
index 6b85a487cd..e3e4c44d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,26 +36,25 @@
- 4.1.86.Final
+ 4.1.87.Final
- 2020.0.26
- 2.2.21
+ 2020.0.27
1.7.36
2.0.0.0
- 4.11.0
- 5.9.1
+ 5.0.0
+ 5.9.2
1.0.4
1.2.0
1.70
1.4.5
2.14.1
1.18.24
- 22.2.0.1
- 1.10.2
+ 22.3.1
+ 1.10.3
1.17.6
- 5.3.0
+ 5.4.0
@@ -114,13 +113,6 @@
import
-
-
- io.reactivex.rxjava2
- rxjava
- ${rxjava.version}
-
-
org.slf4j