Commit 1a00179

committed

build: Fix version sniffing during tests for newer versions of Neo4j.

1 parent 152106e commit 1a00179Copy full SHA for 1a00179

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@`
`97`	`97`	`<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>`
`98`	`98`	`<maven.compiler.release>${java.version}</maven.compiler.release>`
`99`	`99`	`<neo4j-java-driver.version>5.28.5</neo4j-java-driver.version>`
`100`		`- <neo4j-migrations.version>2.15.2</neo4j-migrations.version>`
	`100`	`+ <neo4j-migrations.version>2.17.3</neo4j-migrations.version>`
`101`	`101`	`<neo4j.version>4.4.41</neo4j.version>`
`102`	`102`	`<objenesis.version>3.0.1</objenesis.version>`
`103`	`103`	`<project.build.docs>${project.build.directory}/docs</project.build.docs>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public ThingService thingService(Neo4jClient neo4jClient, ThingRepository thingR`
`145`	`145`	`public boolean isCypher5Compatible() {`
`146`	`146`	`try (Session session = driver().session()) {`
`147`	`147`	`String version = session`
`148`		`- .run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version")`
	`148`	`+ .run("CALL dbms.components() YIELD name, versions WHERE name = 'Neo4j Kernel' RETURN 'Neo4j/' + versions[0] as version")`
`149`	`149`	`.single()`
`150`	`150`	`.get("version").asString();`
`151`	`151`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public ThingService thingService(ReactiveNeo4jClient neo4jClient, ThingRepositor`
`152`	`152`	`public boolean isCypher5Compatible() {`
`153`	`153`	`try (Session session = driver().session()) {`
`154`	`154`	`String version = session`
`155`		`- .run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version")`
	`155`	`+ .run("CALL dbms.components() YIELD name, versions WHERE name = 'Neo4j Kernel' RETURN 'Neo4j/' + versions[0] as version")`
`156`	`156`	`.single()`
`157`	`157`	`.get("version").asString();`
`158`	`158`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public ServerVersion getServerVersion() {`
`260`	`260`	`if (serverVersion == null) {`
`261`	`261`	`String versionString = "";`
`262`	`262`	`try (Session session = this.getDriver().session()) {`
`263`		`- Record result = session.run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version").single();`
	`263`	`+ Record result = session.run("CALL dbms.components() YIELD name, versions WHERE name = 'Neo4j Kernel' RETURN 'Neo4j/' + versions[0] as version").single();`
`264`	`264`	`versionString = result.get("version").asString();`
`265`	`265`	`this.cachedServerVersion = ServerVersion.version(versionString);`
`266`	`266`	`} catch (Exception e) {`
`@@ -282,7 +282,7 @@ String getEdition() {`
`282`	`282`	`String edition;`
`283`	`283`	`SessionConfig sessionConfig = SessionConfig.builder().withDefaultAccessMode(AccessMode.READ).build();`
`284`	`284`	`try (Session session = getDriver().session(sessionConfig)) {`
`285`		`- edition = session.run("call dbms.components() yield edition").single().get("edition").asString();`
	`285`	`+ edition = session.run("CALL dbms.components() YIELD name, edition WHERE name = 'Neo4j Kernel' RETURN edition").single().get("edition").asString();`
`286`	`286`	`}`
`287`	`287`	`return edition.toLowerCase(Locale.ENGLISH);`
`288`	`288`	`}`

Comments

(0)