Skip to content

Update dependencies #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 2 additions & 8 deletions driver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion driver/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion examples/LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion examples/NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 7 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down