diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
index 3aa8c284b..22b4300ff 100644
--- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
+++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
@@ -228,11 +228,6 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
index 349ee9d5d..78f0d8565 100644
--- a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
+++ b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
@@ -236,11 +236,6 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml
index 7b2c8c42a..719f6f624 100644
--- a/ccm-cms-profile/pom.xml
+++ b/ccm-cms-profile/pom.xml
@@ -255,10 +255,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml
index ab855ebac..4e9388de8 100644
--- a/ccm-cms-types-agenda/pom.xml
+++ b/ccm-cms-types-agenda/pom.xml
@@ -252,11 +252,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
-
+           
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml
index 809962e41..5dcc2a0e4 100644
--- a/ccm-cms-types-bookmark/pom.xml
+++ b/ccm-cms-types-bookmark/pom.xml
@@ -251,10 +251,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml
index 7c922d3bb..c2511c0bd 100644
--- a/ccm-cms-types-decisiontree/pom.xml
+++ b/ccm-cms-types-decisiontree/pom.xml
@@ -252,10 +252,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml
index a99e25650..c89d7d9da 100644
--- a/ccm-cms-types-externallink/pom.xml
+++ b/ccm-cms-types-externallink/pom.xml
@@ -251,10 +251,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml
index e3be9fd5c..c55cbf3d6 100644
--- a/ccm-cms-types-faqitem/pom.xml
+++ b/ccm-cms-types-faqitem/pom.xml
@@ -251,10 +251,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml
index ee4fa36e1..42a41978c 100644
--- a/ccm-cms-types-glossaryitem/pom.xml
+++ b/ccm-cms-types-glossaryitem/pom.xml
@@ -251,11 +251,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml
index bbc9dc03f..323e70313 100644
--- a/ccm-cms-types-minutes/pom.xml
+++ b/ccm-cms-types-minutes/pom.xml
@@ -252,10 +252,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index c2bd2ad03..cd97d977a 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -294,16 +294,9 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
             
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <!--<configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>-->
             </plugin>
 
             <plugin>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index d18abe4ff..1c9dce4c4 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -409,19 +409,12 @@
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>
-            </plugin>
+
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+                    <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>
             
diff --git a/ccm-core/findbugs-exclude.xml b/ccm-core/spotbugs-exclude.xml
similarity index 100%
rename from ccm-core/findbugs-exclude.xml
rename to ccm-core/spotbugs-exclude.xml
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index 53f80edf0..92859132a 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -235,10 +235,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index bca19e78c..bba0e1aa1 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -271,16 +271,9 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <!--<configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>-->
             </plugin>
 
             <plugin>
diff --git a/ccm-xafilesystemadapter/pom.xml b/ccm-xafilesystemadapter/pom.xml
index bf64f6b4c..63499272a 100644
--- a/ccm-xafilesystemadapter/pom.xml
+++ b/ccm-xafilesystemadapter/pom.xml
@@ -157,13 +157,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <!--<configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>-->
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>