Fix declaration of sonar-packaging-maven-plugin to allow proper inheritance

15 files changed, 15 insertions, 31 deletions

diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml
index e188f1ae160..ca05ff09557 100644
--- a/plugins/sonar-checkstyle-plugin/pom.xml
+++ b/plugins/sonar-checkstyle-plugin/pom.xml
@@ -93,7 +93,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>checkstyle</pluginKey>
           <pluginName>Checkstyle</pluginName>
@@ -114,4 +113,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/sonar-cobertura-plugin/pom.xml b/plugins/sonar-cobertura-plugin/pom.xml
index 6880e077fed..52acbbfc25a 100644
--- a/plugins/sonar-cobertura-plugin/pom.xml
+++ b/plugins/sonar-cobertura-plugin/pom.xml
@@ -48,7 +48,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>cobertura</pluginKey>
           <pluginName>Cobertura</pluginName>
@@ -68,4 +67,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml
index 7bdcf1fa694..dbd5270f021 100644
--- a/plugins/sonar-core-plugin/pom.xml
+++ b/plugins/sonar-core-plugin/pom.xml
@@ -143,7 +143,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>core</pluginKey>
           <pluginName>Core</pluginName>
@@ -152,7 +151,6 @@
             <![CDATA[Provides all common components required to cover all languages.]]></pluginDescription>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/sonar-cpd-plugin/pom.xml b/plugins/sonar-cpd-plugin/pom.xml
index be89978f7f3..cfcb55e4dfe 100644
--- a/plugins/sonar-cpd-plugin/pom.xml
+++ b/plugins/sonar-cpd-plugin/pom.xml
@@ -72,7 +72,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>cpd</pluginKey>
           <pluginName>Duplications</pluginName>
@@ -81,4 +80,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/sonar-dbcleaner-plugin/pom.xml b/plugins/sonar-dbcleaner-plugin/pom.xml
index a6f0ab3a095..27bca4ca814 100644
--- a/plugins/sonar-dbcleaner-plugin/pom.xml
+++ b/plugins/sonar-dbcleaner-plugin/pom.xml
@@ -56,7 +56,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginName>Database Cleaner</pluginName>
           <pluginClass>org.sonar.plugins.dbcleaner.DbCleanerPlugin</pluginClass>
diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml
index 93fb057ba69..4bba50df075 100644
--- a/plugins/sonar-design-plugin/pom.xml
+++ b/plugins/sonar-design-plugin/pom.xml
@@ -58,7 +58,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>design</pluginKey>
           <pluginName>Design</pluginName>
@@ -112,4 +111,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/sonar-email-notifications-plugin/pom.xml b/plugins/sonar-email-notifications-plugin/pom.xml
index f48ffa5a895..a8a470e1303 100644
--- a/plugins/sonar-email-notifications-plugin/pom.xml
+++ b/plugins/sonar-email-notifications-plugin/pom.xml
@@ -52,7 +52,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginName>Email notifications</pluginName>
           <pluginClass>org.sonar.plugins.emailnotifications.EmailNotificationsPlugin</pluginClass>
diff --git a/plugins/sonar-findbugs-plugin/pom.xml b/plugins/sonar-findbugs-plugin/pom.xml
index 6e1d0316edb..0fc27967302 100644
--- a/plugins/sonar-findbugs-plugin/pom.xml
+++ b/plugins/sonar-findbugs-plugin/pom.xml
@@ -16,12 +16,12 @@
   <properties>
     <findbugs.version>1.3.9</findbugs.version>
   </properties>
-  
+
   <!-- IMPORTANT!
   xalan should be excluded everywhere, because contains Apache BCEL,
   but FindBugs requires its own version of BCEL - see http://findbugs.sourceforge.net/FAQ.html#q2  
   -->
-  
+
   <dependencyManagement>
     <!-- Change versions for dependencies provided by sonar-plugin-api -->
     <dependencies>
@@ -32,7 +32,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
@@ -133,4 +133,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/sonar-googleanalytics-plugin/pom.xml b/plugins/sonar-googleanalytics-plugin/pom.xml
index e5df6b01e6c..d8761e22e0b 100644
--- a/plugins/sonar-googleanalytics-plugin/pom.xml
+++ b/plugins/sonar-googleanalytics-plugin/pom.xml
@@ -42,7 +42,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginName>Google analytics</pluginName>
           <pluginClass>org.sonar.plugins.googleanalytics.GoogleAnalyticsPlugin</pluginClass>
diff --git a/plugins/sonar-jacoco-plugin/pom.xml b/plugins/sonar-jacoco-plugin/pom.xml
index ba44b839d41..73404e90118 100644
--- a/plugins/sonar-jacoco-plugin/pom.xml
+++ b/plugins/sonar-jacoco-plugin/pom.xml
@@ -87,12 +87,6 @@
 
   <build>
     <plugins>
-      <!-- TODO Godin: investigate why doesn't work without declaration of this plugin here -->
-      <plugin>
-        <groupId>org.codehaus.sonar</groupId>
-        <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
diff --git a/plugins/sonar-l10n-en-plugin/pom.xml b/plugins/sonar-l10n-en-plugin/pom.xml
index 1fa4bf22f7d..09cf398c6eb 100644
--- a/plugins/sonar-l10n-en-plugin/pom.xml
+++ b/plugins/sonar-l10n-en-plugin/pom.xml
@@ -45,12 +45,10 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginName>English Pack</pluginName>
           <pluginClass>org.sonar.plugins.l10n.EnglishPackPlugin</pluginClass>
-          <pluginDescription>
-            <![CDATA[Language pack for English]]></pluginDescription>
+          <pluginDescription><![CDATA[Language pack for English]]></pluginDescription>
         </configuration>
       </plugin>
     </plugins>
diff --git a/plugins/sonar-pmd-plugin/pom.xml b/plugins/sonar-pmd-plugin/pom.xml
index 4ae50b1b225..6cf586c6b43 100644
--- a/plugins/sonar-pmd-plugin/pom.xml
+++ b/plugins/sonar-pmd-plugin/pom.xml
@@ -84,7 +84,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>pmd</pluginKey>
           <pluginName>PMD</pluginName>
diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml
index b098789b025..3cd7b8b5602 100644
--- a/plugins/sonar-squid-java-plugin/pom.xml
+++ b/plugins/sonar-squid-java-plugin/pom.xml
@@ -93,7 +93,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginName>Squid for Java</pluginName>
           <pluginClass>org.sonar.plugins.squid.SquidPlugin</pluginClass>
diff --git a/plugins/sonar-surefire-plugin/pom.xml b/plugins/sonar-surefire-plugin/pom.xml
index 9acbceb3a1a..1973c410bdb 100644
--- a/plugins/sonar-surefire-plugin/pom.xml
+++ b/plugins/sonar-surefire-plugin/pom.xml
@@ -47,7 +47,6 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <pluginKey>surefire</pluginKey>
           <pluginName>Surefire</pluginName>
diff --git a/pom.xml b/pom.xml
index d41bb56dd70..6111683adb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,7 +267,6 @@
           <groupId>org.codehaus.sonar</groupId>
           <artifactId>sonar-packaging-maven-plugin</artifactId>
           <version>1.1</version>
-          <extensions>true</extensions>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -386,6 +385,11 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.codehaus.sonar</groupId>
+        <artifactId>sonar-packaging-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
         <configuration>