Update dependencies

neo4j · Jan 26, 2023 · b6ea28a · b6ea28a
1 parent 8115a01
commit b6ea28a
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 34 deletions.
diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -69,9 +69,7 @@
               </goals>
               <configuration>
                 <additionalOptions combine.children="append">
-                  <option>--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder</option>
-                  <option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver</option>
-                  <option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver</option>
+                  <option>--add-exports org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver</option>
                 </additionalOptions>
               </configuration>
             </execution>

diff --git a/driver/pom.xml b/driver/pom.xml
@@ -122,11 +122,7 @@
           <configuration>
             <compilerArgs combine.children="append">
               <arg>--add-exports</arg>
-              <arg>jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder</arg>
-              <arg>--add-exports</arg>
-              <arg>org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver</arg>
-              <arg>--add-exports</arg>
-              <arg>org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver</arg>
+              <arg>org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver</arg>
             </compilerArgs>
           </configuration>
         </plugin>
@@ -135,9 +131,7 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
             <additionalOptions combine.children="append">
-              <option>--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder</option>
-              <option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver</option>
-              <option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver</option>
+              <option>--add-exports org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver</option>
             </additionalOptions>
           </configuration>
         </plugin>

diff --git 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/...r/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java b/...r/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,24 +366,41 @@ 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");
         }
 
         // 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
@@ -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
@@ -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
@@ -34,10 +34,6 @@
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -36,26 +36,25 @@
     <!-- Please note that when updating this dependency -->
     <!-- (i.e. due to a security vulnerability or bug) that the -->
     <!-- corresponding server dependency also needs updating.-->
-    <netty-bom.version>4.1.86.Final</netty-bom.version>
+    <netty-bom.version>4.1.87.Final</netty-bom.version>
     <!-- Please note that when updating this dependency -->
     <!-- (i.e. due to a security vulnerability or bug) that the -->
     <!-- corresponding server dependency also needs updating.-->
-    <reactor-bom.version>2020.0.26</reactor-bom.version>
-    <rxjava.version>2.2.21</rxjava.version>
+    <reactor-bom.version>2020.0.27</reactor-bom.version>
     <slf4j-api.version>1.7.36</slf4j-api.version>
     <hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
-    <mockito-core.version>4.11.0</mockito-core.version>
-    <junit.version>5.9.1</junit.version>
+    <mockito-core.version>5.0.0</mockito-core.version>
+    <junit.version>5.9.2</junit.version>
     <testng-engine.version>1.0.4</testng-engine.version>
     <jarchivelib.version>1.2.0</jarchivelib.version>
     <bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
     <logback-classic.version>1.4.5</logback-classic.version>
     <jackson.version>2.14.1</jackson.version>
     <lombok.version>1.18.24</lombok.version>
-    <svm.version>22.2.0.1</svm.version>
-    <micrometer.version>1.10.2</micrometer.version>
+    <svm.version>22.3.1</svm.version>
+    <micrometer.version>1.10.3</micrometer.version>
     <testcontainers.version>1.17.6</testcontainers.version>
-    <build-resources.version>5.3.0</build-resources.version>
+    <build-resources.version>5.4.0</build-resources.version>
     <!-- To be overwritten by child projects -->
     <moduleName/>
   </properties>
@@ -114,13 +113,6 @@
         <scope>import</scope>
       </dependency>
 
-      <!--Compile dependencies only used by Examples-->
-      <dependency>
-        <groupId>io.reactivex.rxjava2</groupId>
-        <artifactId>rxjava</artifactId>
-        <version>${rxjava.version}</version>
-      </dependency>
-
       <!-- Optional dependencies -->
       <dependency>
         <groupId>org.slf4j</groupId>