From f3680a9f982c1e84f209621aefca466d7ad0a3ea Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Sun, 2 Jun 2019 09:47:38 +0900
Subject: [PATCH] move checkstyle & pmd configs.

---
 .../checkstyle/checkstyle-suppressions.xml                  |  0
 .../config/checks.xml => config/checkstyle/checkstyle.xml   |  2 +-
 {src/main/config => config/pmd}/pmdrules.xml                |  0
 pom.xml                                                     | 13 ++++++++-----
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename src/main/config/suppressions.xml => config/checkstyle/checkstyle-suppressions.xml (100%)
 rename src/main/config/checks.xml => config/checkstyle/checkstyle.xml (99%)
 rename {src/main/config => config/pmd}/pmdrules.xml (100%)

diff --git a/src/main/config/suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from src/main/config/suppressions.xml
rename to config/checkstyle/checkstyle-suppressions.xml
diff --git a/src/main/config/checks.xml b/config/checkstyle/checkstyle.xml
similarity index 99%
rename from src/main/config/checks.xml
rename to config/checkstyle/checkstyle.xml
index 3e31cbb..70d8cb3 100644
--- a/src/main/config/checks.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -26,7 +26,7 @@
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
     <module name="SuppressionFilter">
-        <property name="file" value="src/main/config/suppressions.xml" />
+        <property name="file" value="config/checkstyle/checkstyle-suppressions.xml" />
     </module>
     <module name="SuppressionCommentFilter" />
     <module name="SuppressWithNearbyCommentFilter" />
diff --git a/src/main/config/pmdrules.xml b/config/pmd/pmdrules.xml
similarity index 100%
rename from src/main/config/pmdrules.xml
rename to config/pmd/pmdrules.xml
diff --git a/pom.xml b/pom.xml
index e971359..8c638ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,8 @@
         
         <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
 
-        <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
+        <checkstyle.config.location>${project.basedir}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
         <checkstyle.enable.rss>false</checkstyle.enable.rss>
 
     </properties>
@@ -334,9 +335,10 @@
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>3.0.1</version>
                 <configuration>
-                    <targetJdk>${maven.compiler.target}</targetJdk>
+                    <!--targetJdk>${maven.compiler.target}</targetJdk-->
+                    <targetJdk>1.6</targetJdk>
                     <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
             </plugin>
@@ -523,9 +525,10 @@
                 <version>3.0.1</version>
                 <configuration>
                     <skip>false</skip>
-                    <targetJdk>${maven.compiler.target}</targetJdk>
+                    <!--targetJdk>${maven.compiler.target}</targetJdk-->
+                    <targetJdk>1.6</targetJdk>
                     <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
                 <reportSets>
-- 
2.11.0