Skip to content

Commit 78a2467

Browse files
injectivesinjectives
authored
Update dependencies (#1368)
1 parent 8115a01 commit 78a2467

File tree

8 files changed

+31
-34
lines changed

8 files changed

+31
-34
lines changed

‎bundle/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@
6969
</goals>
7070
<configuration>
7171
<additionalOptions combine.children="append">
72-
<option>--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder</option>
73-
<option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver</option>
74-
<option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver</option>
72+
<option>--add-exports org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver</option>
7573
</additionalOptions>
7674
</configuration>
7775
</execution>

‎driver/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,7 @@
122122
<configuration>
123123
<compilerArgs combine.children="append">
124124
<arg>--add-exports</arg>
125-
<arg>jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder</arg>
126-
<arg>--add-exports</arg>
127-
<arg>org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver</arg>
128-
<arg>--add-exports</arg>
129-
<arg>org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver</arg>
125+
<arg>org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver</arg>
130126
</compilerArgs>
131127
</configuration>
132128
</plugin>
@@ -135,9 +131,7 @@
135131
<artifactId>maven-javadoc-plugin</artifactId>
136132
<configuration>
137133
<additionalOptions combine.children="append">
138-
<option>--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder</option>
139-
<option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver</option>
140-
<option>--add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver</option>
134+
<option>--add-exports org.graalvm.sdk/com.oracle.svm.core.annotate=org.neo4j.driver</option>
141135
</additionalOptions>
142136
</configuration>
143137
</plugin>

‎driver/src/main/java/module-info.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
requires transitive java.logging;
3939
requires transitive org.reactivestreams;
4040
requires static micrometer.core;
41-
requires static org.graalvm.nativeimage.builder;
41+
requires static org.graalvm.sdk;
4242
requires static org.slf4j;
43+
requires static java.management;
4344
}

‎driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import static org.mockito.Mockito.mock;
3535
import static org.mockito.Mockito.never;
3636
import static org.mockito.Mockito.only;
37+
import static org.mockito.Mockito.times;
3738
import static org.mockito.Mockito.verify;
3839
import static org.mockito.Mockito.when;
3940
import static org.neo4j.driver.Values.value;
@@ -365,24 +366,41 @@ void shouldCreateChannelActivityLoggerAndLogDebugMessageOnMessageHandling(Class<
365366
InboundMessageDispatcher dispatcher = new InboundMessageDispatcher(channel, logging);
366367
ResponseHandler handler = mock(ResponseHandler.class);
367368
dispatcher.enqueue(handler);
369+
Runnable loggerVerification = () -> {};
368370

369371
// WHEN
370372
if (SuccessMessage.class.isAssignableFrom(message)) {
371373
dispatcher.handleSuccessMessage(new HashMap<>());
374+
loggerVerification = () -> {
375+
verify(logger).isDebugEnabled();
376+
verify(logger).debug(anyString(), any(Map.class));
377+
};
372378
} else if (FailureMessage.class.isAssignableFrom(message)) {
373379
dispatcher.handleFailureMessage(FAILURE_CODE, FAILURE_MESSAGE);
380+
loggerVerification = () -> {
381+
verify(logger).isDebugEnabled();
382+
verify(logger).debug(anyString(), anyString(), anyString());
383+
};
374384
} else if (RecordMessage.class.isAssignableFrom(message)) {
375385
dispatcher.handleRecordMessage(Values.values());
386+
loggerVerification = () -> {
387+
verify(logger, times(2)).isDebugEnabled();
388+
verify(logger).debug(anyString(), anyString());
389+
};
376390
} else if (IgnoredMessage.class.isAssignableFrom(message)) {
377391
dispatcher.handleIgnoredMessage();
392+
loggerVerification = () -> {
393+
verify(logger).isDebugEnabled();
394+
verify(logger).debug(anyString());
395+
};
378396
} else {
379397
fail("Unexpected message type parameter provided");
380398
}
381399

382400
// THEN
383401
assertTrue(dispatcher.getLog() instanceof ChannelActivityLogger);
384402
assertTrue(dispatcher.getErrorLog() instanceof ChannelErrorLogger);
385-
verify(logger).debug(anyString(), any(Object.class));
403+
loggerVerification.run();
386404
}
387405

388406
@Test

‎examples/LICENSES.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Apache Software License, Version 2.0
1313
Netty/Transport
1414
Netty/Transport/Native/Unix/Common
1515
Non-Blocking Reactive Foundation for the JVM
16-
RxJava
1716
------------------------------------------------------------------------------
1817

1918
Apache License

‎examples/NOTICE.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Apache Software License, Version 2.0
2828
Netty/Transport
2929
Netty/Transport/Native/Unix/Common
3030
Non-Blocking Reactive Foundation for the JVM
31-
RxJava
3231

3332
MIT No Attribution License
3433
reactive-streams

‎examples/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<groupId>io.projectreactor</groupId>
3535
<artifactId>reactor-core</artifactId>
3636
</dependency>
37-
<dependency>
38-
<groupId>io.reactivex.rxjava2</groupId>
39-
<artifactId>rxjava</artifactId>
40-
</dependency>
4137

4238
<!-- Test dependencies -->
4339
<dependency>

‎pom.xml‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,25 @@
3636
<!-- Please note that when updating this dependency -->
3737
<!-- (i.e. due to a security vulnerability or bug) that the -->
3838
<!-- corresponding server dependency also needs updating.-->
39-
<netty-bom.version>4.1.86.Final</netty-bom.version>
39+
<netty-bom.version>4.1.87.Final</netty-bom.version>
4040
<!-- Please note that when updating this dependency -->
4141
<!-- (i.e. due to a security vulnerability or bug) that the -->
4242
<!-- corresponding server dependency also needs updating.-->
43-
<reactor-bom.version>2020.0.26</reactor-bom.version>
44-
<rxjava.version>2.2.21</rxjava.version>
43+
<reactor-bom.version>2020.0.27</reactor-bom.version>
4544
<slf4j-api.version>1.7.36</slf4j-api.version>
4645
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
47-
<mockito-core.version>4.11.0</mockito-core.version>
48-
<junit.version>5.9.1</junit.version>
46+
<mockito-core.version>5.0.0</mockito-core.version>
47+
<junit.version>5.9.2</junit.version>
4948
<testng-engine.version>1.0.4</testng-engine.version>
5049
<jarchivelib.version>1.2.0</jarchivelib.version>
5150
<bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
5251
<logback-classic.version>1.4.5</logback-classic.version>
5352
<jackson.version>2.14.1</jackson.version>
5453
<lombok.version>1.18.24</lombok.version>
55-
<svm.version>22.2.0.1</svm.version>
56-
<micrometer.version>1.10.2</micrometer.version>
54+
<svm.version>22.3.1</svm.version>
55+
<micrometer.version>1.10.3</micrometer.version>
5756
<testcontainers.version>1.17.6</testcontainers.version>
58-
<build-resources.version>5.3.0</build-resources.version>
57+
<build-resources.version>5.4.0</build-resources.version>
5958
<!-- To be overwritten by child projects -->
6059
<moduleName/>
6160
</properties>
@@ -114,13 +113,6 @@
114113
<scope>import</scope>
115114
</dependency>
116115

117-
<!--Compile dependencies only used by Examples-->
118-
<dependency>
119-
<groupId>io.reactivex.rxjava2</groupId>
120-
<artifactId>rxjava</artifactId>
121-
<version>${rxjava.version}</version>
122-
</dependency>
123-
124116
<!-- Optional dependencies -->
125117
<dependency>
126118
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)