Skip to content
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

chore(deps): upgrade neo4j to 4.4.x #6101

Merged
merged 3 commits into from
Oct 3, 2022
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
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ buildscript {
ext.mavenVersion = '3.6.3'
ext.springVersion = '5.3.20'
ext.springBootVersion = '2.5.12'
ext.neo4jVersion = '4.4.9'
ext.graphQLJavaVersion = '19.0'
apply from: './repositories.gradle'
buildscript.repositories.addAll(project.repositories)
Expand Down Expand Up @@ -111,8 +112,8 @@ project.ext.externalDependency = [
'mockServer': 'org.mock-server:mockserver-netty:5.11.2',
'mockServerClient': 'org.mock-server:mockserver-client-java:5.11.2',
'mysqlConnector': 'mysql:mysql-connector-java:8.0.20',
'neo4jHarness': 'org.neo4j.test:neo4j-harness:3.4.11',
'neo4jJavaDriver': 'org.neo4j.driver:neo4j-java-driver:4.0.1',
'neo4jHarness': 'org.neo4j.test:neo4j-harness:' + neo4jVersion,
'neo4jJavaDriver': 'org.neo4j.driver:neo4j-java-driver:' + neo4jVersion,
'opentelemetryApi': 'io.opentelemetry:opentelemetry-api:1.0.0',
'opentelemetryAnnotations': 'io.opentelemetry:opentelemetry-extension-annotations:1.0.0',
'opentracingJdbc':'io.opentracing.contrib:opentracing-jdbc:0.2.15',
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ services:
retries: 4

neo4j:
image: neo4j:4.0.6
image: neo4j:4.4.9-community
env_file: neo4j/env/docker.env
hostname: neo4j
container_name: neo4j
Expand Down
2 changes: 1 addition & 1 deletion docker/quickstart/docker-compose.quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ services:
- NEO4J_dbms_default__database=graph.db
- NEO4J_dbms_allow__upgrade=true
hostname: neo4j
image: neo4j:4.0.6
image: neo4j:4.4.9-community
ports:
- ${DATAHUB_MAPPED_NEO4J_HTTP_PORT:-7474}:7474
- ${DATAHUB_MAPPED_NEO4J_BOLT_PORT:-7687}:7687
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,30 @@
import java.io.File;
import java.net.URI;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.harness.ServerControls;
import org.neo4j.harness.TestServerBuilder;
import org.neo4j.harness.TestServerBuilders;

import org.neo4j.harness.Neo4j;
import org.neo4j.harness.Neo4jBuilder;
import org.neo4j.harness.internal.InProcessNeo4jBuilder;

public class Neo4jTestServerBuilder {

private final TestServerBuilder builder;
private ServerControls controls;
private final Neo4jBuilder builder;
private Neo4j controls;

private Neo4jTestServerBuilder(TestServerBuilder builder) {
private Neo4jTestServerBuilder(Neo4jBuilder builder) {
this.builder = builder;
}

public Neo4jTestServerBuilder() {
this(TestServerBuilders.newInProcessBuilder());
this(new InProcessNeo4jBuilder());
}

public Neo4jTestServerBuilder(File workingDirectory) {
this(TestServerBuilders.newInProcessBuilder(workingDirectory));
this(new InProcessNeo4jBuilder(workingDirectory.toPath()));
}

public ServerControls newServer() {
public Neo4j newServer() {
if (controls == null) {
controls = builder.newServer();
controls = builder.build();
}
return controls;
}
Expand Down Expand Up @@ -61,6 +60,6 @@ public URI httpsURI() {
}

public GraphDatabaseService getGraphDatabaseService() {
return controls.graph();
return controls.defaultDatabaseService();
}
}