From 1a00179de42d7c07ecfb1852c94d02ce690db31c Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Wed, 28 May 2025 17:24:35 +0200
Subject: [PATCH] build: Fix version sniffing during tests for newer versions
 of Neo4j.

---
 pom.xml                                                       | 2 +-
 .../neo4j/integration/imperative/CausalClusterLoadTestIT.java | 2 +-
 .../integration/reactive/ReactiveCausalClusterLoadTestIT.java | 2 +-
 .../org/springframework/data/neo4j/test/Neo4jExtension.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index eaea7ca16..71f3ff6c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
 		<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
 		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<neo4j-java-driver.version>5.28.5</neo4j-java-driver.version>
-		<neo4j-migrations.version>2.15.2</neo4j-migrations.version>
+		<neo4j-migrations.version>2.17.3</neo4j-migrations.version>
 		<neo4j.version>4.4.41</neo4j.version>
 		<objenesis.version>3.0.1</objenesis.version>
 		<project.build.docs>${project.build.directory}/docs</project.build.docs>
diff --git a/src/test/java/org/springframework/data/neo4j/integration/imperative/CausalClusterLoadTestIT.java b/src/test/java/org/springframework/data/neo4j/integration/imperative/CausalClusterLoadTestIT.java
index 139a67204..91c4af7a3 100644
--- a/src/test/java/org/springframework/data/neo4j/integration/imperative/CausalClusterLoadTestIT.java
+++ b/src/test/java/org/springframework/data/neo4j/integration/imperative/CausalClusterLoadTestIT.java
@@ -145,7 +145,7 @@ class CausalClusterLoadTestIT {
 		public boolean isCypher5Compatible() {
 			try (Session session = driver().session()) {
 				String version = session
-						.run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version")
+						.run("CALL dbms.components() YIELD name, versions WHERE name = 'Neo4j Kernel' RETURN 'Neo4j/' + versions[0] as version")
 						.single()
 						.get("version").asString();
 
diff --git a/src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveCausalClusterLoadTestIT.java b/src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveCausalClusterLoadTestIT.java
index 4123dfe9a..f7e44c548 100644
--- a/src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveCausalClusterLoadTestIT.java
+++ b/src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveCausalClusterLoadTestIT.java
@@ -152,7 +152,7 @@ class ReactiveCausalClusterLoadTestIT {
 		public boolean isCypher5Compatible() {
 			try (Session session = driver().session()) {
 				String version = session
-						.run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version")
+						.run("CALL dbms.components() YIELD name, versions WHERE name = 'Neo4j Kernel' RETURN 'Neo4j/' + versions[0] as version")
 						.single()
 						.get("version").asString();
 
diff --git a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
index cb33dfd09..f1710f460 100644
--- a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
+++ b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
@@ -260,7 +260,7 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
 					if (serverVersion == null) {
 						String versionString = "";
 						try (Session session = this.getDriver().session()) {
-							Record result = session.run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version").single();
+							Record result = session.run("CALL dbms.components() YIELD name, versions WHERE name = 'Neo4j Kernel' RETURN 'Neo4j/' + versions[0] as version").single();
 							versionString = result.get("version").asString();
 							this.cachedServerVersion = ServerVersion.version(versionString);
 						} catch (Exception e) {
@@ -282,7 +282,7 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
 			String edition;
 			SessionConfig sessionConfig = SessionConfig.builder().withDefaultAccessMode(AccessMode.READ).build();
 			try (Session session = getDriver().session(sessionConfig)) {
-				edition = session.run("call dbms.components() yield edition").single().get("edition").asString();
+				edition = session.run("CALL dbms.components() YIELD name, edition WHERE name = 'Neo4j Kernel' RETURN edition").single().get("edition").asString();
 			}
 			return edition.toLowerCase(Locale.ENGLISH);
 		}