Skip to content

Commit 63cff43

Browse files
Andy2003Andy2003
authored
Make neo4j-spatial a monorepo (#437)
1 parent 794eb6a commit 63cff43

File tree

283 files changed

+2910
-3040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+2910
-3040
lines changed

‎.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: Upload all jars to Release
7373
uses: AButler/upload-release-assets@v3.0
7474
with:
75-
files: "target/*.jar"
75+
files: "**/target/*.jar"
7676
repo-token: ${{ secrets.GITHUB_TOKEN }}
7777
release-id: ${{ steps.create_release.outputs.id }}
7878

@@ -85,4 +85,4 @@ jobs:
8585
with:
8686
token: ${{ secrets.BUILD_ACCESS_TOKEN }}
8787
repository: neo4j-documentation/docs-refresh
88-
event-type: labs
88+
event-type: labs

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This means that Neo4j Spatial 5.19.0 is build against Neo4j 5.19, and so on.
1313

1414
## Installation
1515

16-
1. Copy the desired neo4j-spatial-x.x.x-server-plugin.jar from the [release page](https://github.com/neo4j-contrib/spatial/releases) to your neo4j plugin directory.
16+
1. Copy the desired neo4j-spatial-server-plugin-x.x.x-with-dependencies.jar from the [release page](https://github.com/neo4j-contrib/spatial/releases) to your neo4j plugin directory.
1717
2. set up your database with the following configuration in your `neo4j.conf` file:
1818

1919
```
@@ -188,11 +188,11 @@ RETURN node.name AS name
188188
~~~
189189
190190
For further Java examples, refer to the test code in the
191-
[LayersTest](src/test/java/org/neo4j/gis/spatial/LayersTest.java) and
192-
the [TestSpatial](src/test/java/org/neo4j/gis/spatial/TestSpatial.java) classes.
191+
[LayersTest](server-plugin/src/test/java/org/neo4j/gis/spatial/LayersTest.java) and
192+
the [TestSpatial](server-plugin/src/test/java/org/neo4j/gis/spatial/TestSpatial.java) classes.
193193
194194
For further Procedures examples, refer to the code in
195-
the [SpatialProceduresTest](src/test/java/org/neo4j/gis/spatial/procedures/SpatialProceduresTest.java)
195+
the [SpatialProceduresTest](server-plugin/src/test/java/org/neo4j/gis/spatial/procedures/SpatialProceduresTest.java)
196196
class.
197197
198198
## Neo4j Spatial Geoserver Plugin ##
@@ -305,7 +305,7 @@ The Java API (the original API for Neo4j Spatial) still remains, however, the mo
305305
and therefor we recommend that if you need to access Neo4j server remotely, and want deeper access to Spatial functions,
306306
consider writing your own Procedures. The Neo4j 3.0 documentation provides some good information on how to do this,
307307
and you can also refer to
308-
the [Neo4j Spatial procedures source code](src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java)
308+
the [Neo4j Spatial procedures source code](server-plugin/src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java)
309309
for examples.
310310
311311
## Building Neo4j spatial ##

‎docs/docs/modules/ROOT/examples/GeoPipesDocTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../src/test/java/org/neo4j/gis/spatial/pipes/GeoPipesDocTest.java
1+
../../../../../server-plugin/src/test/java/org/neo4j/gis/spatial/pipes/GeoPipesDocTest.java

‎docs/docs/modules/ROOT/examples/TestsForDocs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../src/test/java/org/neo4j/gis/spatial/TestsForDocs.java
1+
../../../../../server-plugin/src/test/java/org/neo4j/gis/spatial/TestsForDocs.java

‎docs/docs/modules/ROOT/pages/overview/introduction.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The key features include:
1919

2020
== Get Started
2121

22-
The easiest way to get started with neo4j-spatial is to grab the `server-plugin-*.jar` from https://github.com/neo4j-contrib/spatial/releases[the latest release], copy it to your `$NEO4J_HOME/plugins` and restart your Neo4j server.
22+
The easiest way to get started with neo4j-spatial is to grab the `neo4j-spatial-server-plugin-x.x.x-with-dependencies.jar` from https://github.com/neo4j-contrib/spatial/releases[the latest release], copy it to your `$NEO4J_HOME/plugins` and restart your Neo4j server.
2323

2424
From there you can use all the xref:api/index.adoc[spatial procedures and functions] in your Cypher queries to add Nodes to the spatial index and perform a number of spatial point, distance and intersection queries.
2525

‎pom.xml

Lines changed: 9 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,14 @@
1919
<version>5.26.1-SNAPSHOT</version>
2020
<name>Neo4j - Spatial Components</name>
2121
<description>Spatial utilities and components for Neo4j</description>
22-
<url>https://components.neo4j.org/${project.artifactId}/${project.version}</url>
22+
<url>https://neo4j.com/labs/neo4j-spatial/5/</url>
2323
<inceptionYear>2010</inceptionYear>
24-
<packaging>jar</packaging>
24+
<packaging>pom</packaging>
25+
26+
<modules>
27+
<module>server-plugin</module>
28+
</modules>
29+
2530
<scm>
2631
<url>https://github.com/neo4j/spatial/</url>
2732
<connection>scm:git:git://github.com/neo4j/spatial.git</connection>
@@ -30,51 +35,6 @@
3035
</scm>
3136
<build>
3237
<plugins>
33-
<plugin>
34-
<artifactId>maven-dependency-plugin</artifactId>
35-
<executions>
36-
<execution>
37-
<id>copy-dependencies</id>
38-
<phase>process-resources</phase>
39-
<goals>
40-
<goal>copy-dependencies</goal>
41-
</goals>
42-
<configuration>
43-
<excludeScope>provided</excludeScope>
44-
</configuration>
45-
</execution>
46-
<execution>
47-
<id>get-test-data</id>
48-
<goals>
49-
<goal>unpack-dependencies</goal>
50-
</goals>
51-
<configuration>
52-
<outputDirectory>${project.build.directory}</outputDirectory>
53-
<includeGroupIds>org.neo4j.spatial</includeGroupIds>
54-
</configuration>
55-
</execution>
56-
</executions>
57-
</plugin>
58-
<plugin>
59-
<artifactId>maven-assembly-plugin</artifactId>
60-
<version>3.7.1</version>
61-
<configuration>
62-
<descriptors>
63-
<descriptor>src/main/assembly/server-plugin.xml</descriptor>
64-
</descriptors>
65-
</configuration>
66-
<executions>
67-
<execution>
68-
<id>make-assembly</id>
69-
<!-- this is used for inheritance merges -->
70-
<phase>package</phase>
71-
<!-- bind to the packaging phase -->
72-
<goals>
73-
<goal>single</goal>
74-
</goals>
75-
</execution>
76-
</executions>
77-
</plugin>
7838
<plugin>
7939
<artifactId>maven-surefire-plugin</artifactId>
8040
<version>${maven-surefire-plugin.version}</version>
@@ -144,107 +104,6 @@
144104
</comments>
145105
</license>
146106
</licenses>
147-
<dependencies>
148-
<dependency>
149-
<groupId>org.neo4j</groupId>
150-
<artifactId>neo4j</artifactId>
151-
<version>${neo4j.version}</version>
152-
<scope>provided</scope>
153-
</dependency>
154-
<dependency>
155-
<groupId>com.google.code.gson</groupId>
156-
<artifactId>gson</artifactId>
157-
<version>2.13.1</version>
158-
<scope>test</scope>
159-
</dependency>
160-
<dependency>
161-
<groupId>org.neo4j</groupId>
162-
<artifactId>neo4j-graphviz</artifactId>
163-
<version>3.1.1</version>
164-
<scope>test</scope>
165-
<exclusions>
166-
<exclusion>
167-
<groupId>org.neo4j</groupId>
168-
<artifactId>neo4j-kernel</artifactId>
169-
</exclusion>
170-
</exclusions>
171-
</dependency>
172-
173-
<!-- The JUnit-Hamcrest-Mockito combo -->
174-
<dependency>
175-
<groupId>org.junit.jupiter</groupId>
176-
<artifactId>junit-jupiter-engine</artifactId>
177-
<version>5.11.3</version>
178-
<scope>test</scope>
179-
</dependency>
180-
<dependency>
181-
<groupId>org.neo4j.spatial</groupId>
182-
<artifactId>osm-test-data</artifactId>
183-
<version>${spatial.test.osm.version}</version>
184-
<scope>test</scope>
185-
</dependency>
186-
<dependency>
187-
<groupId>org.neo4j.spatial</groupId>
188-
<artifactId>shp-test-data</artifactId>
189-
<version>${spatial.test.shp.version}</version>
190-
<scope>test</scope>
191-
</dependency>
192-
<dependency>
193-
<groupId>org.geotools</groupId>
194-
<artifactId>gt-main</artifactId>
195-
<version>${geotools.version}</version>
196-
</dependency>
197-
<dependency>
198-
<groupId>org.geotools</groupId>
199-
<artifactId>gt-shapefile</artifactId>
200-
<version>${geotools.version}</version>
201-
</dependency>
202-
<dependency>
203-
<groupId>org.geotools</groupId>
204-
<artifactId>gt-process</artifactId>
205-
<version>${geotools.version}</version>
206-
</dependency>
207-
<dependency>
208-
<groupId>org.geotools</groupId>
209-
<artifactId>gt-geojson</artifactId>
210-
<version>${geotools.version}</version>
211-
</dependency>
212-
<dependency>
213-
<groupId>org.geotools.xsd</groupId>
214-
<artifactId>gt-xsd-kml</artifactId>
215-
<version>${geotools.version}</version>
216-
<scope>provided</scope>
217-
<exclusions>
218-
<exclusion>
219-
<groupId>picocontainer</groupId>
220-
<artifactId>picocontainer</artifactId>
221-
</exclusion>
222-
</exclusions>
223-
</dependency>
224-
<dependency>
225-
<groupId>org.geotools</groupId>
226-
<artifactId>gt-render</artifactId>
227-
<version>${geotools.version}</version>
228-
<exclusions>
229-
<exclusion>
230-
<groupId>it.geosolutions.imageio-ext</groupId>
231-
<artifactId>imageio-ext-tiff</artifactId>
232-
</exclusion>
233-
</exclusions>
234-
</dependency>
235-
<dependency>
236-
<groupId>org.neo4j.community</groupId>
237-
<artifactId>it-test-support</artifactId>
238-
<version>${neo4j.version}</version>
239-
<scope>test</scope>
240-
</dependency>
241-
<dependency>
242-
<groupId>org.neo4j</groupId>
243-
<artifactId>neo4j-kernel-test-utils</artifactId>
244-
<version>${neo4j.version}</version>
245-
<scope>test</scope>
246-
</dependency>
247-
</dependencies>
248107

249108
<dependencyManagement>
250109
<dependencies>
@@ -276,10 +135,11 @@
276135
<dependency>
277136
<groupId>com.google.errorprone</groupId>
278137
<artifactId>error_prone_annotations</artifactId>
279-
<version>2.28.0</version>
138+
<version>2.27.0</version>
280139
</dependency>
281140
</dependencies>
282141
</dependencyManagement>
142+
283143
<repositories>
284144
<repository>
285145
<id>osgeo</id>

‎map.osm renamed to ‎server-plugin/map.osm

File renamed without changes.

‎map2.osm renamed to ‎server-plugin/map2.osm

File renamed without changes.

‎one-street.osm renamed to ‎server-plugin/one-street.osm

File renamed without changes.

0 commit comments

Comments
 (0)