move checkstyle configs

diff --git a/src/main/config/suppressions.xml b/checkstyle-suppressions.xml
similarity index 100%
rename from src/main/config/suppressions.xml
rename to checkstyle-suppressions.xml

diff --git a/src/main/config/checks.xml b/checkstyle.xml
similarity index 99%
rename from src/main/config/checks.xml
rename to checkstyle.xml
index bad583f..450a32e 100644 (file)
--- a/src/main/config/checks.xml
+++ b/checkstyle.xml
@@ -26,9 +26,7 @@
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
     <module name="SuppressionCommentFilter" />
-    <module name="SuppressionFilter">
-        <property name="file" value="src/main/config/suppressions.xml" />
-    </module>
+    <module name="SuppressionFilter" />
     <module name="SuppressWarningsFilter" />
     <module name="SuppressWithNearbyCommentFilter" />
 

diff --git a/src/main/config/pmdrules.xml b/pmdrules.xml
similarity index 100%
rename from src/main/config/pmdrules.xml
rename to pmdrules.xml

diff --git a/pom.xml b/pom.xml
index 1d22aa8..f27c504 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,8 @@
 
         <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
         <checkstyleruntime.version>6.19</checkstyleruntime.version>
-        <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
-        <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
+        <checkstyle.config.location>${project.basedir}/checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}/checkstyle-suppressions.xml</checkstyle.suppressions.location>
         <checkstyle.enable.rss>false</checkstyle.enable.rss>
 
         <pmd-plugin.version>3.7</pmd-plugin.version>
@@ -535,7 +535,7 @@
                 <version>${pmd-plugin.version}</version>
                 <configuration>
                     <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
                 <reportSets>