diff --git a/pom.xml b/pom.xml
index 8a9c3528b9..551a73d4c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,14 @@
           </argLine>
         </configuration>
       </plugin>
+      <!-- always produce osgi bundles -->
       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.7</version>
+        <extensions>true</extensions>
+      </plugin>             
+       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <version>2.1.2</version>
         <executions>
@@ -434,13 +441,7 @@
           <tagNameFormat>netty-@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
-      <!-- always produce osgi bundles -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>             
-       
+      
     </plugins>
 
     <pluginManagement>
@@ -501,11 +502,6 @@
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.7</version>
         </plugin>               
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.7</version>
-        </plugin>             
 
         <!-- Workaround for the 'M2E plugin execution not covered' problem.
              See: http://wiki.eclipse.org/M2E_plugin_execution_not_covered -->
diff --git a/testsuite-osgi/testsuite-osgi-deps/pom.xml b/testsuite-osgi/testsuite-osgi-deps/pom.xml
index 8654d0e16d..6bc2a7fc5d 100644
--- a/testsuite-osgi/testsuite-osgi-deps/pom.xml
+++ b/testsuite-osgi/testsuite-osgi-deps/pom.xml
@@ -17,7 +17,7 @@
 <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 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>io.netty</groupId>
     <artifactId>netty-testsuite-osgi-parent</artifactId>
@@ -44,9 +44,7 @@
   </pluginRepositories>
 
   <dependencies>
-  
     <!-- MAIN -->
-    
     <!-- include all osgi bundle release modules -->
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -79,50 +77,50 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
     </dependency>
-<!-- 
-                 * DO NOT install netty-transport-rxtx bundle due to rxtx
-                 * depencency:
-                 * <p>
-                 * 1) rxtx does not have automatic native library loader
-                 * <p>
-                 * 2) rxtx does not have osgi bundle
- -->    
-<!--     <dependency> -->
-<!--         <groupId>${project.groupId}</groupId> -->
-<!--         <artifactId>netty-transport-rxtx</artifactId> -->
-<!--         <version>${project.version}</version> -->
-<!--     </dependency> -->
+    <!-- 
+      * DO NOT install netty-transport-rxtx bundle due to rxtx depencency:
+      * 
+      * 1) rxtx does not have automatic native library loader
+      * 2) rxtx does not have osgi bundle
+    -->    
+    <!--
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-sctp</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-rxtx</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-sctp</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-udt</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-udt</artifactId>
+      <version>${project.version}</version>
     </dependency>
-    
+
     <!-- TEST -->
-    
+
     <!-- file/text conversion -->
     <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.3.2</version>
-        <scope>test</scope>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.2</version>
+      <scope>test</scope>
     </dependency>
-    
+
   </dependencies>
 
   <build>
-  
+
     <plugins>
-    
+
       <!-- produce karaf feature.xml -->
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
@@ -130,7 +128,7 @@
         <version>3.0.0-SNAPSHOT</version>
         <extensions>true</extensions>
       </plugin>
-      
+
       <!-- invoke integration tests -->
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -143,7 +141,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <!-- do not deploy this artifact -->
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -151,39 +149,37 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      
+
     </plugins>
-    
+
     <pluginManagement>
-    	<plugins>
-    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-    		<plugin>
-    			<groupId>org.eclipse.m2e</groupId>
-    			<artifactId>lifecycle-mapping</artifactId>
-    			<version>1.0.0</version>
-    			<configuration>
-    				<lifecycleMappingMetadata>
-    					<pluginExecutions>
-    						<pluginExecution>
-    							<pluginExecutionFilter>
-    								<groupId>org.apache.karaf.tooling</groupId>
-    								<artifactId>karaf-maven-plugin</artifactId>
-    								<versionRange>[0,)</versionRange>
-    								<goals>
-    									<goal>features-generate-descriptor</goal>
-    								</goals>
-    							</pluginExecutionFilter>
-    							<action>
-    								<execute />
-    							</action>
-    						</pluginExecution>
-    					</pluginExecutions>
-    				</lifecycleMappingMetadata>
-    			</configuration>
-    		</plugin>
-    	</plugins>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>karaf-maven-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>features-generate-descriptor</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute />
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
     </pluginManagement>
-    
   </build>
-  
 </project>
diff --git a/testsuite-osgi/testsuite-osgi-exam/pom.xml b/testsuite-osgi/testsuite-osgi-exam/pom.xml
index 4a5e4f8fc2..06d7c9d544 100644
--- a/testsuite-osgi/testsuite-osgi-exam/pom.xml
+++ b/testsuite-osgi/testsuite-osgi-exam/pom.xml
@@ -17,7 +17,7 @@
 <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 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>io.netty</groupId>
     <artifactId>netty-testsuite-osgi-parent</artifactId>
@@ -34,9 +34,9 @@
     <exam.version>3.0.0</exam.version>
     <url.version>1.5.0</url.version>
   </properties>
-    
+
   <dependencies>
-  
+
     <!-- MAIN -->
 
     <!-- logging via http://team.ops4j.org/wiki/display/paxlogging/Pax+Logging -->
@@ -57,7 +57,7 @@
       <artifactId>org.apache.felix.scr</artifactId>
       <version>1.6.2</version>
     </dependency>
-    
+
     <!-- include all netty osgi bundle release modules -->
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -90,35 +90,35 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-rxtx</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-rxtx</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-sctp</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-sctp</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-udt</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-udt</artifactId>
+      <version>${project.version}</version>
     </dependency>
-    
+
     <!-- TEST -->
 
     <!-- transport udt tests and deps -->
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-udt</artifactId>
-        <version>${project.version}</version>
-        <classifier>tests</classifier>
-        <scope>test</scope>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-udt</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.yammer.metrics</groupId>
@@ -133,66 +133,66 @@
 
     <!-- java 7 compatibility http://blog.osgi.org/2012/10/43-companion-code-for-java-7.html -->    
     <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>4.3.1</version>
-        <scope>provided</scope>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>4.3.1</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- pax exam environment -->
     <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-container-native</artifactId>
-        <version>${exam.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-junit4</artifactId>
-        <version>${exam.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-invoker-junit</artifactId>
-        <version>${exam.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-invoker-junit</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-inject</artifactId>
-        <version>${exam.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-inject</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-extender-service</artifactId>
-        <version>${exam.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-extender-service</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-link-mvn</artifactId>
-        <version>${exam.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-aether</artifactId>
-        <version>${url.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <version>${url.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-wrap</artifactId>
-        <version>${url.version}</version>
-        <scope>test</scope>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-wrap</artifactId>
+      <version>${url.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.framework</artifactId>
-        <version>4.0.3</version>
-        <scope>test</scope>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+      <version>4.0.3</version>
+      <scope>test</scope>
     </dependency>
 
   </dependencies>
@@ -210,12 +210,12 @@
             <id>generate-depends-file</id>
             <phase>generate-resources</phase>
             <goals>
-                <goal>generate-depends-file</goal>
+              <goal>generate-depends-file</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
-      
+
       <!-- generate osgi scr component descriptors -->
       <plugin>
         <groupId>com.carrotgarden.maven</groupId>
@@ -231,14 +231,14 @@
             <goals>
               <goal>clean</goal>
             </goals>
-         </execution>
-         <execution>
-           <id>generate</id>
-           <phase>process-classes</phase>
-           <goals>
-           <goal>generate</goal>
-           </goals>
-         </execution>
+          </execution>
+          <execution>
+            <id>generate</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
 
@@ -265,7 +265,7 @@
           </execution>
         </executions>
       </plugin>
-                
+
       <!-- do not deploy this artifact -->
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -273,38 +273,38 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      
+
     </plugins>
     <pluginManagement>
-    	<plugins>
-    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-    		<plugin>
-    			<groupId>org.eclipse.m2e</groupId>
-    			<artifactId>lifecycle-mapping</artifactId>
-    			<version>1.0.0</version>
-    			<configuration>
-    				<lifecycleMappingMetadata>
-    					<pluginExecutions>
-    						<pluginExecution>
-    							<pluginExecutionFilter>
-    								<groupId>org.apache.servicemix.tooling</groupId>
-    								<artifactId>depends-maven-plugin</artifactId>
-    								<versionRange>[0,)</versionRange>
-    								<goals>
-    									<goal>generate-depends-file</goal>
-    								</goals>
-    							</pluginExecutionFilter>
-    							<action>
-    								<execute />
-    							</action>
-    						</pluginExecution>
-    					</pluginExecutions>
-    				</lifecycleMappingMetadata>
-    			</configuration>
-    		</plugin>
-    	</plugins>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.servicemix.tooling</groupId>
+                    <artifactId>depends-maven-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>generate-depends-file</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute />
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
     </pluginManagement>
-    
+
   </build>
-  
+
 </project>
diff --git a/testsuite-osgi/testsuite-osgi-split/pom.xml b/testsuite-osgi/testsuite-osgi-split/pom.xml
index 17922537bf..d34d310304 100644
--- a/testsuite-osgi/testsuite-osgi-split/pom.xml
+++ b/testsuite-osgi/testsuite-osgi-split/pom.xml
@@ -17,7 +17,7 @@
 <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 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>io.netty</groupId>
     <artifactId>netty-testsuite-osgi-parent</artifactId>
@@ -31,7 +31,7 @@
   <description>verify osgi compliance: prohibit split packages</description>
 
   <dependencies>
-  
+
     <!-- include all osgi bundle release modules -->
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -64,31 +64,31 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-rxtx</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-rxtx</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-sctp</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-sctp</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-transport-udt</artifactId>
-        <version>${project.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-udt</artifactId>
+      <version>${project.version}</version>
     </dependency>
-    
+
   </dependencies>
 
   <build>
     <plugins>
-    
+
       <!-- fail build on package split -->
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -102,7 +102,7 @@
           </instructions>
         </configuration>
       </plugin>
-      
+
       <!-- do not deploy this artifact -->
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -110,7 +110,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      
+
     </plugins>
   </build>
 </project>