remove unused GWT permutations in order to increase build duration + use parallel unit tests on plugins checkstyle, pmd and findbugs

13 files changed, 58 insertions, 27 deletions

diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml
index af652fc2153..4262dcfa7e5 100644
--- a/plugins/sonar-checkstyle-plugin/pom.xml
+++ b/plugins/sonar-checkstyle-plugin/pom.xml
@@ -86,6 +86,17 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      
+      <!-- Running JUnit tests in parallel -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <parallel>methods</parallel>
+          <threadCount>3</threadCount>
+          <perCoreThreadCount>true</perCoreThreadCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/plugins/sonar-clover-plugin/pom.xml b/plugins/sonar-clover-plugin/pom.xml
index f49d64cd908..0405112f093 100644
--- a/plugins/sonar-clover-plugin/pom.xml
+++ b/plugins/sonar-clover-plugin/pom.xml
@@ -39,6 +39,16 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <!-- Running JUnit tests in parallel -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <parallel>classes</parallel>
+          <threadCount>3</threadCount>
+          <perCoreThreadCount>true</perCoreThreadCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/plugins/sonar-cobertura-plugin/pom.xml b/plugins/sonar-cobertura-plugin/pom.xml
index f2d154ea3db..c259d5a95be 100644
--- a/plugins/sonar-cobertura-plugin/pom.xml
+++ b/plugins/sonar-cobertura-plugin/pom.xml
@@ -52,6 +52,16 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <!-- Running JUnit tests in parallel -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <parallel>classes</parallel>
+          <threadCount>3</threadCount>
+          <perCoreThreadCount>true</perCoreThreadCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspots.gwt.xml b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspots.gwt.xml
index 574aa03fedc..ad7ecd8c11f 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspots.gwt.xml
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspots.gwt.xml
@@ -4,12 +4,7 @@
   <inherits name="com.google.gwt.http.HTTP"/>
   <inherits name="org.sonar.Sonar"/>
   <inherits name="com.google.gwt.i18n.I18N"/>
-
   <stylesheet src="hotspots.css"/>
-
   <entry-point class="org.sonar.plugins.core.hotspots.client.GwtHotspots"/>
-
-  <extend-property name="locale" values="en"/>
   <extend-property name="locale" values="fr"/>
-
 </module>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelector.gwt.xml b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelector.gwt.xml
index d7ec90cf690..8299ca591d0 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelector.gwt.xml
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelector.gwt.xml
@@ -8,7 +8,5 @@
   
   <entry-point class="org.sonar.plugins.core.ui.pageselector.client.PageSelector"/>
 
-  <extend-property name="locale" values="en"/>
   <extend-property name="locale" values="fr"/>
-
 </module>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewer.gwt.xml b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewer.gwt.xml
index 473ccebe360..fed31ca288e 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewer.gwt.xml
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewer.gwt.xml
@@ -8,6 +8,5 @@
 
   <entry-point class="org.sonar.plugins.core.violationsviewer.client.ViolationsViewer"/>
 
-  <extend-property name="locale" values="en"/>
   <extend-property name="locale" values="fr"/>
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTab.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTab.gwt.xml
index c20b988ba44..1d8aa50cac9 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTab.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTab.gwt.xml
@@ -7,7 +7,5 @@
   <stylesheet src='dependencies-tab.css'/>
   <entry-point class="org.sonar.plugins.design.ui.dependencies.client.DependenciesTab"/>
 
-  <extend-property name="locale" values="en"/>
-  <extend-property name="locale" values="fr"/>
-  
+  <extend-property name="locale" values="fr"/> 
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4Tab.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4Tab.gwt.xml
index 2de9ebb7965..124aa37c47d 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4Tab.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4Tab.gwt.xml
@@ -3,11 +3,6 @@
   <inherits name="com.google.gwt.json.JSON"/>
   <inherits name="com.google.gwt.http.HTTP"/>
   <inherits name="org.sonar.Sonar"/>
-
   <stylesheet src="lcom4.css"/>
   <entry-point class="org.sonar.plugins.design.ui.lcom4.client.Lcom4Tab"/>
-
-  <extend-property name="locale" values="en"/>
-  <extend-property name="locale" values="fr"/>
-
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPage.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPage.gwt.xml
index f19861a3644..ebcb5b8971a 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPage.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPage.gwt.xml
@@ -4,10 +4,6 @@
   <inherits name="com.google.gwt.http.HTTP"/>
   <inherits name="org.sonar.Sonar"/>
   <stylesheet src="libraries.css"/>
-
   <entry-point class="org.sonar.plugins.design.ui.libraries.client.LibrariesPage"/>
-
-  <extend-property name="locale" values="en"/>
   <extend-property name="locale" values="fr"/>
-
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPage.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPage.gwt.xml
index 7655704d886..79a507eb137 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPage.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPage.gwt.xml
@@ -3,10 +3,7 @@
   <inherits name="com.google.gwt.json.JSON"/>
   <inherits name="com.google.gwt.http.HTTP"/>
   <inherits name="org.sonar.Sonar"/>
-  <stylesheet src="design.css"/>
-  
+  <stylesheet src="design.css"/> 
   <entry-point class="org.sonar.plugins.design.ui.page.client.DesignPage"/>
-
-  <extend-property name="locale" values="en"/>
   <extend-property name="locale" values="fr"/>
 </module>
diff --git a/plugins/sonar-findbugs-plugin/pom.xml b/plugins/sonar-findbugs-plugin/pom.xml
index a5ad7731d5f..d74fc6a92a7 100644
--- a/plugins/sonar-findbugs-plugin/pom.xml
+++ b/plugins/sonar-findbugs-plugin/pom.xml
@@ -77,6 +77,16 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <!-- Running JUnit tests in parallel -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <parallel>methods</parallel>
+          <threadCount>3</threadCount>
+          <perCoreThreadCount>true</perCoreThreadCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml
index 9ae8a290a2f..4d09d61ebef 100644
--- a/plugins/sonar-squid-java-plugin/pom.xml
+++ b/plugins/sonar-squid-java-plugin/pom.xml
@@ -134,6 +134,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      
     </plugins>
   </build>
 </project>
diff --git a/plugins/sonar-surefire-plugin/pom.xml b/plugins/sonar-surefire-plugin/pom.xml
index 3f5972088a0..d73c33b603c 100644
--- a/plugins/sonar-surefire-plugin/pom.xml
+++ b/plugins/sonar-surefire-plugin/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.sonar</groupId>
@@ -58,7 +59,8 @@
           <pluginKey>surefire</pluginKey>
           <pluginName>Surefire</pluginName>
           <pluginClass>org.sonar.plugins.surefire.SurefirePlugin</pluginClass>
-          <pluginDescription><![CDATA[Get results of unit tests with <a href='http://maven.apache.org/plugins/maven-surefire-plugin/'>Surefire</a>.]]></pluginDescription>
+          <pluginDescription>
+            <![CDATA[Get results of unit tests with <a href='http://maven.apache.org/plugins/maven-surefire-plugin/'>Surefire</a>.]]></pluginDescription>
         </configuration>
       </plugin>
 
@@ -68,7 +70,16 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-
+      <!-- Running JUnit tests in parallel -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <parallel>classes</parallel>
+          <threadCount>3</threadCount>
+          <perCoreThreadCount>true</perCoreThreadCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>