diff --git a/build/pom.xml b/build/pom.xml new file mode 100644 index 0000000000000..1fe4e66df377b --- /dev/null +++ b/build/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + + org.neo4j.build + resources + 3.4.1-SNAPSHOT + + Neo4j - Build resources + + + + + com.mycila + license-maven-plugin + + + check-licenses + none + + + + + + diff --git a/community/licensecheck-config/src/main/resources/Apache Software License, Version 2.0 b/build/src/main/resources/Apache Software License, Version 2.0 similarity index 100% rename from community/licensecheck-config/src/main/resources/Apache Software License, Version 2.0 rename to build/src/main/resources/Apache Software License, Version 2.0 diff --git a/community/licensecheck-config/src/main/resources/BSD - Scala License b/build/src/main/resources/BSD - Scala License similarity index 100% rename from community/licensecheck-config/src/main/resources/BSD - Scala License rename to build/src/main/resources/BSD - Scala License diff --git a/community/licensecheck-config/src/main/resources/BSD License b/build/src/main/resources/BSD License similarity index 100% rename from community/licensecheck-config/src/main/resources/BSD License rename to build/src/main/resources/BSD License diff --git a/community/licensecheck-config/src/main/resources/BSD License 2-clause b/build/src/main/resources/BSD License 2-clause similarity index 100% rename from community/licensecheck-config/src/main/resources/BSD License 2-clause rename to build/src/main/resources/BSD License 2-clause diff --git a/community/licensecheck-config/src/main/resources/Bouncy Castle License b/build/src/main/resources/Bouncy Castle License similarity index 100% rename from community/licensecheck-config/src/main/resources/Bouncy Castle License rename to build/src/main/resources/Bouncy Castle License diff --git a/community/licensecheck-config/src/main/resources/Common Development and Distribution License Version 1.1 b/build/src/main/resources/Common Development and Distribution License Version 1.1 similarity index 100% rename from community/licensecheck-config/src/main/resources/Common Development and Distribution License Version 1.1 rename to build/src/main/resources/Common Development and Distribution License Version 1.1 diff --git a/community/licensecheck-config/src/main/resources/Common Development and Distribution License Version 1.1 and GNU General Public License, version 2 with the Classpath Exception b/build/src/main/resources/Common Development and Distribution License Version 1.1 and GNU General Public License, version 2 with the Classpath Exception similarity index 100% rename from community/licensecheck-config/src/main/resources/Common Development and Distribution License Version 1.1 and GNU General Public License, version 2 with the Classpath Exception rename to build/src/main/resources/Common Development and Distribution License Version 1.1 and GNU General Public License, version 2 with the Classpath Exception diff --git a/community/licensecheck-config/src/main/resources/Eclipse Public License v2.0 b/build/src/main/resources/Eclipse Public License v2.0 similarity index 100% rename from community/licensecheck-config/src/main/resources/Eclipse Public License v2.0 rename to build/src/main/resources/Eclipse Public License v2.0 diff --git a/community/licensecheck-config/src/main/resources/GNU General Public License, version 2 b/build/src/main/resources/GNU General Public License, version 2 similarity index 100% rename from community/licensecheck-config/src/main/resources/GNU General Public License, version 2 rename to build/src/main/resources/GNU General Public License, version 2 diff --git a/community/licensecheck-config/src/main/resources/GNU General Public License, version 2 or later b/build/src/main/resources/GNU General Public License, version 2 or later similarity index 100% rename from community/licensecheck-config/src/main/resources/GNU General Public License, version 2 or later rename to build/src/main/resources/GNU General Public License, version 2 or later diff --git a/community/licensecheck-config/src/main/resources/GNU General Public License, version 2 with the Classpath Exception b/build/src/main/resources/GNU General Public License, version 2 with the Classpath Exception similarity index 100% rename from community/licensecheck-config/src/main/resources/GNU General Public License, version 2 with the Classpath Exception rename to build/src/main/resources/GNU General Public License, version 2 with the Classpath Exception diff --git a/community/licensecheck-config/src/main/resources/GNU Lesser General Public License, Version 2.1 b/build/src/main/resources/GNU Lesser General Public License, Version 2.1 similarity index 100% rename from community/licensecheck-config/src/main/resources/GNU Lesser General Public License, Version 2.1 rename to build/src/main/resources/GNU Lesser General Public License, Version 2.1 diff --git a/community/licensecheck-config/src/main/resources/ISC b/build/src/main/resources/ISC similarity index 100% rename from community/licensecheck-config/src/main/resources/ISC rename to build/src/main/resources/ISC diff --git a/community/licensecheck-config/src/main/resources/MIT License b/build/src/main/resources/MIT License similarity index 100% rename from community/licensecheck-config/src/main/resources/MIT License rename to build/src/main/resources/MIT License diff --git a/community/licensecheck-config/src/main/resources/Mozilla Public License, Version 2.0 b/build/src/main/resources/Mozilla Public License, Version 2.0 similarity index 100% rename from community/licensecheck-config/src/main/resources/Mozilla Public License, Version 2.0 rename to build/src/main/resources/Mozilla Public License, Version 2.0 diff --git a/community/licensecheck-config/src/main/resources/SIL OFL 1.1 b/build/src/main/resources/SIL OFL 1.1 similarity index 100% rename from community/licensecheck-config/src/main/resources/SIL OFL 1.1 rename to build/src/main/resources/SIL OFL 1.1 diff --git a/build/checkstyle.xml b/build/src/main/resources/checkstyle/checkstyle.xml similarity index 100% rename from build/checkstyle.xml rename to build/src/main/resources/checkstyle/checkstyle.xml diff --git a/build/AGPL-3-header.txt b/build/src/main/resources/headers/AGPL-3-header.txt similarity index 92% rename from build/AGPL-3-header.txt rename to build/src/main/resources/headers/AGPL-3-header.txt index 21b13878901b1..74c427af82298 100644 --- a/build/AGPL-3-header.txt +++ b/build/src/main/resources/headers/AGPL-3-header.txt @@ -1,4 +1,4 @@ -Copyright (c) ${inceptionYear}-${currentYear} "Neo4j," +Copyright (c) ${project.inceptionYear}-${currentYear} "Neo4j," Neo4j Sweden AB [http://neo4j.com] This file is part of Neo4j Enterprise Edition. The included source diff --git a/community/cypher/expressions-3.4/ASL-2-header.txt b/build/src/main/resources/headers/ASL-2-header.txt similarity index 89% rename from community/cypher/expressions-3.4/ASL-2-header.txt rename to build/src/main/resources/headers/ASL-2-header.txt index 1b3ee0d0275c9..ac9194068defc 100644 --- a/community/cypher/expressions-3.4/ASL-2-header.txt +++ b/build/src/main/resources/headers/ASL-2-header.txt @@ -1,4 +1,4 @@ -Copyright (c) ${inceptionYear}-${currentYear} "Neo4j," +Copyright (c) ${project.inceptionYear}-${currentYear} "Neo4j," Neo4j Sweden AB [http://neo4j.com] Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/GPL-3-header.txt b/build/src/main/resources/headers/GPL-3-header.txt similarity index 91% rename from build/GPL-3-header.txt rename to build/src/main/resources/headers/GPL-3-header.txt index d52d22e29dd87..e603bec2e529d 100644 --- a/build/GPL-3-header.txt +++ b/build/src/main/resources/headers/GPL-3-header.txt @@ -1,4 +1,4 @@ -Copyright (c) ${inceptionYear}-${currentYear} "Neo4j," +Copyright (c) ${project.inceptionYear}-${currentYear} "Neo4j," Neo4j Sweden AB [http://neo4j.com] This file is part of Neo4j. diff --git a/community/licensecheck-config/src/main/resources/licensing-requirements-base.xml b/build/src/main/resources/licensing/licensing-requirements-base.xml similarity index 93% rename from community/licensecheck-config/src/main/resources/licensing-requirements-base.xml rename to build/src/main/resources/licensing/licensing-requirements-base.xml index 78e00ff71da96..58b3b6976a274 100644 --- a/community/licensecheck-config/src/main/resources/licensing-requirements-base.xml +++ b/build/src/main/resources/licensing/licensing-requirements-base.xml @@ -7,17 +7,17 @@ This file is part of Neo4j. Neo4j is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . + You should have received a copy of the GNU General Public License + along with this program. If not, see . --> diff --git a/community/licensecheck-config/src/main/resources/licensing-requirements-browser.xml b/build/src/main/resources/licensing/licensing-requirements-browser.xml similarity index 98% rename from community/licensecheck-config/src/main/resources/licensing-requirements-browser.xml rename to build/src/main/resources/licensing/licensing-requirements-browser.xml index 2aea7725aeae8..80a6f110002a2 100644 --- a/community/licensecheck-config/src/main/resources/licensing-requirements-browser.xml +++ b/build/src/main/resources/licensing/licensing-requirements-browser.xml @@ -7,17 +7,17 @@ This file is part of Neo4j. Neo4j is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . + You should have received a copy of the GNU General Public License + along with this program. If not, see . --> diff --git a/community/licensecheck-config/src/main/resources/list-prefix.txt b/build/src/main/resources/licensing/list-prefix.txt similarity index 100% rename from community/licensecheck-config/src/main/resources/list-prefix.txt rename to build/src/main/resources/licensing/list-prefix.txt diff --git a/community/licensecheck-config/src/main/resources/notice-agpl-prefix.txt b/build/src/main/resources/licensing/notice-agpl-prefix.txt similarity index 100% rename from community/licensecheck-config/src/main/resources/notice-agpl-prefix.txt rename to build/src/main/resources/licensing/notice-agpl-prefix.txt diff --git a/community/licensecheck-config/src/main/resources/notice-asl-prefix.txt b/build/src/main/resources/licensing/notice-asl-prefix.txt similarity index 100% rename from community/licensecheck-config/src/main/resources/notice-asl-prefix.txt rename to build/src/main/resources/licensing/notice-asl-prefix.txt diff --git a/community/licensecheck-config/src/main/resources/notice-gpl-prefix.txt b/build/src/main/resources/licensing/notice-gpl-prefix.txt similarity index 100% rename from community/licensecheck-config/src/main/resources/notice-gpl-prefix.txt rename to build/src/main/resources/licensing/notice-gpl-prefix.txt diff --git a/community/bolt/pom.xml b/community/bolt/pom.xml index 200184d2c9a11..dbe04b7edcb3e 100644 --- a/community/bolt/pom.xml +++ b/community/bolt/pom.xml @@ -12,8 +12,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.bolt diff --git a/community/codegen/pom.xml b/community/codegen/pom.xml index 4dd15164909e7..352c82e43385e 100644 --- a/community/codegen/pom.xml +++ b/community/codegen/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.codegen diff --git a/community/collections/pom.xml b/community/collections/pom.xml index 1c5aead935849..f78fe190339b5 100644 --- a/community/collections/pom.xml +++ b/community/collections/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.collection diff --git a/community/command-line/pom.xml b/community/command-line/pom.xml index d84d0c1f197f9..26caabb07c6a6 100644 --- a/community/command-line/pom.xml +++ b/community/command-line/pom.xml @@ -15,8 +15,8 @@ jar - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.commandline diff --git a/community/common/pom.xml b/community/common/pom.xml index c2a47306e6ea4..984390829d41f 100644 --- a/community/common/pom.xml +++ b/community/common/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.common diff --git a/community/configuration/pom.xml b/community/configuration/pom.xml index 4ae6d9e24cb88..be9081af8c151 100644 --- a/community/configuration/pom.xml +++ b/community/configuration/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.configuration diff --git a/community/consistency-check/pom.xml b/community/consistency-check/pom.xml index 3fd7387c7ae82..da92402c3cc6e 100644 --- a/community/consistency-check/pom.xml +++ b/community/consistency-check/pom.xml @@ -15,9 +15,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.consistency diff --git a/community/csv/pom.xml b/community/csv/pom.xml index 2b098f2b963f2..5b1090dcba94e 100644 --- a/community/csv/pom.xml +++ b/community/csv/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.csv diff --git a/community/cypher/cypher-logical-plans-3.4/pom.xml b/community/cypher/cypher-logical-plans-3.4/pom.xml index e2748eb27b08e..d6e608e779b7a 100644 --- a/community/cypher/cypher-logical-plans-3.4/pom.xml +++ b/community/cypher/cypher-logical-plans-3.4/pom.xml @@ -18,7 +18,7 @@ org.neo4j.cypher.internal.v3_4.logical.plans - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/cypher-planner-3.4/pom.xml b/community/cypher/cypher-planner-3.4/pom.xml index 92ec9c08c8200..d68d1f44fb733 100644 --- a/community/cypher/cypher-planner-3.4/pom.xml +++ b/community/cypher/cypher-planner-3.4/pom.xml @@ -17,7 +17,7 @@ org.neo4j.cypher.internal.compiler.v3_4 - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml index 91cddecc31109..5524b9d6b3ebd 100644 --- a/community/cypher/cypher/pom.xml +++ b/community/cypher/cypher/pom.xml @@ -19,7 +19,7 @@ org.neo4j.cypher - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/expressions-3.4/pom.xml b/community/cypher/expressions-3.4/pom.xml index 532e5c3bf58aa..5b31154ea7eda 100644 --- a/community/cypher/expressions-3.4/pom.xml +++ b/community/cypher/expressions-3.4/pom.xml @@ -23,8 +23,8 @@ - notice-asl-prefix.txt - ${project.baseUri}/ASL-2-header.txt + licensing/notice-asl-prefix.txt + headers/ASL-2-header.txt org.neo4j.cypher.internal.v3_4.expressions diff --git a/community/cypher/frontend-3.4/ASL-2-header.txt b/community/cypher/frontend-3.4/ASL-2-header.txt deleted file mode 100644 index 1b3ee0d0275c9..0000000000000 --- a/community/cypher/frontend-3.4/ASL-2-header.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (c) ${inceptionYear}-${currentYear} "Neo4j," -Neo4j Sweden AB [http://neo4j.com] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/community/cypher/frontend-3.4/pom.xml b/community/cypher/frontend-3.4/pom.xml index 51444f6ff13a3..e0a267ae72678 100644 --- a/community/cypher/frontend-3.4/pom.xml +++ b/community/cypher/frontend-3.4/pom.xml @@ -35,8 +35,8 @@ - notice-asl-prefix.txt - ${project.baseUri}/ASL-2-header.txt + licensing/notice-asl-prefix.txt + headers/ASL-2-header.txt org.neo4j.cypher.internal.frontend.v3_4 diff --git a/community/cypher/interpreted-runtime/pom.xml b/community/cypher/interpreted-runtime/pom.xml index 0107280a21c18..272c2165e70ba 100644 --- a/community/cypher/interpreted-runtime/pom.xml +++ b/community/cypher/interpreted-runtime/pom.xml @@ -24,7 +24,7 @@ org.neo4j.cypher.internal.runtime.interpreted - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/ir-3.4/pom.xml b/community/cypher/ir-3.4/pom.xml index 015a8f5daf834..dd63d46691a8a 100644 --- a/community/cypher/ir-3.4/pom.xml +++ b/community/cypher/ir-3.4/pom.xml @@ -24,7 +24,7 @@ org.neo4j.cypher.internal.ir.v3_4 - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/planner-spi-3.4/pom.xml b/community/cypher/planner-spi-3.4/pom.xml index 387ca35008382..8333a0ebb62eb 100644 --- a/community/cypher/planner-spi-3.4/pom.xml +++ b/community/cypher/planner-spi-3.4/pom.xml @@ -24,7 +24,7 @@ org.neo4j.cypher.internal.planner.v3_4.spi - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml index cd7ac8d39c636..710db59f64c16 100644 --- a/community/cypher/pom.xml +++ b/community/cypher/pom.xml @@ -18,8 +18,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - notice-gpl-prefix.txt - ../../build/GPL-3-header.txt + licensing/notice-gpl-prefix.txt + headers/GPL-3-header.txt diff --git a/community/cypher/runtime-util/pom.xml b/community/cypher/runtime-util/pom.xml index aa8e1dccfdc1e..373b88364f8a0 100644 --- a/community/cypher/runtime-util/pom.xml +++ b/community/cypher/runtime-util/pom.xml @@ -24,7 +24,7 @@ org.neo4j.cypher.internal.runtime.util - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/cypher/util-3.4/ASL-2-header.txt b/community/cypher/util-3.4/ASL-2-header.txt deleted file mode 100644 index 1b3ee0d0275c9..0000000000000 --- a/community/cypher/util-3.4/ASL-2-header.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (c) ${inceptionYear}-${currentYear} "Neo4j," -Neo4j Sweden AB [http://neo4j.com] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/community/cypher/util-3.4/pom.xml b/community/cypher/util-3.4/pom.xml index 9415235b95719..2f4bb1757e670 100644 --- a/community/cypher/util-3.4/pom.xml +++ b/community/cypher/util-3.4/pom.xml @@ -23,8 +23,8 @@ - notice-asl-prefix.txt - ${project.baseUri}/ASL-2-header.txt + licensing/notice-asl-prefix.txt + headers/ASL-2-header.txt org.neo4j.cypher.internal.util.v3_4 diff --git a/community/dbms/pom.xml b/community/dbms/pom.xml index 46032643223f9..2b09069b9ec1e 100644 --- a/community/dbms/pom.xml +++ b/community/dbms/pom.xml @@ -13,8 +13,8 @@ 3.4.1-SNAPSHOT - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.dbms diff --git a/community/graph-algo/pom.xml b/community/graph-algo/pom.xml index 3c07b0318b44a..0372f9c64b04a 100644 --- a/community/graph-algo/pom.xml +++ b/community/graph-algo/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt -Dorg.neo4j.kernel.impl.api.KernelStatement.trackStatements=false diff --git a/community/graphdb-api/pom.xml b/community/graphdb-api/pom.xml index e685ee68abc01..234176d03b2a1 100644 --- a/community/graphdb-api/pom.xml +++ b/community/graphdb-api/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.graphdb diff --git a/community/import-tool/pom.xml b/community/import-tool/pom.xml index 7e2713d72e0c1..ea5e1c5e15927 100644 --- a/community/import-tool/pom.xml +++ b/community/import-tool/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.tooling.import diff --git a/community/index/pom.xml b/community/index/pom.xml index fb33b3611896e..9aea4d6554ced 100644 --- a/community/index/pom.xml +++ b/community/index/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.index diff --git a/community/io/pom.xml b/community/io/pom.xml index 1a26fb180e36c..68db50c7e2ef0 100644 --- a/community/io/pom.xml +++ b/community/io/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.io diff --git a/community/jmx/pom.xml b/community/jmx/pom.xml index 7b8aaeb5a5f3a..1cd19d22a7214 100644 --- a/community/jmx/pom.xml +++ b/community/jmx/pom.xml @@ -16,8 +16,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.jmx diff --git a/community/kernel-api/pom.xml b/community/kernel-api/pom.xml index 5d40bd583405c..8e5bf7b8a8aad 100644 --- a/community/kernel-api/pom.xml +++ b/community/kernel-api/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.internal.kernel.api diff --git a/community/kernel/pom.xml b/community/kernel/pom.xml index 522ec58db6187..5c1c7d3e180df 100644 --- a/community/kernel/pom.xml +++ b/community/kernel/pom.xml @@ -40,8 +40,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.kernel diff --git a/community/licensecheck-config/pom.xml b/community/licensecheck-config/pom.xml index 2ccecf9a9d608..b8dda57d7e5a7 100644 --- a/community/licensecheck-config/pom.xml +++ b/community/licensecheck-config/pom.xml @@ -16,8 +16,8 @@ http://components.neo4j.org/${project.artifactId} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.licensecheck @@ -69,11 +69,8 @@ - org.neo4j.build.plugins + com.mycila license-maven-plugin - - true - check-licenses diff --git a/community/licensecheck-config/src/test/java/org/neo4j/licensecheck/LicenseYearTest.java b/community/licensecheck-config/src/test/java/org/neo4j/licensecheck/LicenseYearTest.java deleted file mode 100644 index 33cc407f61321..0000000000000 --- a/community/licensecheck-config/src/test/java/org/neo4j/licensecheck/LicenseYearTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2002-2018 "Neo4j," - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.neo4j.licensecheck; - -import java.io.File; -import java.io.FileNotFoundException; -import java.net.URL; -import java.util.Calendar; -import java.util.Scanner; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.junit.Test; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; - -public class LicenseYearTest -{ - - private static final String NOTICE_GPL_FILE = "notice-gpl-prefix.txt"; - private static final String NOTICE_AGPL_FILE = "notice-agpl-prefix.txt"; - - @Test - public void testNoticePrefixYearGPL() throws FileNotFoundException - { - if ( System.getProperty( "ignoreNoticeYear" ).isEmpty() ) - { - URL resource = getClass().getClassLoader().getResource( NOTICE_GPL_FILE ); - File gplFile = new File( resource.getFile() ); - - checkYearInFile( gplFile ); - } - } - - @Test - public void testNoticePrefixYearAGPL() throws FileNotFoundException - { - if ( System.getProperty( "ignoreNoticeYear" ).isEmpty() ) - { - URL resource = getClass().getClassLoader().getResource( NOTICE_AGPL_FILE ); - File gplFile = new File( resource.getFile() ); - - checkYearInFile( gplFile ); - } - } - - private void checkYearInFile( File gplFile ) throws FileNotFoundException - { - try ( Scanner scanner = new Scanner( gplFile ) ) - { - scanner.nextLine(); // skip first line - String yearLine = scanner.nextLine(); - - Pattern p = Pattern.compile( "Copyright \u00c2??© 2002-(\\d\\d\\d\\d) Neo4j Sweden AB" ); - - Matcher m = p.matcher( yearLine ); - if ( m.find() ) - { - String yearInFile = m.group( 1 ); - - int realYear = Calendar.getInstance().get( Calendar.YEAR ); - - assertThat( "The year field in the NOTICE file header template needs to be updated. " + - "If you are building an old version of Neo4j, and/or do not care about the copyright " + - "year of its modules, set the maven parameter `-DignoreNoticeYear`", - Integer.parseInt( yearInFile ), equalTo( realYear ) ); - } - else - { - fail( "No year found in NOTICE header!" ); - } - } - } -} diff --git a/community/logging/pom.xml b/community/logging/pom.xml index b383cacbf81f0..d16caff3116a4 100644 --- a/community/logging/pom.xml +++ b/community/logging/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.logging diff --git a/community/lucene-index-upgrade/pom.xml b/community/lucene-index-upgrade/pom.xml index 420b9371a91cc..a7d6f00dc56e1 100644 --- a/community/lucene-index-upgrade/pom.xml +++ b/community/lucene-index-upgrade/pom.xml @@ -9,8 +9,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt 4.10.4 5.5.0 org.neo4j.upgrade.lucene diff --git a/community/lucene-index/pom.xml b/community/lucene-index/pom.xml index 53d97cec0cccd..e63122bdc5a79 100644 --- a/community/lucene-index/pom.xml +++ b/community/lucene-index/pom.xml @@ -16,8 +16,8 @@ Integration layer between Neo4j and Lucene, providing one possible implementatio http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.index.lucene diff --git a/community/neo4j-community/pom.xml b/community/neo4j-community/pom.xml index 3e86ded3ca525..caebd3e8cb36b 100644 --- a/community/neo4j-community/pom.xml +++ b/community/neo4j-community/pom.xml @@ -17,8 +17,8 @@ A meta package containing the most used Neo4j Community libraries. Intended use: as a Maven dependency. - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt diff --git a/community/neo4j-harness/pom.xml b/community/neo4j-harness/pom.xml index 005cdbdb0be1b..8af1d8a881c65 100644 --- a/community/neo4j-harness/pom.xml +++ b/community/neo4j-harness/pom.xml @@ -20,8 +20,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.harness diff --git a/community/neo4j-slf4j/pom.xml b/community/neo4j-slf4j/pom.xml index 05fe7ce6f186e..c83ec4725000c 100644 --- a/community/neo4j-slf4j/pom.xml +++ b/community/neo4j-slf4j/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.logging.slf4j diff --git a/community/neo4j/pom.xml b/community/neo4j/pom.xml index 727173c126096..4e849a6fa769b 100644 --- a/community/neo4j/pom.xml +++ b/community/neo4j/pom.xml @@ -17,8 +17,8 @@ A meta package containing the most used Neo4j libraries. Intended use: as a Maven dependency. - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.community diff --git a/community/pom.xml b/community/pom.xml index 1aa23dc6d91d1..1a559720f4404 100644 --- a/community/pom.xml +++ b/community/pom.xml @@ -18,7 +18,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../build/GPL-3-header.txt + headers/GPL-3-header.txt @@ -54,7 +54,6 @@ server-plugin-test consistency-check neo4j-harness - licensecheck-config dbms command-line procedure-compiler diff --git a/community/primitive-collections/pom.xml b/community/primitive-collections/pom.xml index 151d7f80b54ef..fa1817d051418 100644 --- a/community/primitive-collections/pom.xml +++ b/community/primitive-collections/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.collection.primitive diff --git a/community/procedure-api/pom.xml b/community/procedure-api/pom.xml index 80b6305e0f046..0509f85374800 100644 --- a/community/procedure-api/pom.xml +++ b/community/procedure-api/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.graphdb diff --git a/community/procedure-compiler/integration-tests/pom.xml b/community/procedure-compiler/integration-tests/pom.xml index db34526a4f7d4..3f16b8bd5ac75 100644 --- a/community/procedure-compiler/integration-tests/pom.xml +++ b/community/procedure-compiler/integration-tests/pom.xml @@ -13,7 +13,7 @@ Neo4j - Procedure Compiler Integration Tests - ../../../build/GPL-3-header.txt + headers/GPL-3-header.txt diff --git a/community/procedure-compiler/pom.xml b/community/procedure-compiler/pom.xml index 9ffbcfb26c1fa..cefd41efd46df 100644 --- a/community/procedure-compiler/pom.xml +++ b/community/procedure-compiler/pom.xml @@ -7,8 +7,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt 4.0.0 diff --git a/community/procedure-compiler/processor/pom.xml b/community/procedure-compiler/processor/pom.xml index 869fe5fb5429f..40948c8022d1a 100644 --- a/community/procedure-compiler/processor/pom.xml +++ b/community/procedure-compiler/processor/pom.xml @@ -15,8 +15,8 @@ Neo4j Stored Procedure compile-time annotation processor - ../../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.tooling.procedure diff --git a/community/resource/pom.xml b/community/resource/pom.xml index e3306d6c966bd..eeb0182ed6069 100644 --- a/community/resource/pom.xml +++ b/community/resource/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.graphdb.resourse diff --git a/community/security/pom.xml b/community/security/pom.xml index f2b1bdc304472..caad3d7d8c011 100644 --- a/community/security/pom.xml +++ b/community/security/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.server.security diff --git a/community/server-api/pom.xml b/community/server-api/pom.xml index 63f635d49487b..13a7ed114cc8b 100644 --- a/community/server-api/pom.xml +++ b/community/server-api/pom.xml @@ -17,8 +17,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.server.api diff --git a/community/server-plugin-test/pom.xml b/community/server-plugin-test/pom.xml index 177040ac9c479..ca4016235b622 100644 --- a/community/server-plugin-test/pom.xml +++ b/community/server-plugin-test/pom.xml @@ -15,8 +15,8 @@ Tests the server plugin registration functionality. - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.server.plugins diff --git a/community/server/pom.xml b/community/server/pom.xml index 7c5e618ff4d04..08cbcf7b24473 100644 --- a/community/server/pom.xml +++ b/community/server/pom.xml @@ -38,8 +38,8 @@ jar - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt ${project.version} 3.1.14 diff --git a/community/shell/pom.xml b/community/shell/pom.xml index 6e4d6d22adf70..d5e2886316d55 100644 --- a/community/shell/pom.xml +++ b/community/shell/pom.xml @@ -26,8 +26,8 @@ jline 2.12 2.12 - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.shell diff --git a/community/spatial-index/pom.xml b/community/spatial-index/pom.xml index ae981d7acd9a5..db356bbfe12d0 100644 --- a/community/spatial-index/pom.xml +++ b/community/spatial-index/pom.xml @@ -28,8 +28,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.gis.spatial.index diff --git a/community/ssl/pom.xml b/community/ssl/pom.xml index d4b6889e3a307..9dd50bcbefbcf 100644 --- a/community/ssl/pom.xml +++ b/community/ssl/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.ssl diff --git a/community/udc/pom.xml b/community/udc/pom.xml index 32b44233c31ee..e2ec87298770f 100644 --- a/community/udc/pom.xml +++ b/community/udc/pom.xml @@ -15,8 +15,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.ext.udc diff --git a/community/unsafe/pom.xml b/community/unsafe/pom.xml index f5c4ccd3ef34b..5fa4290c81359 100644 --- a/community/unsafe/pom.xml +++ b/community/unsafe/pom.xml @@ -8,8 +8,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.unsafe diff --git a/community/values/pom.xml b/community/values/pom.xml index 6d939974aff8a..cdcca12e4736d 100644 --- a/community/values/pom.xml +++ b/community/values/pom.xml @@ -9,8 +9,8 @@ - ../../build/GPL-3-header.txt - notice-gpl-prefix.txt + headers/GPL-3-header.txt + licensing/notice-gpl-prefix.txt org.neo4j.values diff --git a/enterprise/auth-plugin-api/pom.xml b/enterprise/auth-plugin-api/pom.xml index c7e5317a2954f..92bcde6c5aaf3 100644 --- a/enterprise/auth-plugin-api/pom.xml +++ b/enterprise/auth-plugin-api/pom.xml @@ -15,7 +15,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.server.security.enterprise.auth.plugin diff --git a/enterprise/backup/pom.xml b/enterprise/backup/pom.xml index 9847a3f684e64..71bd853cea3be 100644 --- a/enterprise/backup/pom.xml +++ b/enterprise/backup/pom.xml @@ -15,7 +15,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.backup diff --git a/enterprise/causal-clustering/pom.xml b/enterprise/causal-clustering/pom.xml index 2662078951b26..25f4eb3f86476 100644 --- a/enterprise/causal-clustering/pom.xml +++ b/enterprise/causal-clustering/pom.xml @@ -20,7 +20,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.causalclustering diff --git a/enterprise/cluster/pom.xml b/enterprise/cluster/pom.xml index a2ea5f7d75ba0..968ee9a93d8fd 100644 --- a/enterprise/cluster/pom.xml +++ b/enterprise/cluster/pom.xml @@ -15,7 +15,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.cluster diff --git a/enterprise/com/pom.xml b/enterprise/com/pom.xml index 024d01baced0f..748f1e076c36f 100644 --- a/enterprise/com/pom.xml +++ b/enterprise/com/pom.xml @@ -13,7 +13,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.com diff --git a/enterprise/cypher/acceptance-spec-suite/pom.xml b/enterprise/cypher/acceptance-spec-suite/pom.xml index 1b797d8578a3f..009d89d74b75e 100644 --- a/enterprise/cypher/acceptance-spec-suite/pom.xml +++ b/enterprise/cypher/acceptance-spec-suite/pom.xml @@ -25,7 +25,7 @@ - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.internal.cypher.acceptance.spec.suite diff --git a/enterprise/cypher/compatibility-spec-suite/pom.xml b/enterprise/cypher/compatibility-spec-suite/pom.xml index d6e02e4af9515..0f27c0a65ed22 100644 --- a/enterprise/cypher/compatibility-spec-suite/pom.xml +++ b/enterprise/cypher/compatibility-spec-suite/pom.xml @@ -25,7 +25,7 @@ - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.internal.cypher.compatibility.spec.suite diff --git a/enterprise/cypher/cypher/pom.xml b/enterprise/cypher/cypher/pom.xml index 7f7760bafa26f..1af25b3bbc9de 100644 --- a/enterprise/cypher/cypher/pom.xml +++ b/enterprise/cypher/cypher/pom.xml @@ -24,7 +24,7 @@ - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.cypher.enterprise diff --git a/enterprise/cypher/morsel-runtime/pom.xml b/enterprise/cypher/morsel-runtime/pom.xml index 5fcf131b6100e..ad6ff0d69dac1 100644 --- a/enterprise/cypher/morsel-runtime/pom.xml +++ b/enterprise/cypher/morsel-runtime/pom.xml @@ -18,7 +18,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.cypher.internal.runtime.vectorized diff --git a/enterprise/cypher/physical-planning/pom.xml b/enterprise/cypher/physical-planning/pom.xml index a60cf1663288c..495ed7ba57a3e 100644 --- a/enterprise/cypher/physical-planning/pom.xml +++ b/enterprise/cypher/physical-planning/pom.xml @@ -18,7 +18,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.cypher.internal.compatibility.v3_4.runtime diff --git a/enterprise/cypher/pom.xml b/enterprise/cypher/pom.xml index 73047605e3e38..3367c8f90bdfe 100644 --- a/enterprise/cypher/pom.xml +++ b/enterprise/cypher/pom.xml @@ -18,8 +18,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - notice-agpl-prefix.txt - ../../build/AGPL-3-header.txt + licensing/notice-agpl-prefix.txt + headers/AGPL-3-header.txt 1.0.0-M09 1.1.0 5.1.0 diff --git a/enterprise/cypher/slotted-runtime/pom.xml b/enterprise/cypher/slotted-runtime/pom.xml index 3ec94bd604f7d..5369e604af790 100644 --- a/enterprise/cypher/slotted-runtime/pom.xml +++ b/enterprise/cypher/slotted-runtime/pom.xml @@ -18,7 +18,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.cypher.internal.compatibility.v3_4.runtime.slotted diff --git a/enterprise/cypher/spec-suite-tools/pom.xml b/enterprise/cypher/spec-suite-tools/pom.xml index 29bb95d2a8519..f2c909e568339 100644 --- a/enterprise/cypher/spec-suite-tools/pom.xml +++ b/enterprise/cypher/spec-suite-tools/pom.xml @@ -44,7 +44,7 @@ - ../../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.internal.cypher.spec.suite.tools diff --git a/enterprise/deferred-locks/pom.xml b/enterprise/deferred-locks/pom.xml index fbbd78957263b..fb51d18b6fd23 100644 --- a/enterprise/deferred-locks/pom.xml +++ b/enterprise/deferred-locks/pom.xml @@ -18,7 +18,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.kernel.impl.locking.deferred diff --git a/enterprise/ha/pom.xml b/enterprise/ha/pom.xml index 50541030339a2..f78624d16b44a 100644 --- a/enterprise/ha/pom.xml +++ b/enterprise/ha/pom.xml @@ -19,7 +19,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.kernel.ha diff --git a/enterprise/kernel/pom.xml b/enterprise/kernel/pom.xml index e8464169617b3..91b85cbf8a423 100644 --- a/enterprise/kernel/pom.xml +++ b/enterprise/kernel/pom.xml @@ -14,7 +14,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.kernel.enterprise diff --git a/enterprise/management/pom.xml b/enterprise/management/pom.xml index 8ce11dc06388f..6d211100c5eea 100644 --- a/enterprise/management/pom.xml +++ b/enterprise/management/pom.xml @@ -18,7 +18,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.management diff --git a/enterprise/metrics/pom.xml b/enterprise/metrics/pom.xml index 504c4af81cbce..ff11a7bbbcc07 100644 --- a/enterprise/metrics/pom.xml +++ b/enterprise/metrics/pom.xml @@ -17,7 +17,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt 0.1.0 org.neo4j.metrics diff --git a/enterprise/neo4j-enterprise/pom.xml b/enterprise/neo4j-enterprise/pom.xml index cbbe2c1fc9ec2..f5d02dc5bcd89 100644 --- a/enterprise/neo4j-enterprise/pom.xml +++ b/enterprise/neo4j-enterprise/pom.xml @@ -18,7 +18,7 @@ - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.enterprise diff --git a/enterprise/neo4j-harness-enterprise/pom.xml b/enterprise/neo4j-harness-enterprise/pom.xml index 5ce52d667d971..500c7dc826537 100644 --- a/enterprise/neo4j-harness-enterprise/pom.xml +++ b/enterprise/neo4j-harness-enterprise/pom.xml @@ -20,8 +20,8 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/AGPL-3-header.txt - notice-agpl-prefix.txt + headers/AGPL-3-header.txt + licensing/notice-agpl-prefix.txt org.neo4j.harness.enterprise diff --git a/enterprise/pom.xml b/enterprise/pom.xml index feb89da1cf87d..1a68bc8ebb893 100644 --- a/enterprise/pom.xml +++ b/enterprise/pom.xml @@ -24,7 +24,7 @@ - ../build/AGPL-3-header.txt + headers/AGPL-3-header.txt diff --git a/enterprise/procedure-compiler-enterprise-tests/pom.xml b/enterprise/procedure-compiler-enterprise-tests/pom.xml index 9d0201f536829..8d1f62f9a6e44 100644 --- a/enterprise/procedure-compiler-enterprise-tests/pom.xml +++ b/enterprise/procedure-compiler-enterprise-tests/pom.xml @@ -16,7 +16,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.tooling.procedure.enterprise.tests diff --git a/enterprise/query-logging/pom.xml b/enterprise/query-logging/pom.xml index 396343c83645b..37b8aeb34c8c9 100644 --- a/enterprise/query-logging/pom.xml +++ b/enterprise/query-logging/pom.xml @@ -22,7 +22,7 @@ - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.kernel.impl.query diff --git a/enterprise/security/pom.xml b/enterprise/security/pom.xml index a28c647f94e03..2876b9e721771 100644 --- a/enterprise/security/pom.xml +++ b/enterprise/security/pom.xml @@ -15,7 +15,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.server.security.enterprise diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml index d8e9937efd380..b52b2f848feb1 100644 --- a/enterprise/server-enterprise/pom.xml +++ b/enterprise/server-enterprise/pom.xml @@ -19,7 +19,7 @@ jar - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.server.enterprise diff --git a/integrationtests/pom.xml b/integrationtests/pom.xml index ca6e87811dfc7..1612d7a384380 100644 --- a/integrationtests/pom.xml +++ b/integrationtests/pom.xml @@ -16,7 +16,7 @@ A package for cross-module integration tests. - ../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.integrationtests diff --git a/packaging/pom.xml b/packaging/pom.xml index a93df74a0fe3f..ac307db9ff039 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -19,7 +19,7 @@ http://components.neo4j.org/${project.artifactId}/${project.version} - ../build/AGPL-3-header.txt + headers/AGPL-3-header.txt diff --git a/packaging/standalone/pom.xml b/packaging/standalone/pom.xml index bf6e6e7fb27d4..09bc0b90f369f 100644 --- a/packaging/standalone/pom.xml +++ b/packaging/standalone/pom.xml @@ -33,7 +33,7 @@ - ../../build/AGPL-3-header.txt + headers/AGPL-3-header.txt ${project.version} @@ -89,7 +89,7 @@ org.neo4j.build.plugins licensing-maven-plugin - notice-agpl-prefix.txt + licensing/notice-agpl-prefix.txt ^((org.neo4j){1}|(org.neo4j.app){1}|(org.neo4j.server.plugin){1}|(org.neo4j.assembly){1})$ @@ -97,7 +97,7 @@ list-all-licenses - licensing-requirements-browser.xml + licensing/licensing-requirements-browser.xml @@ -139,7 +139,7 @@ org.neo4j.build - licensecheck-config + resources ${project.version} provided diff --git a/packaging/standalone/standalone-community/pom.xml b/packaging/standalone/standalone-community/pom.xml index 3d9b31a8ac579..75108cb0131d4 100644 --- a/packaging/standalone/standalone-community/pom.xml +++ b/packaging/standalone/standalone-community/pom.xml @@ -27,7 +27,6 @@ - ../../../build/AGPL-3-header.txt org.neo4j.server.CommunityEntryPoint @@ -104,7 +103,7 @@ terms of the relevant Commercial Agreement. org.neo4j.build.plugins licensing-maven-plugin - notice-gpl-prefix.txt + licensing/notice-gpl-prefix.txt diff --git a/pom.xml b/pom.xml index 79988a9a811f8..0bd79ace0b4c3 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ UTF-8 1.8 1.8 - notice-agpl-prefix.txt + licensing/notice-agpl-prefix.txt 5.5.5 1.59 prepare-package @@ -85,7 +85,7 @@ 0 yyMMddHHmmssSSS - build/AGPL-3-header.txt + headers/AGPL-3-header.txt 3.3.2 2.11.12 @@ -95,10 +95,12 @@ 1.8 1.19.3 - true + + 2018 + build community enterprise integrationtests @@ -470,12 +472,12 @@ - licensing-requirements-base.xml + licensing/licensing-requirements-base.xml ${project.artifactId}-${project.version}-NOTICE.txt ${project.build.directory}/../NOTICE.txt - list-prefix.txt + licensing/list-prefix.txt ${project.artifactId}-${project.version}-LICENSES.txt ${project.build.directory}/../LICENSES.txt @@ -484,7 +486,53 @@ org.neo4j.build - licensecheck-config + resources + ${project.version} + + + + + com.mycila + license-maven-plugin + 3.0 + + + check-licenses + + initialize + + check + + + + + true +
${license-text.header}
+ + src/**/*.java + src/**/*.js + src/**/*.scala + src/**/*.xml + src/**/*.feature + src/**/*.g4 + + + **/cypher-shell/* + + + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SCRIPT_STYLE + SLASHSTAR_STYLE + + + ${licensing.year} + + + + + org.neo4j.build + resources ${project.version} @@ -619,11 +667,6 @@ exec-maven-plugin 1.4.0 - - org.neo4j.build.plugins - license-maven-plugin - 3 - org.owasp dependency-check-maven @@ -660,11 +703,9 @@ maven-checkstyle-plugin 3.0.0 - build/checkstyle.xml + checkstyle/checkstyle.xml true true - ${checkstyle.strict} - ${checkstyle.strict} true @@ -673,6 +714,11 @@ checkstyle 8.8 + + org.neo4j.build + resources + ${project.version} + @@ -700,49 +746,6 @@ - - - org.neo4j.build.plugins - license-maven-plugin - - - check-licenses - - initialize - - check - - - - - true -
${license-text.header}
- - src/**/*.java - src/**/*.js - src/**/*.scala - src/**/*.xml - src/**/*.feature - src/**/*.g4 - - - **/lib/*.js - **/lib/**/*.js - **/javascript/vend/** - - - SLASHSTAR_STYLE - SLASHSTAR_STYLE - SCRIPT_STYLE - SLASHSTAR_STYLE - - currentYear - - ${project.inceptionYear} - - - - org.apache.maven.plugins @@ -775,6 +778,10 @@ org.neo4j.build.plugins licensing-maven-plugin + + com.mycila + license-maven-plugin + diff --git a/stresstests/pom.xml b/stresstests/pom.xml index 90e7115e1b826..1a8d2dcd87915 100644 --- a/stresstests/pom.xml +++ b/stresstests/pom.xml @@ -16,7 +16,7 @@ A package for stress tests. - ../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.stresstests diff --git a/tools/pom.xml b/tools/pom.xml index 3620738d50902..51dbac68db5b5 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -18,7 +18,7 @@ jar A package for low level tools. - ../build/AGPL-3-header.txt + headers/AGPL-3-header.txt org.neo4j.tools