From 2e3780f027465ac154d1f143907adbe7a6a63ed4 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Thu, 3 May 2018 09:46:27 +0200 Subject: [PATCH] Switch to JUnit 5 Update all tests to be run by junit 5. At first step we run all the tests in vintage mode without any new junit 5 sugar. Modules will be migrated one by one independently. --- community/bolt/pom.xml | 262 ++++++----- community/codegen/pom.xml | 12 +- community/collections/pom.xml | 66 +-- community/command-line/pom.xml | 86 ++-- community/common/pom.xml | 52 ++- community/concurrent/pom.xml | 12 +- community/configuration/pom.xml | 72 +-- community/consistency-check/pom.xml | 166 +++---- community/csv/pom.xml | 84 ++-- community/cypher/pom.xml | 20 +- community/dbms/pom.xml | 212 +++++---- community/graph-algo/pom.xml | 66 +-- community/graphdb-api/pom.xml | 60 ++- community/import-tool/pom.xml | 94 ++-- community/index/pom.xml | 86 ++-- community/io/pom.xml | 130 +++--- community/jmx/pom.xml | 76 +-- community/licensecheck-config/pom.xml | 20 +- community/logging/pom.xml | 108 +++-- community/lucene-index-upgrade/pom.xml | 12 +- community/lucene-index/pom.xml | 164 +++---- community/neo4j-harness/pom.xml | 12 + community/neo4j-slf4j/pom.xml | 72 +-- community/neo4j/pom.xml | 212 +++++---- .../integration-tests/pom.xml | 12 +- .../procedure-compiler/processor/pom.xml | 12 +- community/resource/pom.xml | 20 +- community/security/pom.xml | 190 ++++---- community/server-api/pom.xml | 54 ++- community/server-plugin-test/pom.xml | 120 ++--- community/server/pom.xml | 436 +++++++++--------- community/shell/pom.xml | 190 ++++---- community/spatial-index/pom.xml | 40 +- community/ssl/pom.xml | 126 ++--- community/udc/pom.xml | 98 ++-- community/unsafe/pom.xml | 46 +- community/values/pom.xml | 74 +-- enterprise/backup/pom.xml | 236 +++++----- enterprise/causal-clustering/pom.xml | 12 +- enterprise/cluster/pom.xml | 136 +++--- enterprise/com/pom.xml | 148 +++--- .../cypher/spec-suite-tools/LICENSES.txt | 286 ------------ enterprise/cypher/spec-suite-tools/NOTICE.txt | 5 - enterprise/deferred-locks/pom.xml | 130 +++--- enterprise/fulltext-addon/pom.xml | 142 +++--- enterprise/ha/pom.xml | 318 ++++++------- enterprise/management/pom.xml | 106 +++-- enterprise/metrics/pom.xml | 324 ++++++------- enterprise/neo4j-enterprise/pom.xml | 280 +++++------ enterprise/neo4j-harness-enterprise/pom.xml | 12 + .../pom.xml | 12 +- enterprise/query-logging/pom.xml | 242 +++++----- enterprise/security/pom.xml | 302 ++++++------ enterprise/server-enterprise/pom.xml | 308 +++++++------ integrationtests/pom.xml | 18 +- pom.xml | 68 ++- stresstests/pom.xml | 212 +++++---- tools/pom.xml | 18 +- 58 files changed, 3551 insertions(+), 3338 deletions(-) diff --git a/community/bolt/pom.xml b/community/bolt/pom.xml index 88e70da668803..538df95039c8c 100644 --- a/community/bolt/pom.xml +++ b/community/bolt/pom.xml @@ -43,132 +43,140 @@ - - - org.neo4j - neo4j - ${project.version} - - - - org.neo4j - neo4j-values - ${project.version} - - - - org.neo4j - neo4j-kernel - ${project.version} - - - - org.neo4j - neo4j-ssl - ${project.version} - - - - io.netty - netty-all - - - - org.codehaus.jackson - jackson-mapper-asl - - - commons-codec - commons-codec - - - - com.google.code.findbugs - annotations - - - - org.apache.commons - commons-lang3 - - - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.eclipse.jetty - jetty-server - test - - - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-security - ${project.version} - test - - - org.neo4j - neo4j-security - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.eclipse.jetty + jetty-server + test + + + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-security + ${project.version} + test + + + org.neo4j + neo4j-security + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + - - org.bouncycastle - bcpkix-jdk15on - - - - org.eclipse.jetty.websocket - websocket-client - test - - + + org.bouncycastle + bcpkix-jdk15on + + + + org.eclipse.jetty.websocket + websocket-client + test + + diff --git a/community/codegen/pom.xml b/community/codegen/pom.xml index 3253c5d638a6b..de978d01a4de6 100644 --- a/community/codegen/pom.xml +++ b/community/codegen/pom.xml @@ -74,8 +74,16 @@ the relevant Commercial Agreement. commons-text - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api org.hamcrest diff --git a/community/collections/pom.xml b/community/collections/pom.xml index 537c9792e9ff7..cb418962b2521 100644 --- a/community/collections/pom.xml +++ b/community/collections/pom.xml @@ -61,32 +61,42 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-resource - ${project.version} - - - org.neo4j - neo4j-common - ${project.version} - - - org.eclipse.collections - eclipse-collections - - - junit - junit - - - org.mockito - mockito-core - - - org.hamcrest - hamcrest-all - - + + + org.neo4j + neo4j-resource + ${project.version} + + + org.neo4j + neo4j-common + ${project.version} + + + org.eclipse.collections + eclipse-collections + + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.mockito + mockito-core + + + org.hamcrest + hamcrest-all + + + diff --git a/community/command-line/pom.xml b/community/command-line/pom.xml index 426b81ade2bb7..3d64c194f4bf0 100644 --- a/community/command-line/pom.xml +++ b/community/command-line/pom.xml @@ -40,45 +40,53 @@ - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-collections - ${project.version} - - - com.google.code.findbugs - annotations - - - org.apache.commons - commons-text - - - org.hamcrest - hamcrest-all - - - junit - junit - - - org.mockito - mockito-core - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-collections + ${project.version} + + + com.google.code.findbugs + annotations + + + org.apache.commons + commons-text + + + org.hamcrest + hamcrest-all + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.mockito + mockito-core + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + diff --git a/community/common/pom.xml b/community/common/pom.xml index 1341e1d26a4c1..182712dbbe35d 100644 --- a/community/common/pom.xml +++ b/community/common/pom.xml @@ -61,26 +61,34 @@ the relevant Commercial Agreement. - - - com.google.code.findbugs - annotations - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - + + + com.google.code.findbugs + annotations + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + diff --git a/community/concurrent/pom.xml b/community/concurrent/pom.xml index 767c7dd8ad0e8..3066cdb98b3fe 100644 --- a/community/concurrent/pom.xml +++ b/community/concurrent/pom.xml @@ -57,8 +57,16 @@ the relevant Commercial Agreement. - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api org.hamcrest diff --git a/community/configuration/pom.xml b/community/configuration/pom.xml index 91759bf613685..f0f6ca82906bb 100644 --- a/community/configuration/pom.xml +++ b/community/configuration/pom.xml @@ -48,36 +48,44 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-graphdb-api - ${project.version} - - - org.neo4j - neo4j-logging - ${project.version} - - - com.google.code.findbugs - annotations - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - + + + org.neo4j + neo4j-graphdb-api + ${project.version} + + + org.neo4j + neo4j-logging + ${project.version} + + + com.google.code.findbugs + annotations + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + diff --git a/community/consistency-check/pom.xml b/community/consistency-check/pom.xml index af52d61eb1c7b..e86107fdc7634 100644 --- a/community/consistency-check/pom.xml +++ b/community/consistency-check/pom.xml @@ -47,87 +47,95 @@ the relevant Commercial Agreement. - + - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-lucene-index - ${project.version} - + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-lucene-index + ${project.version} + - - com.google.code.findbugs - annotations - + + com.google.code.findbugs + annotations + - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-command-line - ${project.version} - - - org.neo4j - neo4j-dbms - ${project.version} - - - org.neo4j - neo4j-io - ${project.version} - - + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-command-line + ${project.version} + + + org.neo4j + neo4j-dbms + ${project.version} + + + org.neo4j + neo4j-io + ${project.version} + + diff --git a/community/csv/pom.xml b/community/csv/pom.xml index e0b8d4d19dad1..48bf5aaf2fdf6 100644 --- a/community/csv/pom.xml +++ b/community/csv/pom.xml @@ -48,44 +48,54 @@ the relevant Commercial Agreement. + - - - com.google.code.findbugs - annotations - - - org.neo4j - neo4j-collections - ${project.version} - - - org.neo4j - neo4j-values - ${project.version} - + + + com.google.code.findbugs + annotations + + + org.neo4j + neo4j-collections + ${project.version} + + + org.neo4j + neo4j-values + ${project.version} + + - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - commons-codec - commons-codec - - - org.neo4j - neo4j-io - ${project.version} - test - - - junit - junit - + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + commons-codec + commons-codec + + + org.neo4j + neo4j-io + ${project.version} + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml index 9d30f928b7fe1..7774426de095b 100644 --- a/community/cypher/pom.xml +++ b/community/cypher/pom.xml @@ -117,16 +117,24 @@ - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport - org.hamcrest - hamcrest-core + org.junit.jupiter + junit-jupiter-api - org.hamcrest - hamcrest-library + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library org.mockito diff --git a/community/dbms/pom.xml b/community/dbms/pom.xml index 9cc8594b55671..63caf4349bf04 100644 --- a/community/dbms/pom.xml +++ b/community/dbms/pom.xml @@ -86,109 +86,117 @@ - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-graphdb-api - ${project.version} - - - org.neo4j - neo4j-command-line - ${project.version} - - - org.neo4j - neo4j-collections - ${project.version} - - - com.google.code.findbugs - annotations - - - org.neo4j - neo4j-io - ${project.version} - - - org.neo4j - neo4j-import-tool - ${project.version} - - - org.neo4j - neo4j-jmx - ${project.version} - + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-graphdb-api + ${project.version} + + + org.neo4j + neo4j-command-line + ${project.version} + + + org.neo4j + neo4j-collections + ${project.version} + + + com.google.code.findbugs + annotations + + + org.neo4j + neo4j-io + ${project.version} + + + org.neo4j + neo4j-import-tool + ${project.version} + + + org.neo4j + neo4j-jmx + ${project.version} + - - org.jprocesses - jProcesses - + + org.jprocesses + jProcesses + - - org.apache.commons - commons-compress - + + org.apache.commons + commons-compress + - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test - test-jar - - - org.neo4j - neo4j-command-line - ${project.version} - test - test-jar - - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.apache.commons - commons-lang3 - test - - + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test + test-jar + + + org.neo4j + neo4j-command-line + ${project.version} + test + test-jar + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.apache.commons + commons-lang3 + test + + diff --git a/community/graph-algo/pom.xml b/community/graph-algo/pom.xml index 8387bdb6db83d..6e452a105f6fd 100644 --- a/community/graph-algo/pom.xml +++ b/community/graph-algo/pom.xml @@ -64,34 +64,42 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - junit - junit - - - org.mockito - mockito-core - - + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.mockito + mockito-core + + diff --git a/community/graphdb-api/pom.xml b/community/graphdb-api/pom.xml index 502a33be43f94..06595a6002de4 100644 --- a/community/graphdb-api/pom.xml +++ b/community/graphdb-api/pom.xml @@ -61,30 +61,40 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-common - ${project.version} - - - org.neo4j - neo4j-resource - ${project.version} - - - org.neo4j - neo4j-collections - ${project.version} - - - junit - junit - - - org.mockito - mockito-core - - + + + org.neo4j + neo4j-common + ${project.version} + + + org.neo4j + neo4j-resource + ${project.version} + + + org.neo4j + neo4j-collections + ${project.version} + + + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.mockito + mockito-core + + diff --git a/community/import-tool/pom.xml b/community/import-tool/pom.xml index 29f13f4a8962d..d02ecd0548be9 100644 --- a/community/import-tool/pom.xml +++ b/community/import-tool/pom.xml @@ -48,48 +48,56 @@ the relevant Commercial Agreement. - - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-lucene-index - ${project.version} - + + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-lucene-index + ${project.version} + - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - junit - junit - - - commons-codec - commons-codec - - + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + diff --git a/community/index/pom.xml b/community/index/pom.xml index be2cfcb237b09..80eb6c7868f9e 100644 --- a/community/index/pom.xml +++ b/community/index/pom.xml @@ -48,49 +48,57 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-io - ${project.version} - + + + org.neo4j + neo4j-io + ${project.version} + org.eclipse.collections eclipse-collections - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-collections - ${project.version} - test - - - commons-codec - commons-codec - - - junit - junit - - - org.mockito - mockito-core - + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-collections + ${project.version} + test + + + commons-codec + commons-codec + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.mockito + mockito-core + diff --git a/community/io/pom.xml b/community/io/pom.xml index 94ec6f02d292f..4950c0f15e101 100644 --- a/community/io/pom.xml +++ b/community/io/pom.xml @@ -48,69 +48,77 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-unsafe - ${project.version} - - - org.apache.commons - commons-lang3 - - - org.neo4j - neo4j-graphdb-api - ${project.version} - - - org.neo4j - neo4j-concurrent - ${project.version} - - - org.eclipse.collections - eclipse-collections - + + + org.neo4j + neo4j-unsafe + ${project.version} + + + org.apache.commons + commons-lang3 + + + org.neo4j + neo4j-graphdb-api + ${project.version} + + + org.neo4j + neo4j-concurrent + ${project.version} + + + org.eclipse.collections + eclipse-collections + - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.neo4j - neo4j-unsafe - ${project.version} - test-jar - test - - - commons-codec - commons-codec - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.neo4j + neo4j-unsafe + ${project.version} + test-jar + test + + + commons-codec + commons-codec + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + - + - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - commons-codec - commons-codec - - - commons-io - commons-io - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-consistency-check - ${project.version} - test-jar - test - - - com.google.code.findbugs - annotations - - + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + commons-codec + commons-codec + + + commons-io + commons-io + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-consistency-check + ${project.version} + test-jar + test + + + com.google.code.findbugs + annotations + + diff --git a/community/procedure-compiler/integration-tests/pom.xml b/community/procedure-compiler/integration-tests/pom.xml index 821cf7e1c7734..8d0c6851a9e54 100644 --- a/community/procedure-compiler/integration-tests/pom.xml +++ b/community/procedure-compiler/integration-tests/pom.xml @@ -46,8 +46,16 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api org.assertj diff --git a/community/procedure-compiler/processor/pom.xml b/community/procedure-compiler/processor/pom.xml index 94c2fbc7e83f1..c07256f097964 100644 --- a/community/procedure-compiler/processor/pom.xml +++ b/community/procedure-compiler/processor/pom.xml @@ -91,8 +91,16 @@ true - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api com.google.testing.compile diff --git a/community/resource/pom.xml b/community/resource/pom.xml index 41f1a129797df..0b87b2eb44c0f 100644 --- a/community/resource/pom.xml +++ b/community/resource/pom.xml @@ -61,10 +61,18 @@ the relevant Commercial Agreement. - - - junit - junit - - + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + diff --git a/community/security/pom.xml b/community/security/pom.xml index 044ab74ee8da1..3e5fccd87e048 100644 --- a/community/security/pom.xml +++ b/community/security/pom.xml @@ -48,96 +48,104 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-logging - ${project.version} - - - org.neo4j - neo4j-common - ${project.version} - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-graphdb-api - ${project.version} - - - org.neo4j - neo4j-command-line - ${project.version} - - - org.neo4j - neo4j-dbms - ${project.version} - - - com.google.code.findbugs - annotations - + + + org.neo4j + neo4j-logging + ${project.version} + + + org.neo4j + neo4j-common + ${project.version} + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-graphdb-api + ${project.version} + + + org.neo4j + neo4j-command-line + ${project.version} + + + org.neo4j + neo4j-dbms + ${project.version} + + + com.google.code.findbugs + annotations + - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-cypher - ${project.version} - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - commons-codec - commons-codec - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-cypher + ${project.version} + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + commons-codec + commons-codec + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + diff --git a/community/server-api/pom.xml b/community/server-api/pom.xml index 510d83412be3f..e2646b8cf78ff 100644 --- a/community/server-api/pom.xml +++ b/community/server-api/pom.xml @@ -61,31 +61,39 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-kernel - ${project.version} - + + + org.neo4j + neo4j-kernel + ${project.version} + - - junit - junit - - - org.hamcrest - hamcrest-core - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + - - org.neo4j.3rdparty.javax.ws.rs - jsr311-api - + + org.neo4j.3rdparty.javax.ws.rs + jsr311-api + - - commons-configuration - commons-configuration - + + commons-configuration + commons-configuration + - + diff --git a/community/server-plugin-test/pom.xml b/community/server-plugin-test/pom.xml index 2c22901f7b24a..ab3da06580ab6 100644 --- a/community/server-plugin-test/pom.xml +++ b/community/server-plugin-test/pom.xml @@ -48,62 +48,70 @@ the relevant Commercial Agreement. - - - org.neo4j.app - neo4j-server - ${project.version} - + + + org.neo4j.app + neo4j-server + ${project.version} + - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + - - com.sun.jersey - jersey-client - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j.app - neo4j-server - ${project.version} - test-jar - test - - + + com.sun.jersey + jersey-client + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j.app + neo4j-server + ${project.version} + test-jar + test + + diff --git a/community/server/pom.xml b/community/server/pom.xml index 04d6148d930aa..7261edc8389df 100644 --- a/community/server/pom.xml +++ b/community/server/pom.xml @@ -98,220 +98,228 @@ - - - org.neo4j - neo4j - ${project.version} - pom - - - - - org.neo4j - neo4j-kernel - ${project.version} - - - - org.neo4j - neo4j-security - ${project.version} - - - - org.neo4j - neo4j-dbms - ${project.version} - - - - org.neo4j - neo4j-command-line - ${project.version} - - - - org.neo4j - server-api - ${project.version} - - - - org.neo4j - neo4j-cypher - ${project.version} - - - - org.neo4j - neo4j-bolt - ${project.version} - - - - org.neo4j.client - neo4j-browser - ${neo4j-browser.version} - - - - org.neo4j - neo4j-shell - ${project.version} - - - - com.google.code.findbugs - annotations - - - - org.eclipse.jetty - jetty-server - - - - org.eclipse.jetty - jetty-webapp - - - - com.sun.jersey - jersey-server - - - - com.sun.jersey - jersey-servlet - - - - commons-configuration - commons-configuration - - - - - commons-io - commons-io - - - - org.codehaus.jackson - jackson-jaxrs - - - - org.mozilla - rhino - - - - org.bouncycastle - bcprov-jdk15on - - - - org.bouncycastle - bcpkix-jdk15on - - - - - com.sun.jersey - jersey-client - test - - - - com.google.code.gson - gson - test - - - - org.apache.httpcomponents - httpclient - test - - - - org.apache.httpcomponents - httpcore - test - - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-security - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-bolt - ${project.version} - test-jar - test - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - - org.json - json - 20090211 - test - - + + org.bouncycastle + bcpkix-jdk15on + + + + + com.sun.jersey + jersey-client + test + + + + com.google.code.gson + gson + test + + + + org.apache.httpcomponents + httpclient + test + + + + org.apache.httpcomponents + httpcore + test + + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-security + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-bolt + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + + org.json + json + 20090211 + test + + diff --git a/community/shell/pom.xml b/community/shell/pom.xml index 95f36353f7b0c..3870e887561b1 100644 --- a/community/shell/pom.xml +++ b/community/shell/pom.xml @@ -80,99 +80,107 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-kernel - ${project.version} - provided - - - org.neo4j - neo4j-kernel - ${project.version} - test - test-jar - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-jmx - ${project.version} - provided - - - org.neo4j - neo4j-graph-algo - ${project.version} - provided - - - org.neo4j - neo4j-cypher - ${project.version} - provided - - - ${jline.groupId} - ${jline.artifactId} - ${jline.version} - - - junit - junit - - - + + + org.neo4j + neo4j-kernel + ${project.version} + provided + + + org.neo4j + neo4j-kernel + ${project.version} + test + test-jar + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-jmx + ${project.version} + provided + + + org.neo4j + neo4j-graph-algo + ${project.version} + provided + + + org.neo4j + neo4j-cypher + ${project.version} + provided + + + ${jline.groupId} + ${jline.artifactId} + ${jline.version} + + + junit + junit + + + - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + - - org.neo4j - neo4j-bolt - ${project.version} - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - + + org.neo4j + neo4j-bolt + ${project.version} + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + - + diff --git a/community/spatial-index/pom.xml b/community/spatial-index/pom.xml index c5175848493a6..cb945ccafe7db 100644 --- a/community/spatial-index/pom.xml +++ b/community/spatial-index/pom.xml @@ -68,21 +68,29 @@ the relevant Commercial Agreement. - - + + - - - junit - junit - - - org.mockito - mockito-core - - - org.hamcrest - hamcrest-all - - + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.mockito + mockito-core + + + org.hamcrest + hamcrest-all + + diff --git a/community/ssl/pom.xml b/community/ssl/pom.xml index e06d2c6eb95f7..93fb41d28bf75 100644 --- a/community/ssl/pom.xml +++ b/community/ssl/pom.xml @@ -48,64 +48,72 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-logging - ${project.version} - - - org.neo4j - neo4j-common - ${project.version} - - - com.google.code.findbugs - annotations - + + + org.neo4j + neo4j-logging + ${project.version} + + + org.neo4j + neo4j-common + ${project.version} + + + com.google.code.findbugs + annotations + - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - commons-codec - commons-codec - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - io.netty - netty-all - - - org.bouncycastle - bcpkix-jdk15on - - + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + commons-codec + commons-codec + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + io.netty + netty-all + + + org.bouncycastle + bcpkix-jdk15on + + diff --git a/community/udc/pom.xml b/community/udc/pom.xml index e8d62c91d042d..a53014f5eceff 100644 --- a/community/udc/pom.xml +++ b/community/udc/pom.xml @@ -48,50 +48,58 @@ - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.apache.httpcomponents - httpclient - tests - test - - - org.apache.httpcomponents - httpclient - test - - - commons-io - commons-io - test - - - junit - junit - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.mockito - mockito-core - - + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.apache.httpcomponents + httpclient + tests + test + + + org.apache.httpcomponents + httpclient + test + + + commons-io + commons-io + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.mockito + mockito-core + + diff --git a/community/unsafe/pom.xml b/community/unsafe/pom.xml index 4005fecaab85e..410418d29d239 100644 --- a/community/unsafe/pom.xml +++ b/community/unsafe/pom.xml @@ -43,23 +43,31 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-common - ${project.version} - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - + + + org.neo4j + neo4j-common + ${project.version} + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + diff --git a/community/values/pom.xml b/community/values/pom.xml index fa2be4aaf2d78..42fe05b810fe9 100644 --- a/community/values/pom.xml +++ b/community/values/pom.xml @@ -49,37 +49,45 @@ - - - org.neo4j - neo4j-graphdb-api - ${project.version} - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.apache.commons - commons-compress - test - - - commons-codec - commons-codec - test - - + + + org.neo4j + neo4j-graphdb-api + ${project.version} + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.apache.commons + commons-compress + test + + + commons-codec + commons-codec + test + + diff --git a/enterprise/backup/pom.xml b/enterprise/backup/pom.xml index dbaf47392952c..9048af9677242 100644 --- a/enterprise/backup/pom.xml +++ b/enterprise/backup/pom.xml @@ -44,122 +44,130 @@ - - - com.google.code.findbugs - annotations - - - org.neo4j - neo4j-causal-clustering - ${project.version} - - - org.neo4j - neo4j-com - ${project.version} - + + + com.google.code.findbugs + annotations + + + org.neo4j + neo4j-causal-clustering + ${project.version} + + + org.neo4j + neo4j-com + ${project.version} + - - org.neo4j - neo4j-command-line - ${project.version} - + + org.neo4j + neo4j-command-line + ${project.version} + - - org.neo4j - neo4j-dbms - ${project.version} - - - org.neo4j - neo4j-cluster - ${project.version} - - - org.neo4j - neo4j-consistency-check - ${project.version} - + + org.neo4j + neo4j-dbms + ${project.version} + + + org.neo4j + neo4j-cluster + ${project.version} + + + org.neo4j + neo4j-consistency-check + ${project.version} + - - junit - junit - - - org.neo4j - neo4j-causal-clustering - ${project.version} - test - test-jar - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.neo4j + neo4j-causal-clustering + ${project.version} + test + test-jar + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + - - commons-io - commons-io - test - - - org.neo4j - neo4j-lucene-index - ${project.version} - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-com - ${project.version} - test-jar - test - - + + commons-io + commons-io + test + + + org.neo4j + neo4j-lucene-index + ${project.version} + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-com + ${project.version} + test-jar + test + + diff --git a/enterprise/causal-clustering/pom.xml b/enterprise/causal-clustering/pom.xml index 9058e83e14294..7e9ccaa1a050c 100644 --- a/enterprise/causal-clustering/pom.xml +++ b/enterprise/causal-clustering/pom.xml @@ -199,8 +199,16 @@ - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api diff --git a/enterprise/cluster/pom.xml b/enterprise/cluster/pom.xml index 7799a1d756681..344f92c8aaadc 100644 --- a/enterprise/cluster/pom.xml +++ b/enterprise/cluster/pom.xml @@ -93,70 +93,78 @@ - - - org.neo4j - neo4j-kernel - ${project.version} - - - io.netty - netty - - - com.google.code.findbugs - annotations - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - + + + org.neo4j + neo4j-kernel + ${project.version} + + + io.netty + netty + + + com.google.code.findbugs + annotations + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - - + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + + diff --git a/enterprise/com/pom.xml b/enterprise/com/pom.xml index 59918d69e6513..3b70f858b925a 100644 --- a/enterprise/com/pom.xml +++ b/enterprise/com/pom.xml @@ -42,78 +42,86 @@ - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - - - io.netty - netty - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + + + io.netty + netty + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + - - org.neo4j - neo4j-lucene-index - ${project.version} - test - + + org.neo4j + neo4j-lucene-index + ${project.version} + test + - + diff --git a/enterprise/cypher/spec-suite-tools/LICENSES.txt b/enterprise/cypher/spec-suite-tools/LICENSES.txt index 94fffce396454..32263387da460 100644 --- a/enterprise/cypher/spec-suite-tools/LICENSES.txt +++ b/enterprise/cypher/spec-suite-tools/LICENSES.txt @@ -23,7 +23,6 @@ Apache Software License, Version 2.0 openCypher TCK API openCypher TCK Features and Graphs org.apiguardian:apiguardian-api - org.opentest4j:opentest4j parboiled-core parboiled-scala salat-core @@ -445,291 +444,6 @@ This Agreement is governed by the laws of the State of New York and the intellec ------------------------------------------------------------------------------- -Eclipse Public License v2.0 - org.junit.jupiter:junit-jupiter-api - org.junit.platform:junit-platform-commons ------------------------------------------------------------------------------- - -Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - -"Contributor" means any person or entity that Distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which -are necessarily infringed by the use or sale of its Contribution alone -or when combined with the Program. - -"Program" means the Contributions Distributed in accordance with this -Agreement. - -"Recipient" means anyone who receives the Program under this Agreement -or any Secondary License (as applicable), including Contributors. - -"Derivative Works" shall mean any work, whether in Source Code or other -form, that is based on (or derived from) the Program and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. - -"Modified Works" shall mean any work in Source Code or other form that -results from an addition to, deletion from, or modification of the -contents of the Program, including, for purposes of clarity any new file -in Source Code form that contains any contents of the Program. Modified -Works shall not include works that contain only declarations, -interfaces, types, classes, structures, or files of the Program solely -in each case in order to link to, bind by name, or subclass the Program -or Modified Works thereof. - -"Distribute" means the acts of a) distributing or b) making available -in any manner that enables the transfer of a copy. - -"Source Code" means the form of a Program preferred for making -modifications, including but not limited to software source code, -documentation source, and configuration files. - -"Secondary License" means either the GNU General Public License, -Version 2.0, or any later versions of that license, including any -exceptions or additional permissions as identified by the initial -Contributor. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - -3. REQUIREMENTS - -3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - -3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - -3.3 Contributors may not remove or alter any copyright, patent, -trademark, attribution notices, disclaimers of warranty, or limitations -of liability ("notices") contained within the Program from any copy of -the Program which they Distribute, provided that Contributors may add -their own appropriate notices. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities -with respect to end users, business partners and the like. While this -license is intended to facilitate the commercial use of the Program, -the Contributor who includes the Program in a commercial product -offering should do so in a manner which does not create potential -liability for other Contributors. Therefore, if a Contributor includes -the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and indemnify every -other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits -and other legal actions brought by a third party against the Indemnified -Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program -in a commercial product offering. The obligations in this section do not -apply to any claims or Losses relating to any actual or alleged -intellectual property infringement. In order to qualify, an Indemnified -Contributor must: a) promptly notify the Commercial Contributor in -writing of such claim, and b) allow the Commercial Contributor to control, -and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may -participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those performance -claims and warranties, and if a court requires any other Contributor to -pay any damages as a result, the Commercial Contributor must pay -those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" -BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF -TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE. Each Recipient is solely responsible for determining the -appropriateness of using and distributing the Program and assumes all -risks associated with its exercise of rights under this Agreement, -including but not limited to the risks and costs of program errors, -compliance with applicable laws, damage to or loss of data, programs -or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS -SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further -action by the parties hereto, such provision shall be reformed to the -minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other software -or hardware) infringes such Recipient's patent(s), then such Recipient's -rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of -time after becoming aware of such noncompliance. If all Recipient's -rights under this Agreement terminate, Recipient agrees to cease use -and distribution of the Program as soon as reasonably practicable. -However, Recipient's obligations under this Agreement and any licenses -granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, -but in order to avoid inconsistency the Agreement is copyrighted and -may only be modified in the following manner. The Agreement Steward -reserves the right to publish new versions (including revisions) of -this Agreement from time to time. No one other than the Agreement -Steward has the right to modify this Agreement. The Eclipse Foundation -is the initial Agreement Steward. The Eclipse Foundation may assign the -responsibility to serve as the Agreement Steward to a suitable separate -entity. Each new version of the Agreement will be given a distinguishing -version number. The Program (including Contributions) may always be -Distributed subject to the version of the Agreement under which it was -received. In addition, after a new version of the Agreement is published, -Contributor may elect to Distribute the Program (including its -Contributions) under the new version. - -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient -receives no rights or licenses to the intellectual property of any -Contributor under this Agreement, whether expressly, by implication, -estoppel or otherwise. All rights in the Program not expressly granted -under this Agreement are reserved. Nothing in this Agreement is intended -to be enforceable by any entity that is not a Contributor or Recipient. -No third-party beneficiary rights are created under this Agreement. - -Exhibit A - Form of Secondary Licenses Notice - -"This Source Code may also be made available under the following -Secondary Licenses when the conditions for such availability set forth -in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), -version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - - ------------------------------------------------------------------------------ MIT License Gherkin diff --git a/enterprise/cypher/spec-suite-tools/NOTICE.txt b/enterprise/cypher/spec-suite-tools/NOTICE.txt index 5ece8d73a6d7a..56fba3c1f5e90 100644 --- a/enterprise/cypher/spec-suite-tools/NOTICE.txt +++ b/enterprise/cypher/spec-suite-tools/NOTICE.txt @@ -45,7 +45,6 @@ Apache Software License, Version 2.0 openCypher TCK API openCypher TCK Features and Graphs org.apiguardian:apiguardian-api - org.opentest4j:opentest4j parboiled-core parboiled-scala salat-core @@ -71,10 +70,6 @@ Eclipse Public License - v 1.0 Eclipse Collections API Eclipse Collections Main Library -Eclipse Public License v2.0 - org.junit.jupiter:junit-jupiter-api - org.junit.platform:junit-platform-commons - MIT License Gherkin SLF4J API Module diff --git a/enterprise/deferred-locks/pom.xml b/enterprise/deferred-locks/pom.xml index 9fff7508680c4..dd9741c42d716 100644 --- a/enterprise/deferred-locks/pom.xml +++ b/enterprise/deferred-locks/pom.xml @@ -45,70 +45,78 @@ - + - - org.neo4j - neo4j-kernel - ${project.version} - + + org.neo4j + neo4j-kernel + ${project.version} + - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - commons-codec - commons-codec - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + commons-codec + commons-codec + - + diff --git a/enterprise/fulltext-addon/pom.xml b/enterprise/fulltext-addon/pom.xml index b1088cc67e419..c8f9c00cc6d74 100644 --- a/enterprise/fulltext-addon/pom.xml +++ b/enterprise/fulltext-addon/pom.xml @@ -45,75 +45,83 @@ - + - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-lucene-index - ${project.version} - + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-lucene-index + ${project.version} + - + - - org.neo4j - neo4j-cypher - ${project.version} - test - - - org.neo4j - neo4j-backup - ${project.version} - test - - - org.neo4j - neo4j-consistency-check - ${project.version} - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - commons-codec - commons-codec - - + + org.neo4j + neo4j-cypher + ${project.version} + test + + + org.neo4j + neo4j-backup + ${project.version} + test + + + org.neo4j + neo4j-consistency-check + ${project.version} + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + commons-codec + commons-codec + + diff --git a/enterprise/ha/pom.xml b/enterprise/ha/pom.xml index e4da34eb92851..ed8b546ead56c 100644 --- a/enterprise/ha/pom.xml +++ b/enterprise/ha/pom.xml @@ -105,162 +105,170 @@ - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-jmx - ${project.version} - provided - - - org.neo4j - neo4j-management - ${project.version} - provided - - - org.neo4j - neo4j-backup - ${project.version} - - - org.neo4j - neo4j-lucene-index - ${project.version} - - - org.neo4j - neo4j-com - ${project.version} - - - org.neo4j - neo4j-cluster - ${project.version} - - - org.neo4j - neo4j-shell - ${project.version} - provided - - - org.neo4j - neo4j-cypher - ${project.version} - test - - - org.neo4j - neo4j-security-enterprise - ${project.version} - + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-jmx + ${project.version} + provided + + + org.neo4j + neo4j-management + ${project.version} + provided + + + org.neo4j + neo4j-backup + ${project.version} + + + org.neo4j + neo4j-lucene-index + ${project.version} + + + org.neo4j + neo4j-com + ${project.version} + + + org.neo4j + neo4j-cluster + ${project.version} + + + org.neo4j + neo4j-shell + ${project.version} + provided + + + org.neo4j + neo4j-cypher + ${project.version} + test + + + org.neo4j + neo4j-security-enterprise + ${project.version} + - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + - - org.neo4j - neo4j-slf4j - ${project.version} - test - - - org.neo4j - neo4j-backup - ${project.version} - test-jar - test - - - org.neo4j - neo4j-com - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-cluster - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-consistency-check - ${project.version} - test-jar - test - - - commons-io - commons-io - test - - - org.neo4j - neo4j-kernel - ${project.version} - - + + org.neo4j + neo4j-slf4j + ${project.version} + test + + + org.neo4j + neo4j-backup + ${project.version} + test-jar + test + + + org.neo4j + neo4j-com + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-cluster + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-consistency-check + ${project.version} + test-jar + test + + + commons-io + commons-io + test + + + org.neo4j + neo4j-kernel + ${project.version} + + diff --git a/enterprise/management/pom.xml b/enterprise/management/pom.xml index 6104cc26bb9fe..7775932b40205 100644 --- a/enterprise/management/pom.xml +++ b/enterprise/management/pom.xml @@ -60,55 +60,63 @@ - - - org.neo4j - neo4j-jmx - ${project.version} - provided - - - - junit - junit - - - commons-codec - commons-codec - - - org.neo4j - neo4j-kernel - ${project.version} - provided - - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - + + + org.neo4j + neo4j-jmx + ${project.version} + provided + + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.neo4j + neo4j-kernel + ${project.version} + provided + + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.mockito - mockito-core - - + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.mockito + mockito-core + + diff --git a/enterprise/metrics/pom.xml b/enterprise/metrics/pom.xml index d9439347e1eeb..0519a75fe2c08 100644 --- a/enterprise/metrics/pom.xml +++ b/enterprise/metrics/pom.xml @@ -21,171 +21,179 @@ org.neo4j.metrics - - - org.neo4j - neo4j-ha - ${project.version} - provided - + + + org.neo4j + neo4j-ha + ${project.version} + provided + - - org.neo4j - neo4j-causal-clustering - ${project.version} - provided - + + org.neo4j + neo4j-causal-clustering + ${project.version} + provided + - - org.neo4j - neo4j-bolt - ${project.version} - provided - + + org.neo4j + neo4j-bolt + ${project.version} + provided + - - org.neo4j - neo4j-io - ${project.version} - provided - + + org.neo4j + neo4j-io + ${project.version} + provided + - - org.neo4j - neo4j-com - ${project.version} - provided - - - org.neo4j - neo4j-cluster - ${project.version} - provided - - - org.neo4j - neo4j-cypher - ${project.version} - provided - + + org.neo4j + neo4j-com + ${project.version} + provided + + + org.neo4j + neo4j-cluster + ${project.version} + provided + + + org.neo4j + neo4j-cypher + ${project.version} + provided + - - org.neo4j - neo4j-lucene-index - ${project.version} - test - - - org.neo4j - neo4j-management - ${project.version} - test - + + org.neo4j + neo4j-lucene-index + ${project.version} + test + + + org.neo4j + neo4j-management + ${project.version} + test + - - org.neo4j - neo4j-kernel - ${project.version} - test - test-jar - - - org.neo4j - neo4j-common - ${project.version} - test - test-jar - - - org.neo4j - neo4j-ha - ${project.version} - test - test-jar - - - org.neo4j - neo4j-cluster - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test - test-jar - - - org.neo4j - neo4j-causal-clustering - ${project.version} - test - test-jar - - - org.neo4j - neo4j-bolt - ${project.version} - test - test-jar - + + org.neo4j + neo4j-kernel + ${project.version} + test + test-jar + + + org.neo4j + neo4j-common + ${project.version} + test + test-jar + + + org.neo4j + neo4j-ha + ${project.version} + test + test-jar + + + org.neo4j + neo4j-cluster + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test + test-jar + + + org.neo4j + neo4j-causal-clustering + ${project.version} + test + test-jar + + + org.neo4j + neo4j-bolt + ${project.version} + test + test-jar + - - io.dropwizard.metrics - metrics-core - - - io.dropwizard.metrics - metrics-graphite - - - com.rabbitmq - amqp-client - - - + + io.dropwizard.metrics + metrics-core + + + io.dropwizard.metrics + metrics-graphite + + + com.rabbitmq + amqp-client + + + - - - io.prometheus - simpleclient - ${prometheus.client.version} - - - io.prometheus - simpleclient_httpserver - ${prometheus.client.version} - - - io.prometheus - simpleclient_dropwizard - ${prometheus.client.version} - + + + io.prometheus + simpleclient + ${prometheus.client.version} + + + io.prometheus + simpleclient_httpserver + ${prometheus.client.version} + + + io.prometheus + simpleclient_dropwizard + ${prometheus.client.version} + - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-all - - - org.mockito - mockito-core - - - org.neo4j - neo4j-com - ${project.version} - test-jar - test - - + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-all + + + org.mockito + mockito-core + + + org.neo4j + neo4j-com + ${project.version} + test-jar + test + + diff --git a/enterprise/neo4j-enterprise/pom.xml b/enterprise/neo4j-enterprise/pom.xml index c567c5fba52a6..1fb56c7355829 100644 --- a/enterprise/neo4j-enterprise/pom.xml +++ b/enterprise/neo4j-enterprise/pom.xml @@ -47,142 +47,150 @@ - - - org.neo4j - neo4j - ${project.version} - - - org.neo4j - neo4j-query-logging - ${project.version} - - - org.neo4j - neo4j-com - ${project.version} - - - org.neo4j - neo4j-backup - ${project.version} - - - org.neo4j - neo4j-ha - ${project.version} - - - org.neo4j - neo4j-causal-clustering - ${project.version} - - - org.neo4j - neo4j-metrics - ${project.version} - - - org.neo4j - neo4j-management - ${project.version} - - - org.neo4j - neo4j-security-enterprise - ${project.version} - - - org.neo4j - neo4j-bolt - ${project.version} - + + + org.neo4j + neo4j + ${project.version} + + + org.neo4j + neo4j-query-logging + ${project.version} + + + org.neo4j + neo4j-com + ${project.version} + + + org.neo4j + neo4j-backup + ${project.version} + + + org.neo4j + neo4j-ha + ${project.version} + + + org.neo4j + neo4j-causal-clustering + ${project.version} + + + org.neo4j + neo4j-metrics + ${project.version} + + + org.neo4j + neo4j-management + ${project.version} + + + org.neo4j + neo4j-security-enterprise + ${project.version} + + + org.neo4j + neo4j-bolt + ${project.version} + - - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + - - org.neo4j - neo4j - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-ha - ${project.version} - test-jar - test - - - org.neo4j - neo4j-cluster - ${project.version} - test-jar - test - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-consistency-check - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - + + org.neo4j + neo4j + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-ha + ${project.version} + test-jar + test + + + org.neo4j + neo4j-cluster + ${project.version} + test-jar + test + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-consistency-check + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + diff --git a/enterprise/neo4j-harness-enterprise/pom.xml b/enterprise/neo4j-harness-enterprise/pom.xml index 018f06e871bdc..db94b13b497a4 100644 --- a/enterprise/neo4j-harness-enterprise/pom.xml +++ b/enterprise/neo4j-harness-enterprise/pom.xml @@ -68,6 +68,18 @@ provided true + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + org.apache.httpcomponents diff --git a/enterprise/procedure-compiler-enterprise-tests/pom.xml b/enterprise/procedure-compiler-enterprise-tests/pom.xml index 665f61f232ba8..8d7ccca0fbedf 100644 --- a/enterprise/procedure-compiler-enterprise-tests/pom.xml +++ b/enterprise/procedure-compiler-enterprise-tests/pom.xml @@ -54,8 +54,16 @@ true - junit - junit + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api com.google.testing.compile diff --git a/enterprise/query-logging/pom.xml b/enterprise/query-logging/pom.xml index bfa313feff8a4..f45538d68771b 100644 --- a/enterprise/query-logging/pom.xml +++ b/enterprise/query-logging/pom.xml @@ -45,122 +45,130 @@ - - - org.neo4j - neo4j-kernel - ${project.version} - - - - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-common - test-jar - test - ${project.version} - - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-cypher - ${project.version} - test - - - - org.neo4j - neo4j-shell - ${project.version} - test - - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-security - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-security-enterprise - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-security-enterprise - ${project.version} - test - - - - org.neo4j - neo4j-bolt - ${project.version} - test - - - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.apache.commons - commons-lang3 - test - - + + + org.neo4j + neo4j-kernel + ${project.version} + + + + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-common + test-jar + test + ${project.version} + + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-cypher + ${project.version} + test + + + + org.neo4j + neo4j-shell + ${project.version} + test + + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-security + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-security-enterprise + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-security-enterprise + ${project.version} + test + + + + org.neo4j + neo4j-bolt + ${project.version} + test + + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.apache.commons + commons-lang3 + test + + diff --git a/enterprise/security/pom.xml b/enterprise/security/pom.xml index ada5fb3bf32c7..1892cf24378e5 100644 --- a/enterprise/security/pom.xml +++ b/enterprise/security/pom.xml @@ -55,153 +55,161 @@ - - - - org.neo4j - neo4j-kernel - ${project.version} - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - - - org.neo4j - neo4j-security - ${project.version} - - - org.neo4j - neo4j-auth-plugin-api - ${project.version} - - - org.neo4j - neo4j-dbms - ${project.version} - - - org.apache.shiro - shiro-core - - - com.github.ben-manes.caffeine - caffeine - - - org.slf4j - slf4j-nop - + + + + org.neo4j + neo4j-kernel + ${project.version} + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + + + org.neo4j + neo4j-security + ${project.version} + + + org.neo4j + neo4j-auth-plugin-api + ${project.version} + + + org.neo4j + neo4j-dbms + ${project.version} + + + org.apache.shiro + shiro-core + + + com.github.ben-manes.caffeine + caffeine + + + org.slf4j + slf4j-nop + - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-security - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-enterprise-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-cypher - ${project.version} - test - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - org.neo4j - neo4j-bolt - ${project.version} - test - - - org.neo4j - neo4j-bolt - ${project.version} - test-jar - test - - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - org.apache.directory.server - apacheds-server-integ - test - - - org.apache.commons - commons-lang3 - test - - - org.eclipse.jetty.websocket - websocket-client - test - - - org.eclipse.jetty - jetty-server - test - - - com.google.guava - guava-testlib - test - - + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-security + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-enterprise-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-cypher + ${project.version} + test + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + org.neo4j + neo4j-bolt + ${project.version} + test + + + org.neo4j + neo4j-bolt + ${project.version} + test-jar + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + org.apache.directory.server + apacheds-server-integ + test + + + org.apache.commons + commons-lang3 + test + + + org.eclipse.jetty.websocket + websocket-client + test + + + org.eclipse.jetty + jetty-server + test + + + com.google.guava + guava-testlib + test + + diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml index 579eb9890be1e..194dfacf5e5d1 100644 --- a/enterprise/server-enterprise/pom.xml +++ b/enterprise/server-enterprise/pom.xml @@ -48,156 +48,164 @@ - - - org.neo4j.app - neo4j-server - ${project.version} - - - org.neo4j - neo4j-enterprise-cypher - ${project.version} - - - org.neo4j - neo4j-enterprise - ${project.version} - - - org.neo4j - neo4j-security-enterprise - ${project.version} - - - - com.google.code.findbugs - annotations - - - - - junit - junit - - - commons-codec - commons-codec - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.mockito - mockito-core - - - com.google.code.gson - gson - test - - - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-kernel - ${project.version} - test-jar - test - - - org.neo4j - neo4j-security-enterprise - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-io - ${project.version} - test-jar - test - - - org.neo4j - neo4j-ha - ${project.version} - test-jar - test - - - org.neo4j - neo4j-metrics - ${project.version} - test-jar - test - - - org.neo4j - neo4j-bolt - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-security - ${project.version} - test-jar - test - - - - org.neo4j - neo4j-logging - ${project.version} - test-jar - test - - - - org.neo4j.app - neo4j-server - ${project.version} - test-jar - test - - - - com.sun.jersey - jersey-client - test - - - - org.neo4j - neo4j-shell - ${project.version} - runtime - - - - org.neo4j - neo4j-com - ${project.version} - test-jar - test - - + + + org.neo4j.app + neo4j-server + ${project.version} + + + org.neo4j + neo4j-enterprise-cypher + ${project.version} + + + org.neo4j + neo4j-enterprise + ${project.version} + + + org.neo4j + neo4j-security-enterprise + ${project.version} + + + + com.google.code.findbugs + annotations + + + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + commons-codec + commons-codec + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.mockito + mockito-core + + + com.google.code.gson + gson + test + + + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-kernel + ${project.version} + test-jar + test + + + org.neo4j + neo4j-security-enterprise + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-io + ${project.version} + test-jar + test + + + org.neo4j + neo4j-ha + ${project.version} + test-jar + test + + + org.neo4j + neo4j-metrics + ${project.version} + test-jar + test + + + org.neo4j + neo4j-bolt + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-security + ${project.version} + test-jar + test + + + + org.neo4j + neo4j-logging + ${project.version} + test-jar + test + + + + org.neo4j.app + neo4j-server + ${project.version} + test-jar + test + + + + com.sun.jersey + jersey-client + test + + + + org.neo4j + neo4j-shell + ${project.version} + runtime + + + + org.neo4j + neo4j-com + ${project.version} + test-jar + test + + diff --git a/integrationtests/pom.xml b/integrationtests/pom.xml index 247786207a511..7fb209bfbfd55 100644 --- a/integrationtests/pom.xml +++ b/integrationtests/pom.xml @@ -219,14 +219,16 @@ test - junit - junit - - - hamcrest-core - org.hamcrest - - + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api org.mockito diff --git a/pom.xml b/pom.xml index e89e2a01e68dc..1359ceb4366f3 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,8 @@ 1.8 1.19.3 + 5.2.0 + 1.2.0 true @@ -384,6 +386,23 @@ **/*IntegrationTest.class + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.vintage + junit-vintage-engine + ${junit.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + + org.apache.maven.plugins @@ -407,6 +426,23 @@ ${test.runner.jvm} + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.vintage + junit-vintage-engine + ${junit.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + + integration-test @@ -1053,9 +1089,29 @@ - junit - junit - 4.12 + org.apache.maven.surefire + surefire-logger-api + 2.21.0 + + test + true + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} test @@ -1374,6 +1430,12 @@ ${findbugs.version} provided + + junit + junit + 4.12 + provided + com.google.testing.compile compile-testing diff --git a/stresstests/pom.xml b/stresstests/pom.xml index 41e5ef54c1d34..551c169f5583a 100644 --- a/stresstests/pom.xml +++ b/stresstests/pom.xml @@ -45,107 +45,115 @@ - - - junit - junit - - - org.hamcrest - hamcrest-core - - - org.hamcrest - hamcrest-library - - - org.hdrhistogram - HdrHistogram - 2.1.2 - test - + + + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + + org.hdrhistogram + HdrHistogram + 2.1.2 + test + - - org.neo4j - neo4j-common - ${project.version} - test-jar - test - - - org.neo4j - neo4j-io - ${project.version} - test - - - org.neo4j - neo4j-io - ${project.version} - test - test-jar - - - org.neo4j - neo4j-kernel - ${project.version} - test - - - org.neo4j - neo4j-kernel - ${project.version} - test - test-jar - - - org.neo4j - neo4j-backup - ${project.version} - test - - - org.neo4j - neo4j-backup - ${project.version} - test - test-jar - - - org.neo4j - neo4j-lucene-index - ${project.version} - test - - - org.neo4j - neo4j-consistency-check - ${project.version} - test - - - org.neo4j - neo4j-causal-clustering - ${project.version} - test - - - org.neo4j - neo4j-causal-clustering - ${project.version} - test - test-jar - - - commons-codec - commons-codec - - - org.neo4j - neo4j-com - ${project.version} - test-jar - test - - + + org.neo4j + neo4j-common + ${project.version} + test-jar + test + + + org.neo4j + neo4j-io + ${project.version} + test + + + org.neo4j + neo4j-io + ${project.version} + test + test-jar + + + org.neo4j + neo4j-kernel + ${project.version} + test + + + org.neo4j + neo4j-kernel + ${project.version} + test + test-jar + + + org.neo4j + neo4j-backup + ${project.version} + test + + + org.neo4j + neo4j-backup + ${project.version} + test + test-jar + + + org.neo4j + neo4j-lucene-index + ${project.version} + test + + + org.neo4j + neo4j-consistency-check + ${project.version} + test + + + org.neo4j + neo4j-causal-clustering + ${project.version} + test + + + org.neo4j + neo4j-causal-clustering + ${project.version} + test + test-jar + + + commons-codec + commons-codec + + + org.neo4j + neo4j-com + ${project.version} + test-jar + test + + diff --git a/tools/pom.xml b/tools/pom.xml index e85e2fa575f83..a173e67741895 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -91,14 +91,16 @@ - junit - junit - - - hamcrest-core - org.hamcrest - - + org.junit.jupiter + junit-jupiter-migrationsupport + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.maven.surefire + surefire-logger-api commons-codec