updated parent pom (and fixed issues reported by Checkstyle)

git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk@1710402 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index c5e460a..a445533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia-tools</artifactId>
-    <version>2</version>
+    <version>4-SNAPSHOT</version>
     <relativePath>../doxia-tools/pom.xml</relativePath>
   </parent>
 
@@ -53,6 +53,7 @@
 
   <properties>
     <doxiaVersion>1.3</doxiaVersion>
+    <checkstyle.violation.ignore>MethodName,NewlineAtEndOfFile,ParameterNumber</checkstyle.violation.ignore>
   </properties>
 
   <dependencies>
@@ -174,7 +175,7 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
-          <excludes>
+          <excludes combine.children="append">
             <exclude>src/test/resources/expected/doc-book/plexus-user-guide.xml</exclude>
             <exclude>src/test/resources/book-1/section-*.apt</exclude>
           </excludes>