Skip to content

Commit 481586d

Browse files
klarenklaren
committed
Upgrade to properly work with neo4j 5.x
* Upgrade junit from 4 to 5 * Reformat all code to align with main Note! The cypher module is disabled to allow everything to proceed. That will need to be addressed in a separate PR.
1 parent e0b9475 commit 481586d

File tree

168 files changed

+5891
-8102
lines changed

Some content is hidden

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

168 files changed

+5891
-8102
lines changed

‎.mvn/extensions.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<extensions>
33
<extension>
4-
<groupId>fr.jcgay.maven</groupId>
5-
<artifactId>maven-profiler</artifactId>
6-
<version>2.4</version>
4+
<groupId>fr.jcgay.maven</groupId>
5+
<artifactId>maven-profiler</artifactId>
6+
<version>2.4</version>
77
</extension>
88
</extensions>

‎CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,23 @@ At [Neo4j Sweden AB](https://neo4j.com/), we develop our software in the open at
44
This provides transparency for you, our users, and allows you to fork the software to make your own additions and enhancements.
55
We also provide areas specifically for community contributions, in particular the [neo4j-contrib](https://github.com/neo4j-contrib) space.
66

7-
There's an active [mailing list](https://groups.google.com/forum/#!forum/neo4j) and [Slack channel](http://neo4j.com/slack) where we work directly with the community.
7+
There's an active [mailing list](https://groups.google.com/forum/#!forum/neo4j) and [Slack channel](http://neo4j.com/slack) where we work directly with the
8+
community.
89
If you're not already a member, sign up!
910

1011
We love our community and wouldn't be where we are without you.
1112

12-
1313
## Need to raise an issue?
1414

1515
Where you raise an issue depends largely on the nature of the problem.
1616

1717
Firstly, if you are an Enterprise customer, you might want to head over to our [Customer Support Portal](http://support.neo4j.com/).
1818

1919
There are plenty of public channels available too, though.
20-
If you simply want to get started or have a question on how to use a particular feature, drop a line to the [mailing list](https://groups.google.com/forum/#!forum/neo4j), ask a question in [Slack](http://neo4j.com/slack), or [tweet](https://twitter.com/neo4j) us.
21-
If you think you might have hit a bug in our software (it happens occasionally!) or you have specific feature request then use the issue feature on the relevant GitHub repository.
20+
If you simply want to get started or have a question on how to use a particular feature, drop a line to
21+
the [mailing list](https://groups.google.com/forum/#!forum/neo4j), ask a question in [Slack](http://neo4j.com/slack), or [tweet](https://twitter.com/neo4j) us.
22+
If you think you might have hit a bug in our software (it happens occasionally!) or you have specific feature request then use the issue feature on the relevant
23+
GitHub repository.
2224
Check first though as someone else may have already raised something similar.
2325

2426
[StackOverflow](http://stackoverflow.com/questions/tagged/neo4j) also hosts a ton of questions and might already have a discussion around your problem.
@@ -34,7 +36,6 @@ Include as much information as you can in any request you make:
3436
- What errors are you seeing?
3537
- What solutions have you tried already?
3638

37-
3839
## Want to contribute?
3940

4041
If you want to contribute a pull request, we have a little bit of process you'll need to follow:
@@ -47,18 +48,17 @@ If you want to contribute a pull request, we have a little bit of process you'll
4748
- Take a moment to read and sign our [CLA](http://neo4j.com/developer/cla)
4849

4950
We can't guarantee that we'll accept pull requests and may ask you to make some changes before they go in.
50-
Occasionally, we might also have logistical, commercial, or legal reasons why we can't accept your work but we'll try to find an alternative way for you to contribute in that case.
51+
Occasionally, we might also have logistical, commercial, or legal reasons why we can't accept your work but we'll try to find an alternative way for you to
52+
contribute in that case.
5153
Remember that many community members have become regular contributors and some are now even Neo employees!
5254

53-
5455
## Got an idea for a new project?
5556

5657
If you have an idea for a new tool or library, start by talking to other people in the community.
5758
Chances are that someone has a similar idea or may have already started working on it.
5859
The best software comes from getting like minds together to solve a problem.
5960
And we'll do our best to help you promote and co-ordinate your Neo ecosystem projects.
6061

61-
6262
## Further reading
6363

6464
If you want to find out more about how you can contribute, head over to our website for [more information](http://neo4j.com/developer/contributing-code/).

‎build/checkstyle.xml

+53-53
Original file line numberDiff line numberDiff line change
@@ -5,66 +5,66 @@
55

66
<module name="Checker">
77

8-
<property name="charset" value="UTF-8"/>
9-
<property name="fileExtensions" value="java"/>
8+
<property name="charset" value="UTF-8"/>
9+
<property name="fileExtensions" value="java"/>
1010

11-
<!-- Require license headers (GPL, AGPL or Apache 2.0) -->
12-
<module name="RegexpSingleline">
13-
<property name="format"
14-
value="^(\s|\*)*Copyright \(c\) &quot;Neo4j&quot;*$|^(\s|\*)*Licensed to Neo4j under one or more contributor*$"/>
15-
<property name="minimum" value="1"/>
16-
<property name="maximum" value="1"/>
17-
<property name="message" value="Missing, wrong or duplicated license header"/>
18-
</module>
11+
<!-- Require license headers (GPL, AGPL or Apache 2.0) -->
12+
<module name="RegexpSingleline">
13+
<property name="format"
14+
value="^(\s|\*)*Copyright \(c\) &quot;Neo4j&quot;*$|^(\s|\*)*Licensed to Neo4j under one or more contributor*$"/>
15+
<property name="minimum" value="1"/>
16+
<property name="maximum" value="1"/>
17+
<property name="message" value="Missing, wrong or duplicated license header"/>
18+
</module>
19+
20+
<!-- Prohibit tabs -->
21+
<module name="FileTabCharacter">
22+
<property name="eachLine" value="true"/>
23+
</module>
1924

20-
<!-- Prohibit tabs -->
21-
<module name="FileTabCharacter">
22-
<property name="eachLine" value="true"/>
23-
</module>
25+
<!-- Require new line at the end of file -->
26+
<module name="NewlineAtEndOfFile">
27+
<property name="lineSeparator" value="lf_cr_crlf"/>
28+
</module>
2429

25-
<!-- Require new line at the end of file -->
26-
<module name="NewlineAtEndOfFile">
27-
<property name="lineSeparator" value="lf_cr_crlf" />
28-
</module>
30+
<!-- Prohibit trailing spaces -->
31+
<module name="RegexpSingleline">
32+
<property name="format" value="\s+$"/>
33+
<property name="minimum" value="0"/>
34+
<property name="maximum" value="0"/>
35+
<property name="message" value="Line has trailing spaces."/>
36+
</module>
2937

30-
<!-- Prohibit trailing spaces -->
31-
<module name="RegexpSingleline">
32-
<property name="format" value="\s+$"/>
33-
<property name="minimum" value="0"/>
34-
<property name="maximum" value="0"/>
35-
<property name="message" value="Line has trailing spaces."/>
36-
</module>
38+
<!-- Prohibit consecutive empty lines (except the lines after package/import) -->
39+
<module name="RegexpMultiline">
40+
<property name="format" value="\n *(?!package )(?!import )[^\n]+\n{3,}"/>
41+
<property name="message" value="Two or more consecutive empty lines"/>
42+
</module>
3743

38-
<!-- Prohibit consecutive empty lines (except the lines after package/import) -->
39-
<module name="RegexpMultiline">
40-
<property name="format" value="\n *(?!package )(?!import )[^\n]+\n{3,}"/>
41-
<property name="message" value="Two or more consecutive empty lines"/>
42-
</module>
44+
<module name="TreeWalker">
4345

44-
<module name="TreeWalker">
46+
<module name="PackageDeclaration"/>
47+
<module name="UpperEll"/>
48+
<module name="ArrayTypeStyle"/>
49+
<module name="MissingOverride"/>
50+
<module name="EmptyStatement"/>
51+
<module name="SuperFinalize"/>
52+
<module name="EqualsHashCode"/>
53+
<module name="ModifierOrder"/>
54+
<module name="RedundantImport"/>
55+
<module name="MissingSwitchDefault"/>
56+
<module name="DefaultComesLast"/>
57+
<module name="MethodParamPad"/>
58+
<module name="TypecastParenPad"/>
59+
<module name="EmptyCatchBlock">
60+
<property name="exceptionVariableName" value="ignore|ignored"/>
61+
</module>
62+
<module name="AnnotationLocation">
63+
<property name="allowSamelineMultipleAnnotations" value="false"/>
64+
<property name="allowSamelineSingleParameterlessAnnotation" value="false"/>
65+
<property name="allowSamelineParameterizedAnnotation" value="false"/>
66+
</module>
4567

46-
<module name="PackageDeclaration"/>
47-
<module name="UpperEll"/>
48-
<module name="ArrayTypeStyle"/>
49-
<module name="MissingOverride"/>
50-
<module name="EmptyStatement"/>
51-
<module name="SuperFinalize"/>
52-
<module name="EqualsHashCode"/>
53-
<module name="ModifierOrder"/>
54-
<module name="RedundantImport"/>
55-
<module name="MissingSwitchDefault"/>
56-
<module name="DefaultComesLast"/>
57-
<module name="MethodParamPad"/>
58-
<module name="TypecastParenPad"/>
59-
<module name="EmptyCatchBlock">
60-
<property name="exceptionVariableName" value="ignore|ignored"/>
6168
</module>
62-
<module name="AnnotationLocation">
63-
<property name="allowSamelineMultipleAnnotations" value="false"/>
64-
<property name="allowSamelineSingleParameterlessAnnotation" value="false"/>
65-
<property name="allowSamelineParameterizedAnnotation" value="false"/>
66-
</module>
67-
68-
</module>
6969

7070
</module>

‎config-docs/pom.xml

+46-44
Original file line numberDiff line numberDiff line change
@@ -100,90 +100,92 @@
100100
<!-- All settings -->
101101
<java classname="org.neo4j.doc.ConfigDocsTool"
102102
classpathref="maven.compile.classpath" failonerror="true" fork="true">
103-
<arg value="--id=settings-reference-all-settings" />
104-
<arg value="--id-prefix=config_" />
105-
<arg value="--title=All settings" />
106-
<arg value="--deprecated=true" />
107-
<arg file="${project.build.directory}/docs/ops/all-settings.adoc" />
103+
<arg value="--id=settings-reference-all-settings"/>
104+
<arg value="--id-prefix=config_"/>
105+
<arg value="--title=All settings"/>
106+
<arg value="--deprecated=true"/>
107+
<arg file="${project.build.directory}/docs/ops/all-settings.adoc"/>
108108
</java>
109109

110110
<!-- All internal settings -->
111111
<java classname="org.neo4j.doc.ConfigDocsTool"
112112
classpathref="maven.compile.classpath" failonerror="true" fork="true">
113-
<arg value="--id=settings-reference-internal-settings" />
114-
<arg value="--id-prefix=internal_" />
115-
<arg value="--title=Internal settings" />
116-
<arg value="--deprecated=true" />
117-
<arg value="--unsupported" />
118-
<arg value="--internal=true" />
119-
<arg file="${project.build.directory}/docs/ops/internal-settings.adoc" />
113+
<arg value="--id=settings-reference-internal-settings"/>
114+
<arg value="--id-prefix=internal_"/>
115+
<arg value="--title=Internal settings"/>
116+
<arg value="--deprecated=true"/>
117+
<arg value="--unsupported"/>
118+
<arg value="--internal=true"/>
119+
<arg file="${project.build.directory}/docs/ops/internal-settings.adoc"/>
120120
</java>
121121

122122
<!-- All deprecated settings -->
123123
<java classname="org.neo4j.doc.ConfigDocsTool"
124124
classpathref="maven.compile.classpath" failonerror="true" fork="true">
125-
<arg value="--id=settings-reference-deprecated-settings" />
126-
<arg value="--title=Deprecated settings" />
127-
<arg value="--id-prefix=deprecated-setting_" />
128-
<arg value="--deprecated-only=true" />
129-
<arg file="${project.build.directory}/docs/ops/deprecated-settings.adoc" />
125+
<arg value="--id=settings-reference-deprecated-settings"/>
126+
<arg value="--title=Deprecated settings"/>
127+
<arg value="--id-prefix=deprecated-setting_"/>
128+
<arg value="--deprecated-only=true"/>
129+
<arg file="${project.build.directory}/docs/ops/deprecated-settings.adoc"/>
130130
</java>
131131

132132
<!-- All Causal Clustering settings by prefix -->
133133
<java classname="org.neo4j.doc.ConfigDocsTool"
134134
classpathref="maven.compile.classpath" failonerror="true" fork="true">
135-
<arg value="--id=settings-reference-causal-clustering-settings" />
136-
<arg value="--title=Causal Clustering settings" />
137-
<arg value="--id-prefix=cc-setting_" />
138-
<arg value="--prefix=causal_clustering" />
139-
<arg file="${project.build.directory}/docs/ops/cc-settings.adoc" />
135+
<arg value="--id=settings-reference-causal-clustering-settings"/>
136+
<arg value="--title=Causal Clustering settings"/>
137+
<arg value="--id-prefix=cc-setting_"/>
138+
<arg value="--prefix=causal_clustering"/>
139+
<arg file="${project.build.directory}/docs/ops/cc-settings.adoc"/>
140140
</java>
141141

142142
<!-- Only dynamic settings -->
143143
<java classname="org.neo4j.doc.ConfigDocsTool"
144144
classpathref="maven.compile.classpath" failonerror="true" fork="true">
145-
<arg value="--id=reference-dynamic-settings-reference" />
146-
<arg value="--title=Dynamic settings reference" />
147-
<arg value="--dynamic-only=true" />
148-
<arg file="${project.build.directory}/docs/ops/dynamic-settings.adoc" />
145+
<arg value="--id=reference-dynamic-settings-reference"/>
146+
<arg value="--title=Dynamic settings reference"/>
147+
<arg value="--dynamic-only=true"/>
148+
<arg file="${project.build.directory}/docs/ops/dynamic-settings.adoc"/>
149149
</java>
150150

151151
<!-- Old config docs tool -->
152152
<!-- Combined configuration docs for all public configuration other than connectors, which are handled separately below. -->
153153
<java classname="org.neo4j.doc.GenerateConfigDocumentation"
154154
classpathref="maven.compile.classpath" failonerror="true" fork="true">
155-
<arg line="-o ${project.build.directory}/docs/ops/configuration-attributes.asciidoc" />
156-
<arg value="org.neo4j.server.configuration.ServerSettings" />
157-
<arg value="org.neo4j.configuration.GraphDatabaseSettings" />
158-
<arg value="com.neo4j.configuration.MetricsSettings" />
159-
<arg value="com.neo4j.configuration.ClusterSettings" />
160-
<arg value="com.neo4j.configuration.KubernetesSettings" />
161-
<arg value="com.neo4j.server.enterprise.EnterpriseServerSettings" />
162-
<arg value="com.neo4j.configuration.SecuritySettings" />
163-
<arg value="com.neo4j.configuration.EnterpriseEditionSettings" />
155+
<arg line="-o ${project.build.directory}/docs/ops/configuration-attributes.asciidoc"/>
156+
<arg value="org.neo4j.server.configuration.ServerSettings"/>
157+
<arg value="org.neo4j.configuration.GraphDatabaseSettings"/>
158+
<arg value="com.neo4j.configuration.MetricsSettings"/>
159+
<arg value="com.neo4j.configuration.ClusterSettings"/>
160+
<arg value="com.neo4j.configuration.KubernetesSettings"/>
161+
<arg value="com.neo4j.server.enterprise.EnterpriseServerSettings"/>
162+
<arg value="com.neo4j.configuration.SecuritySettings"/>
163+
<arg value="com.neo4j.configuration.EnterpriseEditionSettings"/>
164164
</java>
165165

166166
<!-- Connector documentation is kept separate, because otherwise the grouping of these keys becomes unclear (IMO) -->
167167
<java classname="org.neo4j.doc.GenerateConfigDocumentation"
168-
classpathref="maven.compile.classpath" failonerror="true" fork="true">
169-
<arg line="-o ${project.build.directory}/docs/ops/configuration-bolt-connector-attributes.asciidoc" />
170-
<arg value="org.neo4j.configuration.connectors.BoltConnector" />
168+
classpathref="maven.compile.classpath" failonerror="true" fork="true">
169+
<arg line="-o ${project.build.directory}/docs/ops/configuration-bolt-connector-attributes.asciidoc"/>
170+
<arg value="org.neo4j.configuration.connectors.BoltConnector"/>
171171
</java>
172172

173173
<java classname="org.neo4j.doc.GenerateConfigDocumentation"
174-
classpathref="maven.compile.classpath" failonerror="true" fork="true">
175-
<arg line="-o ${project.build.directory}/docs/ops/configuration-http-connector-attributes.asciidoc" />
176-
<arg value="org.neo4j.configuration.connectors.HttpConnector" />
174+
classpathref="maven.compile.classpath" failonerror="true" fork="true">
175+
<arg line="-o ${project.build.directory}/docs/ops/configuration-http-connector-attributes.asciidoc"/>
176+
<arg value="org.neo4j.configuration.connectors.HttpConnector"/>
177177
</java>
178178

179179
<java classname="org.neo4j.doc.GenerateConfigDocumentation"
180180
classpathref="maven.compile.classpath" failonerror="true" fork="true">
181-
<arg line="-o ${project.build.directory}/docs/ops/configuration-https-connector-attributes.asciidoc" />
182-
<arg value="org.neo4j.configuration.connectors.HttpsConnector" />
181+
<arg line="-o ${project.build.directory}/docs/ops/configuration-https-connector-attributes.asciidoc"/>
182+
<arg value="org.neo4j.configuration.connectors.HttpsConnector"/>
183183
</java>
184184
</target>
185185
</configuration>
186-
<goals><goal>run</goal></goals>
186+
<goals>
187+
<goal>run</goal>
188+
</goals>
187189
</execution>
188190
</executions>
189191
<dependencies>

0 commit comments

Comments
 (0)