diff --git a/findbugs-excludes.xml b/findbugs-excludes.xml
index e59ebf25..e893f7b3 100644
--- a/findbugs-excludes.xml
+++ b/findbugs-excludes.xml
@@ -6,7 +6,6 @@
 
 <!-- Exclude generated classes -->
     <Match>
-        <Package name="ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper"/>
-        <Package name="ch.ethz.seb.sebserver.webservice.datalayer.batis.model"/>
+        <Package name="~ch\.ethz\.seb\.sebserver.\webservice\.datalayer.\batis\.mapper\..*"/>
     </Match>
 </FindBugsFilter>
\ No newline at end of file
diff --git a/pmd-excludes.xml b/pmd-excludes.xml
new file mode 100644
index 00000000..1cb4b818
--- /dev/null
+++ b/pmd-excludes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="excludes"
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+    <description>excludes</description>
+    <exclude-pattern>.*/batis.mapper/*.*</exclude-pattern>
+    <exclude-pattern>.*/batis.model/*.*</exclude-pattern>
+</ruleset>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dea8b3c3..aa4f5ebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,10 +80,15 @@
               <failOnViolation>false</failOnViolation>
               <targetJdk>${java.version}</targetJdk>
               <linkXRef>false</linkXRef>
-              <excludes>
-                <exclude>.*/batis.mapper/*.*</exclude>
-                <exclude>.*/batis.model/*.*</exclude>
-              </excludes>
+              <excludeRoots>.*/batis.mapper/*.*</excludeRoots>
+              <excludeRoots>.*/batis.model/*.*</excludeRoots>
+<!--               <excludes> -->
+<!--                 <exclude>.*/batis.mapper/*.*</exclude> -->
+<!--                 <exclude>.*/batis.model/*.*</exclude> -->
+<!--               </excludes> -->
+<!--               <rulesets> -->
+<!--                 <ruleset>pmd-excludes.xml</ruleset> -->
+<!--               </rulesets> -->
             </configuration>
             <executions>
               <execution>