Merge pull request #446 from terasolunaorg/issues/424_license-header-…

…1.0.x Move license header files #424
terasolunaorg · Dec 15, 2015 · 68d3413 · 68d3413
2 parents 6e55b59 + 8b789f7
commit 68d3413
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 52 deletions.
diff --git a/...-gfw-common/src/etc/header-definition.xml → license/header-definition.xml b/...-gfw-common/src/etc/header-definition.xml → license/header-definition.xml
diff --git a/terasoluna-gfw-common/src/etc/header.txt → license/header.txt b/terasoluna-gfw-common/src/etc/header.txt → license/header.txt
diff --git a/terasoluna-gfw-parent/pom.xml b/terasoluna-gfw-parent/pom.xml
@@ -89,13 +89,13 @@
                     <artifactId>maven-license-plugin</artifactId>
                     <version>${com.google.code.maven-license-plugin.version}</version>
                     <configuration>
-                        <header>src/etc/header.txt</header>
+                        <header>${project.basedir}/../license/header.txt</header>
                         <includes>
                             <include>src/**/*.java</include>
                         </includes>
                         <encoding>${encoding}</encoding>
                         <headerDefinitions>
-                            <headerDefinition>src/etc/header-definition.xml</headerDefinition>
+                            <headerDefinition>${project.basedir}/../license/header-definition.xml</headerDefinition>
                         </headerDefinitions>
                     </configuration>
                 </plugin>

diff --git a/terasoluna-gfw-security-web/src/etc/header-definition.xml b/terasoluna-gfw-security-web/src/etc/header-definition.xml
diff --git a/terasoluna-gfw-security-web/src/etc/header.txt b/terasoluna-gfw-security-web/src/etc/header.txt
diff --git a/terasoluna-gfw-web/src/etc/header-definition.xml b/terasoluna-gfw-web/src/etc/header-definition.xml
diff --git a/terasoluna-gfw-web/src/etc/header.txt b/terasoluna-gfw-web/src/etc/header.txt