Skip to content

Commit d1ae4d7

Browse files
committed
fixup! Add selectable open graph data science plugin
1 parent 0c8ae21 commit d1ae4d7

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

renovate.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@
6666
"depNameTemplate": "neo4j/graph-data-science",
6767
"datasourceTemplate": "github-releases"
6868
},
69+
{
70+
"fileMatch": [
71+
"^scripts\/profiles\/Neo4jv5\\.sh$",
72+
"^scripts\/profiles\/Default\\.sh$",
73+
"^scripts\/[^\/]*\\.sh$"
74+
],
75+
"matchStrings": [
76+
"NEO4J_OPEN_GDS_PLUGIN_VERSION:-\\\"?(?<currentValue>.*?)\\\""
77+
],
78+
"depNameTemplate": "JohT/open-graph-data-science-packaging",
79+
"datasourceTemplate": "github-releases"
80+
},
6981
{
7082
"fileMatch": [
7183
"^scripts\/profiles\/Neo4jv5\\.sh$",

scripts/profiles/Neo4jv4.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ NEO4J_APOC_PLUGIN_EDITION=${NEO4J_APOC_PLUGIN_EDITION:-"all"} # Since Neo4j v5 o
1818
NEO4J_APOC_PLUGIN_GITHUB=${NEO4J_APOC_PLUGIN_GITHUB:-"neo4j-contrib/neo4j-apoc-procedures"} # Location for the old plugins compatible to Neo4j v4
1919

2020
NEO4J_GDS_PLUGIN_VERSION=${NEO4J_GDS_PLUGIN_VERSION:-"2.3.4"} # Graph Data Science Plugin Version 2.3.x is compatible with Neo4j 4.4.x
21+
NEO4J_GDS_PLUGIN_EDITION=${NEO4J_GDS_PLUGIN_EDITION:-"full"} # Graph Data Science Plugin Edition: "open" for OpenGDS, "full" for the full version with Neo4j license
2122

2223
JQASSISTANT_CLI_VERSION=${JQASSISTANT_CLI_VERSION:-"1.12.2"} # Version 1.12.2 is the newest version (may 2023) compatible with Neo4j v4
2324
JQASSISTANT_CLI_ARTIFACT=${JQASSISTANT_CLI_ARTIFACT:-"jqassistant-commandline-neo4jv3"} # For Neo4j v3 & 4: "jqassistant-commandline-neo4jv3"

scripts/profiles/Neo4jv5.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ NEO4J_APOC_PLUGIN_EDITION=${NEO4J_APOC_PLUGIN_EDITION:-"core"} # Since Neo4j v5
1818
NEO4J_APOC_PLUGIN_GITHUB=${NEO4J_APOC_PLUGIN_GITHUB:-"neo4j/apoc"} # Core edition was moved to "neo4j/apoc" for Neo4j v5
1919

2020
NEO4J_GDS_PLUGIN_VERSION=${NEO4J_GDS_PLUGIN_VERSION:-"2.4.1"} # Version 2.4.0 is the newest version of june 2023 and compatible with Neo4j v5
21+
NEO4J_OPEN_GDS_PLUGIN_VERSION=${NEO4J_OPEN_GDS_PLUGIN_VERSION:-"2.4.1"} # Graph Data Science Plugin Version 2.4.x of is compatible with Neo4j 5.x
22+
NEO4J_GDS_PLUGIN_EDITION=${NEO4J_GDS_PLUGIN_EDITION:-"open"} # Graph Data Science Plugin Edition: "open" for OpenGDS, "full" for the full version with Neo4j license
2123

2224
JQASSISTANT_CLI_VERSION=${JQASSISTANT_CLI_VERSION:-"2.0.4"} # Version 2.0.3 is the newest version (june 2023) compatible with Neo4j v5
2325
JQASSISTANT_CLI_ARTIFACT=${JQASSISTANT_CLI_ARTIFACT:-"jqassistant-commandline-distribution"} # Since jQAssistant CLI v2: "jqassistant-commandline-distribution"

scripts/setupNeo4j.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ NEO4J_APOC_PLUGIN_VERSION=${NEO4J_APOC_PLUGIN_VERSION:-"5.9.0"} #Awesome Procedu
1212
NEO4J_APOC_PLUGIN_EDITION=${NEO4J_APOC_PLUGIN_EDITION:-"core"} #Awesome Procedures for Neo4j Plugin Edition (Neo4j v4.4.x "all", Neo4j >= v5 "core")
1313
NEO4J_APOC_PLUGIN_GITHUB=${NEO4J_APOC_PLUGIN_GITHUB:-"neo4j/apoc"} #Awesome Procedures for Neo4j Plugin GitHub User/Repository (Neo4j v4.4.x "neo4j-contrib/neo4j-apoc-procedures", Neo4j >= v5 "neo4j/apoc")
1414
NEO4J_GDS_PLUGIN_VERSION=${NEO4J_GDS_PLUGIN_VERSION:-"2.4.1"} # Graph Data Science Plugin Version 2.4.x of is compatible with Neo4j 5.x
15+
NEO4J_OPEN_GDS_PLUGIN_VERSION=${NEO4J_OPEN_GDS_PLUGIN_VERSION:-"2.4.1"} # Graph Data Science Plugin Version 2.4.x of is compatible with Neo4j 5.x
1516
NEO4J_GDS_PLUGIN_EDITION=${NEO4J_GDS_PLUGIN_EDITION:-"open"} # Graph Data Science Plugin Edition: "open" for OpenGDS, "full" for the full version with Neo4j license
1617
NEO4J_DATA_PATH=${NEO4J_DATA_PATH:-"$( pwd -P )/data"} # Path where Neo4j writes its data to (outside tools dir)
1718
NEO4J_RUNTIME_PATH=${NEO4J_RUNTIME_PATH:-"$( pwd -P )/runtime"} # Path where Neo4j puts runtime data to (e.g. logs) (outside tools dir)
@@ -169,14 +170,14 @@ fi
169170

170171
# Download and Install the Neo4j Plugin "Graph Data Science" (GDS)
171172
if [[ ${NEO4J_GDS_PLUGIN_EDITION} == "open" ]]; then
172-
neo4jGraphDataScienceDownloadUrl="https://github.com/JohT/open-graph-data-science-packaging/releases/download/v${NEO4J_GDS_PLUGIN_VERSION}"
173+
neo4jGraphDataScienceDownloadUrl="https://github.com/JohT/open-graph-data-science-packaging/releases/download/v${NEO4J_OPEN_GDS_PLUGIN_VERSION}"
173174
# TODO Maybe it would be a better solution to release open graph data science packages just with the major release version
174175
if [[ "$NEO4J_MAJOR_VERSION_NUMBER" -ge 5 ]]; then
175176
neo4jGraphDataScienceNeo4jVersion="5.9.0"
176177
else
177178
neo4jGraphDataScienceNeo4jVersion="4.4.23"
178179
fi
179-
neo4jGraphDataScienceReleaseArtifact="open-graph-data-science-${NEO4J_GDS_PLUGIN_VERSION}-for-neo4j-${neo4jGraphDataScienceNeo4jVersion}.jar"
180+
neo4jGraphDataScienceReleaseArtifact="open-graph-data-science-${NEO4J_OPEN_GDS_PLUGIN_VERSION}-for-neo4j-${neo4jGraphDataScienceNeo4jVersion}.jar"
180181
else
181182
neo4jGraphDataScienceDownloadUrl="https://github.com/neo4j/graph-data-science/releases/download/${NEO4J_GDS_PLUGIN_VERSION}"
182183
neo4jGraphDataScienceReleaseArtifact="neo4j-graph-data-science-${NEO4J_GDS_PLUGIN_VERSION}-${NEO4J_GDS_PLUGIN_EDITION}.jar"

0 commit comments

Comments
 (0)