From 2459be7cb7059eaae494efbb469df7121381c435 Mon Sep 17 00:00:00 2001 From: yuval Date: Mon, 27 May 2024 11:04:28 +0200 Subject: [PATCH 1/6] bump to 2.6.8 --- gradle/version.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/version.gradle b/gradle/version.gradle index e0a7f24a86..312197e541 100644 --- a/gradle/version.gradle +++ b/gradle/version.gradle @@ -1,5 +1,5 @@ ext { - gdsBaseVersion = '2.6.7' + gdsBaseVersion = '2.6.8' gdsAuraVersion = '61' gdsVersion = gdsBaseVersion + (rootProject.hasProperty('aurads') ? "+${gdsAuraVersion}" : "") } From 17af36ae467a6a76f49e61a821f3d66a36583737 Mon Sep 17 00:00:00 2001 From: yuval Date: Mon, 27 May 2024 11:10:40 +0200 Subject: [PATCH 2/6] update maven coords to 2.6.7 --- README.adoc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.adoc b/README.adoc index 7b97182295..6c54b3bfcc 100644 --- a/README.adoc +++ b/README.adoc @@ -82,7 +82,7 @@ For the most basic set of features, like graph loading and the graph representat org.neo4j.gds core - 2.6.6 + 2.6.7 ---- @@ -94,21 +94,21 @@ The algorithms are located in the `algo-common`, `algo` and `alpha-algo` modules org.neo4j.gds algo-common - 2.6.6 + 2.6.7 org.neo4j.gds algo - 2.6.6 + 2.6.7 org.neo4j.gds alpha-algo - 2.6.6 + 2.6.7 ---- @@ -120,28 +120,28 @@ The procedures are located in the `proc-common`, `proc` and `alpha-proc` modules org.neo4j.gds proc-common - 2.6.6 + 2.6.7 org.neo4j.gds proc - 2.6.6 + 2.6.7 org.neo4j.gds alpha-proc - 2.6.6 + 2.6.7 org.neo4j.gds open-write-services - 2.6.6 + 2.6.7 ---- From 2f40c6438b9275cf533b5c96eab141538cc1bf57 Mon Sep 17 00:00:00 2001 From: yuval Date: Mon, 27 May 2024 11:11:16 +0200 Subject: [PATCH 3/6] update pregel to use 2.6.7 --- examples/pregel-bootstrap/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pregel-bootstrap/build.gradle b/examples/pregel-bootstrap/build.gradle index 688eb96c90..99e1fd626a 100644 --- a/examples/pregel-bootstrap/build.gradle +++ b/examples/pregel-bootstrap/build.gradle @@ -7,7 +7,7 @@ plugins { ext { // Make sure these are the same as your installation of GDS and Neo4j - gdsVersion = '2.6.6' + gdsVersion = '2.6.7' neo4jVersion = '5.19.0' // Necessary to generate value classes for Pregel configs From 06ac75d8b524a1900407b2697e9e7a96eca61753 Mon Sep 17 00:00:00 2001 From: yuval Date: Mon, 27 May 2024 11:27:25 +0200 Subject: [PATCH 4/6] bump rc to 5.21 --- gradle/dependencies.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 7415fb1720..19ee6c9efc 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -28,6 +28,7 @@ ext { '5.18': '2.13.11', '5.19': '2.13.11', '5.20': '2.13.11', + '5.21': '2.13.11', ] log4js = [ @@ -42,6 +43,7 @@ ext { '5.18': '2.20.0', '5.19': '2.20.0', '5.20': '2.20.0', + '5.21': '2.20.0', ] shiros = [ @@ -56,6 +58,7 @@ ext { '5.18': '1.13.0', '5.19': '2.0.0', '5.20': '2.0.0', + '5.21': '2.0.0', ] ver = [ From b41f46a5288d6f535bbba13587d6c782bbe93c4f Mon Sep 17 00:00:00 2001 From: yuval Date: Mon, 27 May 2024 11:33:20 +0200 Subject: [PATCH 5/6] add 5.20 compat to public files --- README.adoc | 6 ++++-- build.gradle | 2 ++ .../ROOT/pages/installation/supported-neo4j-versions.adoc | 1 + settings.gradle | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 6c54b3bfcc..dabd1f3e88 100644 --- a/README.adoc +++ b/README.adoc @@ -26,9 +26,11 @@ When installing GDS manually, please refer to the below compatibility matrix: .Compatibility matrix |=== |GDS version | Neo4j version | Java Version -.9+<.^|GDS 2.6.x +.11+<.^|GDS 2.6.x +|Neo4j 5.20.0 +.8+.^|Java 21 & Java 17 +|Neo4j 5.19.0 |Neo4j 5.18.0, 5.18.1 -.6+.^|Java 21 & Java 17 |Neo4j 5.17.0 |Neo4j 5.16.0 |Neo4j 5.15.0 diff --git a/build.gradle b/build.gradle index 1ed936c58f..0a3507c4b6 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ ext { project(':neo4j-kernel-adapter-5.17'), project(':neo4j-kernel-adapter-5.18'), project(':neo4j-kernel-adapter-5.19'), + project(':neo4j-kernel-adapter-5.20'), ], 'storage-engine-adapter': [ project(':storage-engine-adapter-4.4'), @@ -44,6 +45,7 @@ ext { project(':storage-engine-adapter-5.17'), project(':storage-engine-adapter-5.18'), project(':storage-engine-adapter-5.19'), + project(':storage-engine-adapter-5.20'), ] ] } diff --git a/doc/modules/ROOT/pages/installation/supported-neo4j-versions.adoc b/doc/modules/ROOT/pages/installation/supported-neo4j-versions.adoc index 8c6d5bc38f..3c5217f3ee 100644 --- a/doc/modules/ROOT/pages/installation/supported-neo4j-versions.adoc +++ b/doc/modules/ROOT/pages/installation/supported-neo4j-versions.adoc @@ -10,6 +10,7 @@ If your version of GDS or Neo4j is not listed in the matrix, you should upgrade. [opts=header] |=== | Neo4j version | Neo4j Graph Data Science +| `5.20` | `2.7`, `2.6.7` or later | `5.19` | `2.7`, `2.6.5` or later | `5.18` | `2.7`, `2.6.2` or later | `5.17` | `2.7`, `2.6.1` or later diff --git a/settings.gradle b/settings.gradle index 329b640238..6b2e620d8d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -320,3 +320,8 @@ include('neo4j-kernel-adapter-5.19') project(':neo4j-kernel-adapter-5.19').projectDir = file('compatibility/5.19/neo4j-kernel-adapter') include('storage-engine-adapter-5.19') project(':storage-engine-adapter-5.19').projectDir = file('compatibility/5.19/storage-engine-adapter') + +include('neo4j-kernel-adapter-5.20') +project(':neo4j-kernel-adapter-5.20').projectDir = file('compatibility/5.20/neo4j-kernel-adapter') +include('storage-engine-adapter-5.20') +project(':storage-engine-adapter-5.20').projectDir = file('compatibility/5.20/storage-engine-adapter') From e040c249857141fffa5b4f4897e40457971d082c Mon Sep 17 00:00:00 2001 From: yuval Date: Tue, 28 May 2024 10:23:37 +0200 Subject: [PATCH 6/6] undo public 5.20 - neo4j problems on Maven Central --- build.gradle | 2 -- settings.gradle | 5 ----- 2 files changed, 7 deletions(-) diff --git a/build.gradle b/build.gradle index 0a3507c4b6..1ed936c58f 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,6 @@ ext { project(':neo4j-kernel-adapter-5.17'), project(':neo4j-kernel-adapter-5.18'), project(':neo4j-kernel-adapter-5.19'), - project(':neo4j-kernel-adapter-5.20'), ], 'storage-engine-adapter': [ project(':storage-engine-adapter-4.4'), @@ -45,7 +44,6 @@ ext { project(':storage-engine-adapter-5.17'), project(':storage-engine-adapter-5.18'), project(':storage-engine-adapter-5.19'), - project(':storage-engine-adapter-5.20'), ] ] } diff --git a/settings.gradle b/settings.gradle index 6b2e620d8d..329b640238 100644 --- a/settings.gradle +++ b/settings.gradle @@ -320,8 +320,3 @@ include('neo4j-kernel-adapter-5.19') project(':neo4j-kernel-adapter-5.19').projectDir = file('compatibility/5.19/neo4j-kernel-adapter') include('storage-engine-adapter-5.19') project(':storage-engine-adapter-5.19').projectDir = file('compatibility/5.19/storage-engine-adapter') - -include('neo4j-kernel-adapter-5.20') -project(':neo4j-kernel-adapter-5.20').projectDir = file('compatibility/5.20/neo4j-kernel-adapter') -include('storage-engine-adapter-5.20') -project(':storage-engine-adapter-5.20').projectDir = file('compatibility/5.20/storage-engine-adapter')