diff --git a/useradmin/filestore/pom.xml b/useradmin/filestore/pom.xml
index 28fef68..689d1d1 100644
--- a/useradmin/filestore/pom.xml
+++ b/useradmin/filestore/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>felix-parent</artifactId>
 		<groupId>org.apache.felix</groupId>
-		<version>1.2.0</version>
+        <version>2.1</version>
         <relativePath>../../../pom/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.apache.felix.useradmin.filestore</artifactId>
@@ -49,6 +49,18 @@
 	</dependencies>
 	<build>
 		<plugins>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>src/**</include>
+                    </includes>
+                    <excludes>
+                        <exclude>src/main/resources/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -79,21 +91,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rat-maven-plugin</artifactId>
-				<configuration>
-					<excludeSubProjects>false</excludeSubProjects>
-					<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-					<useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-					<excludes>
-						<param>doc/*</param>
-						<param>maven-eclipse.xml</param>
-						<param>.checkstyle</param>
-						<param>.externalToolBuilders/*</param>
-					</excludes>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/useradmin/itest/pom.xml b/useradmin/itest/pom.xml
index e83793c..88789de 100644
--- a/useradmin/itest/pom.xml
+++ b/useradmin/itest/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>felix-parent</artifactId>
 		<groupId>org.apache.felix</groupId>
-		<version>1.2.0</version>
+        <version>2.1</version>
         <relativePath>../../../pom/pom.xml</relativePath>
 	</parent>
 	<properties>
@@ -52,13 +52,13 @@
 		<dependency>
             <groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.useradmin</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
             <groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.useradmin.filestore</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.3-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -144,21 +144,18 @@
 					<source>1.6</source>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rat-maven-plugin</artifactId>
-				<configuration>
-					<excludeSubProjects>false</excludeSubProjects>
-					<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-					<useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-					<excludes>
-						<param>doc/*</param>
-						<param>maven-eclipse.xml</param>
-						<param>.checkstyle</param>
-						<param>.externalToolBuilders/*</param>
-					</excludes>
-				</configuration>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>src/**</include>
+                    </includes>
+                    <excludes>
+                        <exclude>src/main/resources/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/useradmin/mongodb/pom.xml b/useradmin/mongodb/pom.xml
index 8c3574d..2619bb1 100644
--- a/useradmin/mongodb/pom.xml
+++ b/useradmin/mongodb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>felix-parent</artifactId>
         <groupId>org.apache.felix</groupId>
-        <version>1.2.0</version>
+        <version>2.1</version>
         <relativePath>../../../pom/pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.felix.useradmin.mongodb</artifactId>
@@ -62,6 +62,18 @@
 				</configuration>
 			</plugin>
             <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>src/**</include>
+                    </includes>
+                    <excludes>
+                        <exclude>src/main/resources/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
@@ -90,21 +102,6 @@
                     </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rat-maven-plugin</artifactId>
-                <configuration>
-                    <excludeSubProjects>false</excludeSubProjects>
-                    <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-                    <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-                    <excludes>
-                        <param>doc/*</param>
-                        <param>maven-eclipse.xml</param>
-                        <param>.checkstyle</param>
-                        <param>.externalToolBuilders/*</param>
-                    </excludes>
-                </configuration>
-            </plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/useradmin/pom.xml b/useradmin/pom.xml
index 0c27652..80bff5d 100644
--- a/useradmin/pom.xml
+++ b/useradmin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>1.2.0</version>
+        <version>2.1</version>
         <relativePath>../../pom/pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/useradmin/useradmin/pom.xml b/useradmin/useradmin/pom.xml
index 8e26ff3..d8bfa68 100644
--- a/useradmin/useradmin/pom.xml
+++ b/useradmin/useradmin/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>felix-parent</artifactId>
 		<groupId>org.apache.felix</groupId>
-		<version>1.2.0</version>
+        <version>2.1</version>
         <relativePath>../../../pom/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.apache.felix.useradmin</artifactId>
@@ -42,6 +42,18 @@
 	</dependencies>
 	<build>
 		<plugins>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>src/**</include>
+                    </includes>
+                    <excludes>
+                        <exclude>src/main/resources/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -72,21 +84,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rat-maven-plugin</artifactId>
-				<configuration>
-					<excludeSubProjects>false</excludeSubProjects>
-					<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-					<useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-					<excludes>
-						<param>doc/*</param>
-						<param>maven-eclipse.xml</param>
-						<param>.checkstyle</param>
-						<param>.externalToolBuilders/*</param>
-					</excludes>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>