From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Thu, 6 Jun 2019 03:16:14 +0000 (+0900)
Subject: move config files.
X-Git-Tag: release-1.202.2^2~2^2~3
X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FPmd2XML.git;a=commitdiff_plain;h=00993a3071933fe6dda8f893c0ef63e842fbb1bb;ds=sidebyside

move config files.
---

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..115efd5 100644
--- a/src/main/config/checks.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -25,9 +25,9 @@
 
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
-    <module name="SuppressionFilter">
+    <!--module name="SuppressionFilter">
         <property name="file" value="src/main/config/suppressions.xml" />
-    </module>
+    </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 d4fff91..62e7eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,12 +94,11 @@
         <!-- Walk around: JDK 11 javadoc + Maven -->
         <detectJavaApiLink>false</detectJavaApiLink>
 
-        <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
-
         <surefire-plugin.version>3.0.0-M3</surefire-plugin.version>
         <jacoco-plugin.version>0.8.4</jacoco-plugin.version>
 
-        <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>
 
         <spotbugs-plugin.version>3.1.11</spotbugs-plugin.version>
@@ -372,7 +371,7 @@
                 <configuration>
                     <archiveBaseDirectory>.</archiveBaseDirectory>
                     <descriptors>
-                        <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                        <descriptor>src/assembly/src.xml</descriptor>
                     </descriptors>
                 </configuration>
             </plugin>
@@ -391,7 +390,7 @@
                 <configuration>
                     <!--targetJdk>${maven.compiler.target}</targetJdk-->
                     <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
             </plugin>
@@ -563,7 +562,7 @@
                     <skip>false</skip>
                     <!--targetJdk>${maven.compiler.target}</targetJdk-->
                     <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
                 <reportSets>
diff --git a/src/main/assembly/descriptor.xml b/src/assembly/src.xml
similarity index 100%
rename from src/main/assembly/descriptor.xml
rename to src/assembly/src.xml