diff --git a/terasoluna-gfw-common/src/etc/header-definition.xml b/license/header-definition.xml similarity index 100% rename from terasoluna-gfw-common/src/etc/header-definition.xml rename to license/header-definition.xml diff --git a/terasoluna-gfw-common/src/etc/header.txt b/license/header.txt similarity index 100% rename from terasoluna-gfw-common/src/etc/header.txt rename to license/header.txt diff --git a/terasoluna-gfw-parent/pom.xml b/terasoluna-gfw-parent/pom.xml index d98aba78b..69d34e9be 100644 --- a/terasoluna-gfw-parent/pom.xml +++ b/terasoluna-gfw-parent/pom.xml @@ -89,13 +89,13 @@ maven-license-plugin ${com.google.code.maven-license-plugin.version} -
src/etc/header.txt
+
${project.basedir}/../license/header.txt
src/**/*.java ${encoding} - src/etc/header-definition.xml + ${project.basedir}/../license/header-definition.xml
diff --git a/terasoluna-gfw-security-web/src/etc/header-definition.xml b/terasoluna-gfw-security-web/src/etc/header-definition.xml deleted file mode 100644 index 5423dd39a..000000000 --- a/terasoluna-gfw-security-web/src/etc/header-definition.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - /* - * - */ - true - false - (\s|\t)*/\*.*$ - .*\*/(\s|\t)*$ - - diff --git a/terasoluna-gfw-security-web/src/etc/header.txt b/terasoluna-gfw-security-web/src/etc/header.txt deleted file mode 100644 index 28a0d0042..000000000 --- a/terasoluna-gfw-security-web/src/etc/header.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2013-2015 terasoluna.org - -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/terasoluna-gfw-web/src/etc/header-definition.xml b/terasoluna-gfw-web/src/etc/header-definition.xml deleted file mode 100644 index 5423dd39a..000000000 --- a/terasoluna-gfw-web/src/etc/header-definition.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - /* - * - */ - true - false - (\s|\t)*/\*.*$ - .*\*/(\s|\t)*$ - - diff --git a/terasoluna-gfw-web/src/etc/header.txt b/terasoluna-gfw-web/src/etc/header.txt deleted file mode 100644 index 28a0d0042..000000000 --- a/terasoluna-gfw-web/src/etc/header.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2013-2015 terasoluna.org - -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.