Drop unused Surefire config for skipping tests

17 files changed, 1 insertions, 198 deletions

diff --git a/pom.xml b/pom.xml
index 3d37e630b1a..a9aed12ba31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,6 @@
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <license.title>SonarQube</license.title>
 
-    <skipBatchTests>false</skipBatchTests>
-    <skipServerTests>false</skipServerTests>
     <skipSanityChecks>false</skipSanityChecks>
 
     <argLine>-Xmx512m -Djava.awt.headless=true</argLine>
@@ -379,7 +377,6 @@
             -->
             <user.timezone>${testTimezone}</user.timezone>
           </systemPropertyVariables>
-          <groups>${junitGroups}</groups>
           <threadCount>1</threadCount>
         </configuration>
       </plugin>
@@ -1360,48 +1357,6 @@
       </build>
     </profile>
 
-    <!--
-    The following profiles optimize the build for each team, according to their
-     stack layers (scanner, server and web teams)
-    -->
-    <profile>
-      <!-- disable all tests -->
-      <id>skipTests</id>
-      <activation>
-        <property>
-          <name>skipTests</name>
-        </property>
-      </activation>
-      <properties>
-        <skipBatchTests>true</skipBatchTests>
-        <skipServerTests>true</skipServerTests>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>scanner</id>
-      <properties>
-        <skipServerTests>true</skipServerTests>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>server</id>
-      <properties>
-        <skipBatchTests>true</skipBatchTests>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>web</id>
-      <properties>
-        <!-- the web team does not care about java tests -->
-        <skipBatchTests>true</skipBatchTests>
-        <skipServerTests>true</skipServerTests>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
-
     <profile>
       <!--
       check if maven dependencies have vulnerabilities listed in CVE
diff --git a/server/sonar-ce/pom.xml b/server/sonar-ce/pom.xml
index f3254d6489d..db5569fea92 100644
--- a/server/sonar-ce/pom.xml
+++ b/server/sonar-ce/pom.xml
@@ -61,16 +61,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/server/sonar-db-core/pom.xml b/server/sonar-db-core/pom.xml
index fbb6022b1af..c87abdc6f3f 100644
--- a/server/sonar-db-core/pom.xml
+++ b/server/sonar-db-core/pom.xml
@@ -128,13 +128,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
diff --git a/server/sonar-db-dao/pom.xml b/server/sonar-db-dao/pom.xml
index 50ed677660a..efd65c27be2 100644
--- a/server/sonar-db-dao/pom.xml
+++ b/server/sonar-db-dao/pom.xml
@@ -93,13 +93,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
diff --git a/server/sonar-db-migration/pom.xml b/server/sonar-db-migration/pom.xml
index f5142d072b4..1bac6e32c67 100644
--- a/server/sonar-db-migration/pom.xml
+++ b/server/sonar-db-migration/pom.xml
@@ -73,18 +73,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-  </profiles>
 </project>
diff --git a/server/sonar-plugin-bridge/pom.xml b/server/sonar-plugin-bridge/pom.xml
index d75ced5c3c7..619a6ba5165 100644
--- a/server/sonar-plugin-bridge/pom.xml
+++ b/server/sonar-plugin-bridge/pom.xml
@@ -26,16 +26,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/server/sonar-process-monitor/pom.xml b/server/sonar-process-monitor/pom.xml
index 8a065325ba2..e7a34123d2e 100644
--- a/server/sonar-process-monitor/pom.xml
+++ b/server/sonar-process-monitor/pom.xml
@@ -76,18 +76,5 @@
       <artifactId>http-request</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/server/sonar-process/pom.xml b/server/sonar-process/pom.xml
index 41ed5df2020..020a3b3c717 100644
--- a/server/sonar-process/pom.xml
+++ b/server/sonar-process/pom.xml
@@ -116,13 +116,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/server/sonar-search/pom.xml b/server/sonar-search/pom.xml
index 3b633757f20..bf21503aa2d 100644
--- a/server/sonar-search/pom.xml
+++ b/server/sonar-search/pom.xml
@@ -65,16 +65,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 0f9315c3840..1134958981c 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -310,13 +310,6 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 24965e8cd3b..b71591fbd0b 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -247,13 +247,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <profiles>
diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml
index 9437845157f..ca923e506bc 100644
--- a/sonar-check-api/pom.xml
+++ b/sonar-check-api/pom.xml
@@ -23,16 +23,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipBatchTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml
index 7d1bd63ae7d..ab35c91e7d2 100644
--- a/sonar-duplications/pom.xml
+++ b/sonar-duplications/pom.xml
@@ -79,16 +79,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipBatchTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml
index f4efd8ce9aa..f645b3f72fd 100644
--- a/sonar-markdown/pom.xml
+++ b/sonar-markdown/pom.xml
@@ -41,16 +41,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipServerTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 39dc432c805..0698b2fb985 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -190,6 +190,7 @@
                 <relocation>
                   <pattern>com.google</pattern>
                   <shadedPattern>org.sonar.api.internal.google</shadedPattern>
+
                 </relocation>
                 <relocation>
                   <pattern>org.apache.commons</pattern>
diff --git a/sonar-scanner-engine/pom.xml b/sonar-scanner-engine/pom.xml
index d15fb384ef7..10ff9e32144 100644
--- a/sonar-scanner-engine/pom.xml
+++ b/sonar-scanner-engine/pom.xml
@@ -137,18 +137,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipBatchTests}</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
   <profiles>
     <profile>
       <id>runBenchmarks</id>
diff --git a/sonar-scanner-protocol/pom.xml b/sonar-scanner-protocol/pom.xml
index 390bddadce8..ad0a08268a3 100644
--- a/sonar-scanner-protocol/pom.xml
+++ b/sonar-scanner-protocol/pom.xml
@@ -77,13 +77,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipBatchTests}</skipTests>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <finalName>scanner-report-viewer-${project.version}</finalName>