Skip to content

Make neo4j-spatial a monorepo #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2025
Merged

Make neo4j-spatial a monorepo #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1ef168
Make neo4j-spatial a monorepo
Andy2003 Apr 29, 2025
2824dbd
Set shared compiler properties
Andy2003 Apr 29, 2025
80b7381
Merge remote-tracking branch 'origin/master' into feature/monorepo
Andy2003 Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Upload all jars to Release
uses: AButler/upload-release-assets@v3.0
with:
files: "target/*.jar"
files: "**/target/*.jar"
repo-token: ${{ secrets.GITHUB_TOKEN }}
release-id: ${{ steps.create_release.outputs.id }}

Expand All @@ -85,4 +85,4 @@ jobs:
with:
token: ${{ secrets.BUILD_ACCESS_TOKEN }}
repository: neo4j-documentation/docs-refresh
event-type: labs
event-type: labs
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This means that Neo4j Spatial 5.19.0 is build against Neo4j 5.19, and so on.

## Installation

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.
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.
2. set up your database with the following configuration in your `neo4j.conf` file:

```
Expand Down Expand Up @@ -188,11 +188,11 @@ RETURN node.name AS name
~~~

For further Java examples, refer to the test code in the
[LayersTest](src/test/java/org/neo4j/gis/spatial/LayersTest.java) and
the [TestSpatial](src/test/java/org/neo4j/gis/spatial/TestSpatial.java) classes.
[LayersTest](server-plugin/src/test/java/org/neo4j/gis/spatial/LayersTest.java) and
the [TestSpatial](server-plugin/src/test/java/org/neo4j/gis/spatial/TestSpatial.java) classes.

For further Procedures examples, refer to the code in
the [SpatialProceduresTest](src/test/java/org/neo4j/gis/spatial/procedures/SpatialProceduresTest.java)
the [SpatialProceduresTest](server-plugin/src/test/java/org/neo4j/gis/spatial/procedures/SpatialProceduresTest.java)
class.

## Neo4j Spatial Geoserver Plugin ##
Expand Down Expand Up @@ -305,7 +305,7 @@ The Java API (the original API for Neo4j Spatial) still remains, however, the mo
and therefor we recommend that if you need to access Neo4j server remotely, and want deeper access to Spatial functions,
consider writing your own Procedures. The Neo4j 3.0 documentation provides some good information on how to do this,
and you can also refer to
the [Neo4j Spatial procedures source code](src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java)
the [Neo4j Spatial procedures source code](server-plugin/src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java)
for examples.

## Building Neo4j spatial ##
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/modules/ROOT/examples/GeoPipesDocTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../../../src/test/java/org/neo4j/gis/spatial/pipes/GeoPipesDocTest.java
../../../../../server-plugin/src/test/java/org/neo4j/gis/spatial/pipes/GeoPipesDocTest.java
2 changes: 1 addition & 1 deletion docs/docs/modules/ROOT/examples/TestsForDocs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../../../src/test/java/org/neo4j/gis/spatial/TestsForDocs.java
../../../../../server-plugin/src/test/java/org/neo4j/gis/spatial/TestsForDocs.java
2 changes: 1 addition & 1 deletion docs/docs/modules/ROOT/pages/overview/introduction.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The key features include:

== Get Started

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.
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.

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.

Expand Down
158 changes: 9 additions & 149 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@
<version>5.26.1-SNAPSHOT</version>
<name>Neo4j - Spatial Components</name>
<description>Spatial utilities and components for Neo4j</description>
<url>https://components.neo4j.org/${project.artifactId}/${project.version}</url>
<url>https://neo4j.com/labs/neo4j-spatial/5/</url>
<inceptionYear>2010</inceptionYear>
<packaging>jar</packaging>
<packaging>pom</packaging>

<modules>
<module>server-plugin</module>
</modules>

<scm>
<url>https://github.com/neo4j/spatial/</url>
<connection>scm:git:git://github.com/neo4j/spatial.git</connection>
Expand All @@ -30,51 +35,6 @@
</scm>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>process-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<excludeScope>provided</excludeScope>
</configuration>
</execution>
<execution>
<id>get-test-data</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<includeGroupIds>org.neo4j.spatial</includeGroupIds>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/server-plugin.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<!-- this is used for inheritance merges -->
<phase>package</phase>
<!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
Expand Down Expand Up @@ -144,107 +104,6 @@
</comments>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<version>${neo4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-graphviz</artifactId>
<version>3.1.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-kernel</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- The JUnit-Hamcrest-Mockito combo -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.spatial</groupId>
<artifactId>osm-test-data</artifactId>
<version>${spatial.test.osm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.spatial</groupId>
<artifactId>shp-test-data</artifactId>
<version>${spatial.test.shp.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-shapefile</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-process</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-geojson</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools.xsd</groupId>
<artifactId>gt-xsd-kml</artifactId>
<version>${geotools.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>picocontainer</groupId>
<artifactId>picocontainer</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-render</artifactId>
<version>${geotools.version}</version>
<exclusions>
<exclusion>
<groupId>it.geosolutions.imageio-ext</groupId>
<artifactId>imageio-ext-tiff</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.neo4j.community</groupId>
<artifactId>it-test-support</artifactId>
<version>${neo4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-kernel-test-utils</artifactId>
<version>${neo4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -276,10 +135,11 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.28.0</version>
<version>2.27.0</version>
</dependency>
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<id>osgeo</id>
Expand Down
0 map.osm → server-plugin/map.osm
View file
Open in desktop
File renamed without changes.
0 map2.osm → server-plugin/map2.osm
View file
Open in desktop
File renamed without changes.
0 one-street.osm → server-plugin/one-street.osm
View file
Open in desktop
File renamed without changes.
Loading