Skip to content

Commit 551cf39

Browse files
FlorentinDjjaderberg
authored andcommitted
Remove Neo4j version support
When releasing GDS 2.3+ Neo4j 4.3 will be EOL.
1 parent 603b60c commit 551cf39

File tree

10 files changed

+10
-33
lines changed

10 files changed

+10
-33
lines changed

README.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,11 @@ If you are using Neo4j Desktop you can simply add the Graph Data Science library
7777

7878
.4+<.^|GDS 2.2.x
7979
|Neo4j 4.3.15 - 4.3.22
80-
.8+.^|Java 11 & Java 17
80+
.7+.^|Java 11 & Java 17
8181
|Neo4j 4.4.9 - 4.4.15
8282
|Neo4j 5.1.0
8383
|Neo4j 5.2.0
84-
.4+<.^|GDS 2.3.x
85-
|Neo4j 4.3.15 - 4.3.22
84+
.3+<.^|GDS 2.3.x
8685
|Neo4j 4.4.9 - 4.4.15
8786
|Neo4j 5.1.0
8887
|Neo4j 5.2.0

compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/SettingProxyFactoryImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public class SettingProxyFactoryImpl implements SettingProxyFactory {
2929

3030
@Override
3131
public boolean canLoad(Neo4jVersion version) {
32-
return version == Neo4jVersion.V_4_3 ||
33-
version == Neo4jVersion.V_4_4;
32+
return version == Neo4jVersion.V_4_4;
3433
}
3534

3635
@Override
@@ -40,6 +39,6 @@ public SettingProxyApi load() {
4039

4140
@Override
4241
public String description() {
43-
return "Neo4j Settings 4.x";
42+
return "Neo4j Settings 4.4";
4443
}
4544
}

cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryNodeCursorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,13 @@ void testLabels() {
104104
}
105105

106106
@Test
107-
@EnableForNeo4jVersion(Neo4jVersion.V_4_3)
108107
void shouldHaveProperties43() {
109108
nodeCursor.next();
110109
assertThat(nodeCursor.hasProperties()).isTrue();
111110
assertThat(nodeCursor.propertiesReference()).isEqualTo(0L);
112111
}
113112

114113
@Test
115-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
116114
void shouldHaveProperties() {
117115
nodeCursor.next();
118116
assertThat(nodeCursor.hasProperties()).isTrue();

cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipTraversalCursorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ void shouldSetCorrectIdsAndTypes() {
128128

129129
@ParameterizedTest
130130
@MethodSource("propertyFilterAndExpectedValues")
131-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
132131
void shouldGetPropertyValues(Map<String, Double> expectedValues) {
133132
var relTypeToken = tokenHolders.relationshipTypeTokens().getIdByName("REL");
134133

doc/modules/ROOT/pages/installation/supported-neo4j-versions.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ Time to upgrade!
1313
[opts=header]
1414
|===
1515
| Neo4j Graph Data Science | Neo4j version
16-
.4+<.^|`2.3`
16+
.3+<.^|`2.3`
1717
| `5.1`
1818
| `5.2`
1919
| `4.4`, at least `4.4.9`
20-
| `4.3`, at least `4.3.15`
2120
.4+<.^|`2.2`
2221
| `5.1`
2322
| `5.2`

gradle/dependencies.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ext {
22
neos = [
3-
'4.3' : properties.getOrDefault('neo4jVersion43', '4.3.22'),
43
'4.4' : properties.getOrDefault('neo4jVersion44', '4.4.15'),
54
'5.1' : properties.getOrDefault('neo4jVersion51', '5.1.0'),
65
'5.2' : properties.getOrDefault('neo4jVersion52', '5.2.0'),

neo4j-adapter/src/main/java/org/neo4j/gds/compat/Neo4jVersion.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.stream.IntStream;
2828

2929
public enum Neo4jVersion {
30-
V_4_3,
3130
V_4_4,
3231
V_5_1,
3332
V_5_2,
@@ -37,8 +36,6 @@ public enum Neo4jVersion {
3736
@Override
3837
public String toString() {
3938
switch (this) {
40-
case V_4_3:
41-
return "4.3";
4239
case V_4_4:
4340
return "4.4";
4441
case V_5_1:
@@ -116,12 +113,8 @@ static Neo4jVersion parse(String version) {
116113
var majorVersion = majorMinorVersion[0];
117114
var minorVersion = majorMinorVersion[1];
118115

119-
if (majorVersion == 4) {
120-
if (minorVersion == 3) {
121-
return Neo4jVersion.V_4_3;
122-
} else if (minorVersion == 4) {
123-
return Neo4jVersion.V_4_4;
124-
}
116+
if (majorVersion == 4 && minorVersion == 4) {
117+
return Neo4jVersion.V_4_4;
125118
} else if (majorVersion == 5) {
126119
if (minorVersion == 1) {
127120
return Neo4jVersion.V_5_1;

neo4j-adapter/src/test/java/org/neo4j/gds/compat/Neo4jVersionTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ class Neo4jVersionTest {
3535

3636
@ParameterizedTest
3737
@CsvSource({
38-
"4.3.0-drop04, V_4_3",
39-
"4.3.0, V_4_3",
38+
"4.4.0-drop04, V_4_4",
4039
"4.4.0, V_4_4",
4140
"4.4.14, V_4_4",
4241
"5.1.0, V_5_1",
@@ -54,6 +53,7 @@ void testParse(String input, Neo4jVersion expected) {
5453
@ParameterizedTest
5554
@CsvSource({
5655
"dev",
56+
"4.3", // EOL
5757
"5.dev",
5858
"dev.5",
5959
"5.0", // 5.0 was never released to the public
@@ -75,8 +75,7 @@ void shouldNotRespectVersionOverride() {
7575

7676
@ParameterizedTest
7777
@CsvSource({
78-
"4.3.0-drop04, 4, 3",
79-
"4.3.0, 4, 3",
78+
"4.4.0-drop04, 4, 4",
8079
"4.4.14, 4, 4",
8180
"5.1.0, 5, 1",
8281
"5.2.0, 5, 2",

proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphStoreExportProcTest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void teardown() {
9191
GraphStoreCatalog.removeAllLoadedGraphs();
9292
}
9393

94-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
9594
@Test
9695
void exportGraph() {
9796
projectGraph();
@@ -109,7 +108,6 @@ void exportGraph() {
109108
});
110109
}
111110

112-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
113111
@Test
114112
void exportGraphWithAdditionalNodeProperties() {
115113
projectGraph();
@@ -135,7 +133,6 @@ void exportGraphWithAdditionalNodeProperties() {
135133
});
136134
}
137135

138-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
139136
@Test
140137
void exportGraphWithAdditionalNodePropertiesShortHandSyntax() {
141138
projectGraph();
@@ -161,7 +158,6 @@ void exportGraphWithAdditionalNodePropertiesShortHandSyntax() {
161158
});
162159
}
163160

164-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
165161
@Test
166162
void exportGraphWithAdditionalNodePropertiesDuplicateProperties() {
167163
projectGraph();
@@ -294,7 +290,6 @@ void failIfExportLocationIsNotSet() {
294290
}
295291

296292

297-
@DisableForNeo4jVersion(Neo4jVersion.V_4_3)
298293
@Test
299294
void exportCsvWithAdditionalNodePropertiesDuplicateProperties() {
300295
projectGraph();

proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ void testSysInfoProc() throws IOException {
119119

120120
Set<String> expectedCompatibilities;
121121
switch (neo4jVersion) {
122-
case V_4_3:
123-
expectedCompatibilities = Set.of("Neo4j 4.3", "Neo4j Settings 4.x");
124-
break;
125122
case V_4_4:
126123
expectedCompatibilities = Set.of("Neo4j 4.4", "Neo4j Settings 4.x");
127124
break;

0 commit comments

Comments
 (0)