Remove Cypher-DSL module.

Also remove references in the documentation.
SDN/RX now has a dependency on the standalone Cypher-DSL project.

pom.xml

@@ -72,7 +72,6 @@
 	</developers>
 
 	<modules>
-		<module>neo4j-opencypher-dsl</module>
 		<module>spring-data-neo4j-rx</module>
 		<module>spring-data-neo4j-rx-spring-boot-starter-parent</module>
 		<module>examples/reactive-web</module>
@@ -92,6 +91,7 @@
 		<byte-buddy.version>1.10.9</byte-buddy.version>
 		<changelist>-SNAPSHOT</changelist>
 		<checkstyle.version>8.29</checkstyle.version>
+		<cypher-dsl.version>2020.0.0</cypher-dsl.version>
 		<flatten-maven-plugin.version>1.2.1</flatten-maven-plugin.version>
 		<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
 		<java.version>1.8</java.version>
@@ -168,6 +168,11 @@
 				<artifactId>rxjava</artifactId>
 				<version>${rxjava2.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.neo4j</groupId>
+				<artifactId>neo4j-cypher-dsl</artifactId>
+				<version>${cypher-dsl.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apiguardian</groupId>
 				<artifactId>apiguardian-api</artifactId>

spring-data-neo4j/pom.xml

@@ -36,11 +36,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.neo4j</groupId>
-			<artifactId>neo4j-opencypher-dsl</artifactId>
-			<version>${revision}${sha1}${changelist}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
@@ -84,6 +79,10 @@
 			<artifactId>r2dbc-h2</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.neo4j</groupId>
+			<artifactId>neo4j-cypher-dsl</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apiguardian</groupId>
 			<artifactId>apiguardian-api</artifactId>

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/DynamicLabels.java

@@ -26,9 +26,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.UnaryOperator;
 
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.Node;
-import org.neo4j.opencypherdsl.StatementBuilder.OngoingMatchAndUpdate;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.Node;
+import org.neo4j.cypherdsl.core.StatementBuilder.OngoingMatchAndUpdate;
 
 /**
  * Decorator for an ongoing update statement that removes obsolete dynamic labels and adds new ones.

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/NamedParameters.java

@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Cypher;
+import org.neo4j.cypherdsl.core.Cypher;
 
 /**
  * @author Michael J. Simons

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/Neo4jOperations.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.springframework.data.repository.NoResultException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/Neo4jTemplate.java

@@ -20,7 +20,7 @@ package org.neo4j.springframework.data.core;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.*;
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 
 import java.util.ArrayList;
@@ -36,10 +36,10 @@ import org.apiguardian.api.API;
 import org.neo4j.driver.exceptions.NoSuchRecordException;
 import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.driver.summary.SummaryCounters;
-import org.neo4j.opencypherdsl.Condition;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Statement;
-import org.neo4j.opencypherdsl.renderer.Renderer;
+import org.neo4j.cypherdsl.core.Condition;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Statement;
+import org.neo4j.cypherdsl.core.renderer.Renderer;
 import org.neo4j.springframework.data.core.Neo4jClient.RunnableSpecTightToDatabase;
 import org.neo4j.springframework.data.core.NestedRelationshipProcessingStateMachine.ProcessState;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/ReactiveNeo4jOperations.java

@@ -24,7 +24,7 @@ import reactor.core.publisher.Mono;
 import java.util.Map;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Statement;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 
 /**

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/ReactiveNeo4jTemplate.java

@@ -20,7 +20,7 @@ package org.neo4j.springframework.data.core;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.*;
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.core.DatabaseSelection.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 
@@ -41,10 +41,10 @@ import org.apiguardian.api.API;
 import org.neo4j.driver.exceptions.NoSuchRecordException;
 import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.driver.summary.SummaryCounters;
-import org.neo4j.opencypherdsl.Condition;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Statement;
-import org.neo4j.opencypherdsl.renderer.Renderer;
+import org.neo4j.cypherdsl.core.Condition;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Statement;
+import org.neo4j.cypherdsl.core.renderer.Renderer;
 import org.neo4j.springframework.data.core.NestedRelationshipProcessingStateMachine.ProcessState;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/RelationshipStatementHolder.java

@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
 import org.neo4j.springframework.data.core.schema.CypherGenerator;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/schema/Constants.java

@@ -21,8 +21,8 @@ package org.neo4j.springframework.data.core.schema;
 import static org.apiguardian.api.API.Status.*;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.SymbolicName;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.SymbolicName;
 
 /**
  * A pool of constants used in our Cypher generation. These constants may change without further notice.

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/schema/CypherGenerator.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.springframework.data.core.schema;
 
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 import static org.neo4j.springframework.data.core.schema.RelationshipDescription.*;
 
@@ -30,10 +30,10 @@ import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Node;
-import org.neo4j.opencypherdsl.Relationship;
-import org.neo4j.opencypherdsl.*;
-import org.neo4j.opencypherdsl.StatementBuilder.OngoingMatchAndUpdate;
+import org.neo4j.cypherdsl.core.Node;
+import org.neo4j.cypherdsl.core.Relationship;
+import org.neo4j.cypherdsl.core.*;
+import org.neo4j.cypherdsl.core.StatementBuilder.OngoingMatchAndUpdate;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentProperty;
 import org.springframework.data.mapping.MappingException;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/schema/IdDescription.java

@@ -18,15 +18,15 @@
  */
 package org.neo4j.springframework.data.core.schema;
 
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 
 import java.util.Optional;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Expression;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Node;
+import org.neo4j.cypherdsl.core.Expression;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Node;
 import org.springframework.data.util.Lazy;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/schema/NodeDescription.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Optional;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Expression;
+import org.neo4j.cypherdsl.core.Expression;
 import org.springframework.lang.Nullable;
 
 /**

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/query/CypherAdapterUtils.java

@@ -18,15 +18,15 @@
  */
 package org.neo4j.springframework.data.repository.query;
 
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 
 import java.util.function.Function;
 
 import org.apiguardian.api.API;
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.SortItem;
-import org.neo4j.opencypherdsl.StatementBuilder;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.SortItem;
+import org.neo4j.cypherdsl.core.StatementBuilder;
 import org.neo4j.springframework.data.core.schema.GraphPropertyDescription;
 import org.neo4j.springframework.data.core.schema.NodeDescription;
 import org.springframework.data.domain.Pageable;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/query/CypherQueryCreator.java

@@ -19,7 +19,7 @@
 package org.neo4j.springframework.data.repository.query;
 
 import static java.util.stream.Collectors.*;
-import static org.neo4j.opencypherdsl.Functions.*;
+import static org.neo4j.cypherdsl.core.Functions.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 import static org.neo4j.springframework.data.repository.query.CypherAdapterUtils.*;
 import static org.neo4j.springframework.data.repository.query.PartValidator.*;
@@ -37,9 +37,9 @@ import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 import org.neo4j.driver.types.Point;
-import org.neo4j.opencypherdsl.*;
-import org.neo4j.opencypherdsl.StatementBuilder.OngoingMatchAndReturnWithOrder;
-import org.neo4j.opencypherdsl.renderer.Renderer;
+import org.neo4j.cypherdsl.core.*;
+import org.neo4j.cypherdsl.core.StatementBuilder.OngoingMatchAndReturnWithOrder;
+import org.neo4j.cypherdsl.core.renderer.Renderer;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentProperty;
 import org.neo4j.springframework.data.core.schema.CypherGenerator;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/support/Predicate.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.springframework.data.repository.support;
 
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.core.schema.Constants.*;
 
 import java.util.Collection;
@@ -30,11 +30,11 @@ import java.util.function.BiFunction;
 
 import org.apache.commons.logging.LogFactory;
 import org.neo4j.springframework.data.core.convert.Neo4jConverter;
-import org.neo4j.opencypherdsl.Condition;
-import org.neo4j.opencypherdsl.Conditions;
-import org.neo4j.opencypherdsl.Expression;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.StatementBuilder;
+import org.neo4j.cypherdsl.core.Condition;
+import org.neo4j.cypherdsl.core.Conditions;
+import org.neo4j.cypherdsl.core.Expression;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.StatementBuilder;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentProperty;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/support/SimpleNeo4jRepository.java

@@ -28,9 +28,9 @@ import java.util.stream.StreamSupport;
 
 import org.apiguardian.api.API;
 import org.neo4j.springframework.data.core.Neo4jOperations;
-import org.neo4j.opencypherdsl.Statement;
-import org.neo4j.opencypherdsl.StatementBuilder;
-import org.neo4j.opencypherdsl.StatementBuilder.OngoingReadingAndReturn;
+import org.neo4j.cypherdsl.core.Statement;
+import org.neo4j.cypherdsl.core.StatementBuilder;
+import org.neo4j.cypherdsl.core.StatementBuilder.OngoingReadingAndReturn;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
 import org.neo4j.springframework.data.core.schema.CypherGenerator;
 import org.springframework.data.domain.Page;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/support/SimpleQueryByExampleExecutor.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.springframework.data.repository.support;
 
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.repository.query.CypherAdapterUtils.*;
 
 import java.util.List;
@@ -26,10 +26,10 @@ import java.util.Optional;
 import java.util.function.LongSupplier;
 
 import org.neo4j.springframework.data.core.Neo4jOperations;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Statement;
-import org.neo4j.opencypherdsl.StatementBuilder;
-import org.neo4j.opencypherdsl.StatementBuilder.BuildableStatement;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Statement;
+import org.neo4j.cypherdsl.core.StatementBuilder;
+import org.neo4j.cypherdsl.core.StatementBuilder.BuildableStatement;
 import org.neo4j.springframework.data.core.schema.CypherGenerator;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.springframework.data.domain.Example;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/support/SimpleReactiveNeo4jRepository.java

@@ -29,7 +29,7 @@ import java.util.stream.StreamSupport;
 
 import org.apiguardian.api.API;
 import org.neo4j.springframework.data.core.ReactiveNeo4jOperations;
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
 import org.neo4j.springframework.data.core.schema.CypherGenerator;
 import org.reactivestreams.Publisher;

spring-data-neo4j/src/main/java/org/neo4j/springframework/data/repository/support/SimpleReactiveQueryByExampleExecutor.java

@@ -18,14 +18,14 @@
  */
 package org.neo4j.springframework.data.repository.support;
 
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.repository.query.CypherAdapterUtils.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.springframework.data.core.ReactiveNeo4jOperations;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.neo4j.springframework.data.core.schema.CypherGenerator;

spring-data-neo4j/src/test/java/org/neo4j/springframework/data/core/schema/CypherGeneratorTest.java

@@ -21,8 +21,8 @@ package org.neo4j.springframework.data.core.schema;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-import org.neo4j.opencypherdsl.Statement;
-import org.neo4j.opencypherdsl.renderer.Renderer;
+import org.neo4j.cypherdsl.core.Statement;
+import org.neo4j.cypherdsl.core.renderer.Renderer;
 import org.neo4j.springframework.data.core.mapping.Neo4jMappingContext;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentEntity;
 import org.neo4j.springframework.data.core.mapping.Neo4jPersistentProperty;

spring-data-neo4j/src/test/java/org/neo4j/springframework/data/integration/imperative/DynamicLabelsIT.java

@@ -19,9 +19,9 @@
 package org.neo4j.springframework.data.integration.imperative;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.neo4j.opencypherdsl.Conditions.not;
-import static org.neo4j.opencypherdsl.Cypher.*;
-import static org.neo4j.opencypherdsl.Predicates.*;
+import static org.neo4j.cypherdsl.core.Conditions.not;
+import static org.neo4j.cypherdsl.core.Cypher.*;
+import static org.neo4j.cypherdsl.core.Predicates.*;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -38,10 +38,10 @@ import org.neo4j.driver.Record;
 import org.neo4j.driver.Session;
 import org.neo4j.driver.Transaction;
 import org.neo4j.driver.Value;
-import org.neo4j.opencypherdsl.Condition;
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.Node;
-import org.neo4j.opencypherdsl.renderer.Renderer;
+import org.neo4j.cypherdsl.core.Condition;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.Node;
+import org.neo4j.cypherdsl.core.renderer.Renderer;
 import org.neo4j.springframework.data.config.AbstractNeo4jConfig;
 import org.neo4j.springframework.data.core.Neo4jTemplate;
 import org.neo4j.springframework.data.integration.shared.EntitiesWithDynamicLabels.*;

spring-data-neo4j/src/test/java/org/neo4j/springframework/data/integration/imperative/Neo4jOperationsIT.java

@@ -41,10 +41,10 @@ import org.neo4j.driver.Value;
 import org.neo4j.driver.Values;
 import org.neo4j.springframework.data.config.AbstractNeo4jConfig;
 import org.neo4j.springframework.data.core.Neo4jOperations;
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Node;
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Node;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.springframework.data.integration.shared.PersonWithAllConstructor;
 import org.neo4j.springframework.data.integration.shared.ThingWithGeneratedId;
 import org.neo4j.springframework.data.test.Neo4jExtension.Neo4jConnectionSupport;

spring-data-neo4j/src/test/java/org/neo4j/springframework/data/integration/reactive/ReactiveDynamicLabelsIT.java

@@ -19,8 +19,8 @@
 package org.neo4j.springframework.data.integration.reactive;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.neo4j.opencypherdsl.Conditions.not;
-import static org.neo4j.opencypherdsl.Predicates.*;
+import static org.neo4j.cypherdsl.core.Conditions.not;
+import static org.neo4j.cypherdsl.core.Predicates.*;
 import static org.neo4j.springframework.data.test.Neo4jExtension.*;
 
 import reactor.core.publisher.Flux;
@@ -41,10 +41,10 @@ import org.neo4j.driver.Record;
 import org.neo4j.driver.Session;
 import org.neo4j.driver.Transaction;
 import org.neo4j.driver.reactive.RxSession;
-import org.neo4j.opencypherdsl.Condition;
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.Node;
-import org.neo4j.opencypherdsl.renderer.Renderer;
+import org.neo4j.cypherdsl.core.Condition;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.Node;
+import org.neo4j.cypherdsl.core.renderer.Renderer;
 import org.neo4j.springframework.data.config.AbstractReactiveNeo4jConfig;
 import org.neo4j.springframework.data.core.ReactiveNeo4jTemplate;
 import org.neo4j.springframework.data.integration.shared.EntitiesWithDynamicLabels.*;

spring-data-neo4j/src/test/java/org/neo4j/springframework/data/integration/reactive/ReactiveNeo4jOperationsIT.java

@@ -20,7 +20,7 @@ package org.neo4j.springframework.data.integration.reactive;
 
 import static java.util.Collections.*;
 import static org.assertj.core.api.Assertions.*;
-import static org.neo4j.opencypherdsl.Cypher.*;
+import static org.neo4j.cypherdsl.core.Cypher.*;
 import static org.neo4j.springframework.data.test.Neo4jExtension.*;
 
 import reactor.test.StepVerifier;
@@ -46,10 +46,10 @@ import org.neo4j.driver.Value;
 import org.neo4j.driver.Values;
 import org.neo4j.springframework.data.config.AbstractReactiveNeo4jConfig;
 import org.neo4j.springframework.data.core.ReactiveNeo4jOperations;
-import org.neo4j.opencypherdsl.Cypher;
-import org.neo4j.opencypherdsl.Functions;
-import org.neo4j.opencypherdsl.Node;
-import org.neo4j.opencypherdsl.Statement;
+import org.neo4j.cypherdsl.core.Cypher;
+import org.neo4j.cypherdsl.core.Functions;
+import org.neo4j.cypherdsl.core.Node;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.springframework.data.integration.shared.PersonWithAllConstructor;
 import org.neo4j.springframework.data.integration.shared.ThingWithGeneratedId;
 import org.neo4j.springframework.data.test.Neo4jIntegrationTest;