Skip to content

Commit 4e53033

Browse files
codingmiaocodingmiao
committed
neo4j版本升级至4.1.0
1 parent e83511b commit 4e53033

File tree

5 files changed

+62
-39
lines changed

5 files changed

+62
-39
lines changed

‎README.md‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,35 @@ try (Transaction tx = db.beginTx()) {
6464

6565

6666
## install
67-
67+
The latest version is `1.2.2`
6868

6969
maven import in your project
7070
```
71-
<dependency>
72-
<groupId>org.wowtools</groupId>
73-
<artifactId>neo4j-rtree</artifactId>
74-
<version>1.2.2</version>
75-
</dependency>
71+
<dependency>
72+
<groupId>org.wowtools</groupId>
73+
<artifactId>neo4j-rtree</artifactId>
74+
<version>${neo4j-rtree-version}</version>
75+
</dependency>
76+
```
77+
If you already use another version of Neo4j (for example, the Enterprise version) in your project, add exclusions tag:
7678
```
79+
<dependency>
80+
<groupId>org.wowtools</groupId>
81+
<artifactId>neo4j-rtree</artifactId>
82+
<version>${neo4j-rtree-version}</version>
83+
<exclusions>
84+
<exclusion>
85+
<groupId>org.neo4j</groupId>
86+
<artifactId>neo4j-common</artifactId>
87+
</exclusion>
88+
<exclusion>
89+
<groupId>org.neo4j</groupId>
90+
<artifactId>neo4j</artifactId>
91+
</exclusion>
92+
</exclusions>
93+
</dependency>
94+
```
95+
7796
Maven central repository build by jdk11，So if you use jdk8，you must build yourself:
7897

7998
clone & install

‎README_zh.md‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,35 @@ try (Transaction tx = db.beginTx()) {
6464

6565

6666
## install
67-
67+
The latest version is `1.2.2`
6868

6969
maven import in your project
7070
```
71-
<dependency>
72-
<groupId>org.wowtools</groupId>
73-
<artifactId>neo4j-rtree</artifactId>
74-
<version>1.2.2</version>
75-
</dependency>
71+
<dependency>
72+
<groupId>org.wowtools</groupId>
73+
<artifactId>neo4j-rtree</artifactId>
74+
<version>${neo4j-rtree-version}</version>
75+
</dependency>
76+
```
77+
如果你的项目中已经使用了其它版本的neo4j(例如企业版)，引入时需要exclusions:
7678
```
79+
<dependency>
80+
<groupId>org.wowtools</groupId>
81+
<artifactId>neo4j-rtree</artifactId>
82+
<version>${neo4j-rtree-version}</version>
83+
<exclusions>
84+
<exclusion>
85+
<groupId>org.neo4j</groupId>
86+
<artifactId>neo4j-common</artifactId>
87+
</exclusion>
88+
<exclusion>
89+
<groupId>org.neo4j</groupId>
90+
<artifactId>neo4j</artifactId>
91+
</exclusion>
92+
</exclusions>
93+
</dependency>
94+
```
95+
7796
注意，maven中央库的依赖用jdk11编译，所以如果你的项目使用了jdk8，你需要自己编译一份适合于你的jdk的:
7897

7998
clone & install

‎pom.xml‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<properties>
7-
<neo4j.version>4.0.4</neo4j.version>
7+
<neo4j.version>4.1.0</neo4j.version>
88
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
99
<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
1010
<maven.compiler.target>11</maven.compiler.target>
@@ -46,37 +46,21 @@
4646

4747

4848
<dependencies>
49-
<dependency>
50-
<groupId>org.neo4j</groupId>
51-
<artifactId>neo4j-common</artifactId>
52-
<version>${neo4j.version}</version>
53-
</dependency>
5449
<dependency>
5550
<groupId>org.neo4j</groupId>
5651
<artifactId>neo4j</artifactId>
5752
<version>${neo4j.version}</version>
5853
</dependency>
59-
<!-- <dependency>-->
60-
<!-- <groupId>org.neo4j</groupId>-->
61-
<!-- <artifactId>neo4j-spatial-index</artifactId>-->
62-
<!-- <version>${neo4j.version}</version>-->
63-
<!-- </dependency>-->
6454
<dependency>
6555
<groupId>org.locationtech.jts</groupId>
6656
<artifactId>jts-core</artifactId>
6757
<version>1.16.1</version>
6858
</dependency>
6959

70-
<dependency>
71-
<groupId>org.neo4j.app</groupId>
72-
<artifactId>neo4j-server</artifactId>
73-
<version>${neo4j.version}</version>
74-
<scope>test</scope>
75-
</dependency>
7660
<dependency>
7761
<groupId>org.wowtools</groupId>
7862
<artifactId>catframe-common</artifactId>
79-
<version>1.4.2</version>
63+
<version>1.5</version>
8064
<scope>test</scope>
8165
</dependency>
8266
<dependency>
@@ -85,7 +69,12 @@
8569
<version>4.12</version>
8670
<scope>test</scope>
8771
</dependency>
88-
72+
<dependency>
73+
<groupId>org.neo4j.app</groupId>
74+
<artifactId>neo4j-server</artifactId>
75+
<version>${neo4j.version}</version>
76+
<scope>test</scope>
77+
</dependency>
8978
</dependencies>
9079
<profiles>
9180
<profile>

‎src/test/java/org/wowtools/neo4j/rtree/Neo4jDbManager.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.neo4j.graphdb.GraphDatabaseService;
44
import org.neo4j.server.CommunityBootstrapper;
5-
import org.neo4j.server.NeoServer;
6-
import org.neo4j.server.ServerBootstrapper;
75
import org.wowtools.common.utils.ResourcesReader;
86

97
import java.io.File;
@@ -20,7 +18,7 @@
2018
* @date 2018/11/14
2119
*/
2220
class Neo4jDbManager {
23-
private static final ServerBootstrapper serverBootstrapper;
21+
private static final CommunityBootstrapper serverBootstrapper;
2422
private static final String dbPath;
2523
private static final GraphDatabaseService graphDb;
2624

@@ -49,9 +47,8 @@ class Neo4jDbManager {
4947
for (String cfgKey : cfgKeys) {//把所有配置都读到map里，解决默认端口无法修改的问题
5048
configOverrides.put(cfgKey, p.getProperty(cfgKey));
5149
}
52-
serverBootstrapper.start(storeDir, cfgFile, configOverrides);
53-
NeoServer neoServer = serverBootstrapper.getServer();
54-
graphDb = neoServer.getDatabaseService().getDatabase();
50+
serverBootstrapper.start(storeDir, configOverrides);
51+
graphDb = serverBootstrapper.getDatabaseManagementService().database("neo4j");
5552
}
5653

5754
private static void deleteFiles(File path) {
@@ -90,7 +87,7 @@ public static GraphDatabaseService getGraphDb() {
9087
*
9188
* @return
9289
*/
93-
public static ServerBootstrapper getServer() {
90+
public static CommunityBootstrapper getServer() {
9491
return serverBootstrapper;
9592
}
9693
}

‎src/test/java/org/wowtools/neo4j/rtree/QueryByBboxTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.locationtech.jts.geom.*;
55
import org.locationtech.jts.io.WKBWriter;
66
import org.locationtech.jts.operation.predicate.RectangleIntersects;
7-
import org.neo4j.cypher.internal.v4_0.expressions.functions.Rand;
87
import org.neo4j.graphdb.GraphDatabaseService;
98
import org.neo4j.graphdb.Label;
109
import org.neo4j.graphdb.Node;

0 commit comments

Comments
 (0)