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 74805f5da..8cb47a121 100644
--- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
+++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                              http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -10,11 +10,11 @@
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
-    
+
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-   
+
     <name>${artifactId}</name>
 
     <dependencies>
@@ -36,18 +36,18 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -65,7 +65,7 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
@@ -92,7 +92,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -117,7 +117,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -150,22 +150,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
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 3a1756658..8b6eb16e2 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
@@ -1,17 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                              http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
@@ -32,7 +32,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,13 +49,13 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -100,7 +100,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -125,7 +125,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -158,22 +158,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml
index 4f78c8cb8..d907ee1b0 100644
--- a/ccm-cms-types-agenda/pom.xml
+++ b/ccm-cms-types-agenda/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-agenda</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,7 +49,7 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -72,14 +72,14 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
-        
+
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -124,7 +124,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -148,7 +148,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -179,22 +179,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml
index 52c127416..835ce5cf0 100644
--- a/ccm-cms-types-bookmark/pom.xml
+++ b/ccm-cms-types-bookmark/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-bookmark</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,7 +49,7 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -72,13 +72,13 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -123,7 +123,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -147,7 +147,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -178,22 +178,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml
index 50aca56f6..e60fe3585 100644
--- a/ccm-cms-types-decisiontree/pom.xml
+++ b/ccm-cms-types-decisiontree/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-decisiontree</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,7 +49,7 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -72,14 +72,14 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
-        
+
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -124,7 +124,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -148,7 +148,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -179,22 +179,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml
index a81076803..874e70624 100644
--- a/ccm-cms-types-externallink/pom.xml
+++ b/ccm-cms-types-externallink/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-externallink</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,7 +49,7 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -72,13 +72,13 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -123,7 +123,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -147,7 +147,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -178,22 +178,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml
index f2d63bb46..4d5a17441 100644
--- a/ccm-cms-types-faqitem/pom.xml
+++ b/ccm-cms-types-faqitem/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-faqitem</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,7 +49,7 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -72,13 +72,13 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -123,7 +123,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -147,7 +147,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -178,22 +178,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml
index 6f9e549a2..f81bb2cc7 100644
--- a/ccm-cms-types-glossaryitem/pom.xml
+++ b/ccm-cms-types-glossaryitem/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-glossaryitem</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,13 +49,13 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search-orm</artifactId>
@@ -72,13 +72,13 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -123,7 +123,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -147,7 +147,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -178,22 +178,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml
index a9a2fb39c..e052fac11 100644
--- a/ccm-cms-types-minutes/pom.xml
+++ b/ccm-cms-types-minutes/pom.xml
@@ -8,14 +8,14 @@
         <groupId>org.libreccm</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
- 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
 
-  
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms-types-minutes</artifactId>
     <version>7.0.0-SNAPSHOT</version>
@@ -36,7 +36,7 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
@@ -49,7 +49,7 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -72,14 +72,14 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
-        
+
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -124,7 +124,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -148,7 +148,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -179,22 +179,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index ba75c1acd..9180c150d 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -235,22 +235,8 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
                     </execution>
-                </executions>    
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 089c0c7fb..7c02cb2f1 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -327,26 +327,6 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
-                    <!--<execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>-->
                 </executions>
             </plugin>
             <plugin>
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index 01c93c81e..840aa8e69 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd" 
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    
+
     <parent>
         <groupId>org.libreccm</groupId>
         <artifactId>libreccm-parent</artifactId>
@@ -18,11 +18,11 @@
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-docrepo</artifactId>
     <version>7.0.0-SNAPSHOT</version>
-    
+
     <name>LibreCCM DocRepo</name>
 
     <url>http://www.libreccm.org/moudles/ccm-docrepo</url>
-    
+
     <licenses>
         <license>
             <name>Lesser GPL 2.1</name>
@@ -37,26 +37,26 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- Dependencies for log4j 2 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -66,7 +66,7 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
@@ -75,26 +75,26 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-       
+
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-testutils</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
@@ -115,7 +115,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -123,10 +123,10 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>ccm-docrepo</finalName>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -139,7 +139,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -147,7 +147,7 @@
                     <groups>org.libreccm.tests.categories.UnitTest</groups>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -165,27 +165,7 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
-                    <!--<execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>-->
-                </executions>    
+                </executions>
             </plugin>
             <plugin>
                 <groupId>de.jpdigital</groupId>
@@ -211,10 +191,10 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
         </plugins>
     </build>
-    
+
     <reporting>
         <plugins>
             <plugin>
@@ -330,7 +310,7 @@
 
         </plugins>
     </reporting>
-    
+
     <profiles>
         <profile>
             <id>wildfly-managed-h2-mem</id>
@@ -354,7 +334,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -367,7 +347,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>-->
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -411,7 +391,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>wildfly-managed-pgsql</id>
             <dependencies>
@@ -434,7 +414,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -447,7 +427,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>-->
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -491,7 +471,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
@@ -514,7 +494,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -527,7 +507,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>-->
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -571,7 +551,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>wildfly-remote-pgsql</id>
             <dependencies>
@@ -594,7 +574,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -607,7 +587,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>-->
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -653,5 +633,5 @@
         </profile>
 
     </profiles>
-    
+
 </project>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index f4fa41a4d..ba248afff 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd" 
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
-        
+
     <parent>
         <groupId>org.libreccm</groupId>
         <artifactId>libreccm-parent</artifactId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-shortcuts</artifactId>
     <!--<version>7.0.0-SNAPSHOT</version>-->
-    
+
     <name>LibreCCM Shortcuts</name>
-    
+
     <url>http://www.libreccm.org/modules/ccm-shortcuts</url>
-    
+
     <licenses>
         <license>
             <name>Lesser GPL 2.1</name>
             <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
         </license>
     </licenses>
-    
+
     <dependencies>
         <dependency>
             <groupId>javax</groupId>
@@ -39,32 +39,32 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -73,7 +73,7 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
@@ -82,13 +82,13 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -99,20 +99,20 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-testutils</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
@@ -133,25 +133,25 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <finalName>ccm-shortcuts</finalName>
-        
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <testResources>
             <testResource>
                 <directory>src/test/resources</directory>
@@ -160,7 +160,7 @@
                 <directory>${project.build.directory}/generated-resources</directory>
             </testResource>
         </testResources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -173,7 +173,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -182,7 +182,7 @@
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -200,27 +200,7 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
-                    <!--<execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>-->
-                </executions>    
+                </executions>
             </plugin>
             <plugin>
                 <groupId>de.jpdigital</groupId>
@@ -245,11 +225,11 @@
                     </execution>
                 </executions>
             </plugin>
-                
+
         </plugins>
-        
+
     </build>
-    
+
     <reporting>
         <plugins>
             <plugin>
@@ -302,7 +282,7 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.9</version>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
@@ -316,7 +296,7 @@
                     <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
                 </configuration>-->
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
@@ -374,7 +354,7 @@
             </plugin>
         </plugins>
     </reporting>
-    
+
     <profiles>
         <profile>
             <id>wildfly-managed-h2-mem</id>
@@ -404,7 +384,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -417,7 +397,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -464,7 +444,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>wildfly-managed-pgsql</id>
             <dependencies>
@@ -490,7 +470,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -503,7 +483,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -550,7 +530,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
@@ -578,7 +558,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -591,7 +571,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -638,7 +618,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>wildfly-remote-pgsql</id>
             <dependencies>
@@ -664,7 +644,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -677,7 +657,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -725,5 +705,5 @@
             </build>
         </profile>
     </profiles>
-    
+
 </project>