Skip to content

Commit 794eb6a

Browse files
Andy2003Andy2003
authored
Remove obsolete build and documentation configurations (#438)
Deleted legacy files related to assembly, Makefile, and OSGi configurations while simplifying the Maven POM structure. Updated dependencies and plugins to modern versions, aligning with current Java and toolchain requirements.
1 parent 62f14a0 commit 794eb6a

File tree

5 files changed

+11
-168
lines changed

5 files changed

+11
-168
lines changed

‎.github/actions/setup-jdk/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: "Setups JDK"
2-
description: "Setups JDK 21"
2+
description: "Setups JDK 17"
33
runs:
44
using: "composite"
55
steps:
66
- name: Setup Java JDK
77
uses: actions/setup-java@v4
88
with:
9-
java-version: 21
9+
java-version: 17
1010
distribution: adopt

‎Makefile‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎osgi.bnd‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 9 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
44
<properties>
5-
<neo4j.version>5.26.2</neo4j.version>
6-
<neo4j.java.version>21</neo4j.java.version>
7-
<skinGroupId>org.neo4j.maven.skins</skinGroupId>
8-
<skinArtifactId>default-skin</skinArtifactId>
9-
<skinVersion>2</skinVersion>
5+
<neo4j.version>5.26.5</neo4j.version>
6+
<java.version>17</java.version>
107
<geotools.version>32.2</geotools.version>
118
<spatial.test.osm.version>20100819</spatial.test.osm.version>
129
<spatial.test.shp.version>20100819</spatial.test.shp.version>
1310
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<bundle.namespace>org.neo4j.gis</bundle.namespace>
15-
<github.global.server>github</github.global.server>
16-
<junit.version>5.11.3</junit.version>
17-
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
11+
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
12+
<maven.compiler.source>${java.version}</maven.compiler.source>
13+
<maven.compiler.target>${java.version}</maven.compiler.target>
1814
</properties>
1915

2016
<modelVersion>4.0.0</modelVersion>
@@ -34,65 +30,6 @@
3430
</scm>
3531
<build>
3632
<plugins>
37-
<plugin>
38-
<groupId>org.apache.maven.plugins</groupId>
39-
<artifactId>maven-compiler-plugin</artifactId>
40-
<version>3.13.0</version>
41-
<configuration>
42-
<source>${neo4j.java.version}</source>
43-
<target>${neo4j.java.version}</target>
44-
<compilerArgs>
45-
<arg>-AIgnoreContextWarnings</arg>
46-
<arg>-AGeneratedDocumentationPath=target/generated-documentation</arg>
47-
<arg>-ADocumentation.FieldDelimiter=¦</arg>
48-
<arg>-ADocumentation.ExportedHeaders=qualified name¦description¦signature</arg>
49-
<arg>-ADocumentation.QuotedFields=false</arg>
50-
<arg>-ADocumentation.DelimitedFirstField=true</arg>
51-
<arg>-ADocumentation.ExportGrouping=PACKAGE</arg>
52-
</compilerArgs>
53-
</configuration>
54-
</plugin>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<artifactId>maven-resources-plugin</artifactId>
58-
<version>3.3.1</version>
59-
<executions>
60-
<execution>
61-
<id>copy-resources</id>
62-
<!-- here the phase you need -->
63-
<phase>package</phase>
64-
<goals>
65-
<goal>copy-resources</goal>
66-
</goals>
67-
<configuration>
68-
<outputDirectory>${basedir}/target/filtered-test-sources</outputDirectory>
69-
<resources>
70-
<resource>
71-
<directory>${basedir}/target/filtered-test-sources</directory>
72-
<filtering>true</filtering>
73-
</resource>
74-
</resources>
75-
</configuration>
76-
</execution>
77-
<execution>
78-
<id>copy-docs</id>
79-
<!-- here the phase you need -->
80-
<phase>package</phase>
81-
<goals>
82-
<goal>copy-resources</goal>
83-
</goals>
84-
<configuration>
85-
<outputDirectory>${basedir}/target/docs</outputDirectory>
86-
<resources>
87-
<resource>
88-
<directory>${basedir}/src/docs</directory>
89-
<filtering>true</filtering>
90-
</resource>
91-
</resources>
92-
</configuration>
93-
</execution>
94-
</executions>
95-
</plugin>
9633
<plugin>
9734
<artifactId>maven-dependency-plugin</artifactId>
9835
<executions>
@@ -120,7 +57,7 @@
12057
</plugin>
12158
<plugin>
12259
<artifactId>maven-assembly-plugin</artifactId>
123-
<version>3.6.0</version>
60+
<version>3.7.1</version>
12461
<configuration>
12562
<descriptors>
12663
<descriptor>src/main/assembly/server-plugin.xml</descriptor>
@@ -217,7 +154,7 @@
217154
<dependency>
218155
<groupId>com.google.code.gson</groupId>
219156
<artifactId>gson</artifactId>
220-
<version>2.11.0</version>
157+
<version>2.13.1</version>
221158
<scope>test</scope>
222159
</dependency>
223160
<dependency>
@@ -237,7 +174,7 @@
237174
<dependency>
238175
<groupId>org.junit.jupiter</groupId>
239176
<artifactId>junit-jupiter-engine</artifactId>
240-
<version>${junit.version}</version>
177+
<version>5.11.3</version>
241178
<scope>test</scope>
242179
</dependency>
243180
<dependency>
@@ -339,7 +276,7 @@
339276
<dependency>
340277
<groupId>com.google.errorprone</groupId>
341278
<artifactId>error_prone_annotations</artifactId>
342-
<version>2.27.0</version>
279+
<version>2.28.0</version>
343280
</dependency>
344281
</dependencies>
345282
</dependencyManagement>
@@ -384,34 +321,6 @@
384321
</execution>
385322
</executions>
386323
</plugin>
387-
<plugin>
388-
<groupId>org.apache.maven.plugins</groupId>
389-
<artifactId>maven-gpg-plugin</artifactId>
390-
<version>3.2.4</version>
391-
<configuration>
392-
<bestPractices>true</bestPractices>
393-
</configuration>
394-
<executions>
395-
<execution>
396-
<id>sign-artifacts</id>
397-
<phase>verify</phase>
398-
<goals>
399-
<goal>sign</goal>
400-
</goals>
401-
</execution>
402-
</executions>
403-
</plugin>
404-
<plugin>
405-
<groupId>org.sonatype.plugins</groupId>
406-
<artifactId>nexus-staging-maven-plugin</artifactId>
407-
<version>1.6.13</version>
408-
<extensions>true</extensions>
409-
<configuration>
410-
<serverId>ossrh</serverId>
411-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
412-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
413-
</configuration>
414-
</plugin>
415324
</plugins>
416325
</build>
417326
</profile>

‎src/main/assembly/docs-assembly.xml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)