merge pomconfig

[jindolf/JinArchiver.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1d22aa8..5119e6b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <groupId>jp.sourceforge.jindolf</groupId>
     <artifactId>jinarchiver</artifactId>
 
-    <version>1.503.3-SNAPSHOT</version>
+    <version>1.503.5-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>JinArchiver</name>
@@ -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>