Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	plugins/sonar-core-plugin/pom.xml
	plugins/sonar-cpd-plugin/pom.xml
	plugins/sonar-dbcleaner-plugin/pom.xml
	plugins/sonar-design-plugin/pom.xml
	plugins/sonar-email-notifications-plugin/pom.xml
	plugins/sonar-l10n-en-plugin/pom.xml
	plugins/sonar-xoo-plugin/pom.xml
	pom.xml
	server/pom.xml
	server/sonar-process-monitor/pom.xml
	server/sonar-process/pom.xml
	server/sonar-search/pom.xml
	server/sonar-server/pom.xml
	server/sonar-web/pom.xml
	server/sonar-ws-client/pom.xml
	sonar-application/pom.xml
	sonar-batch-maven-compat/pom.xml
	sonar-batch-protocol/pom.xml
	sonar-batch/pom.xml
	sonar-check-api/pom.xml
	sonar-colorizer/pom.xml
	sonar-core/pom.xml
	sonar-deprecated/pom.xml
	sonar-duplications/pom.xml
	sonar-graph/pom.xml
	sonar-home/pom.xml
	sonar-java-api/pom.xml
	sonar-markdown/pom.xml
	sonar-maven-plugin/pom.xml
	sonar-maven3-plugin/pom.xml
	sonar-plugin-api/pom.xml
	sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
	sonar-testing-harness/pom.xml

1 files changed, 53 insertions, 5 deletions

diff --git a/pom.xml b/pom.xml
index 9325d620f16..e1bd848cda0 100644
--- a/pom.xml
+++ b/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/maven-v4_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/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.sonar</groupId>
@@ -82,6 +83,10 @@
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
 
+    <skipBatchTests>false</skipBatchTests>
+    <skipServerTests>false</skipServerTests>
+    <skipWebTests>false</skipWebTests>
+
     <!-- To configure animal-sniffer to check API compat -->
     <animal-sniffer.signature.groupId>org.codehaus.mojo.signature</animal-sniffer.signature.groupId>
     <animal-sniffer.signature.artifactId>java16</animal-sniffer.signature.artifactId>
@@ -1333,7 +1338,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1346,7 +1351,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1360,7 +1365,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1373,7 +1378,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                   </pluginExecutions>
@@ -1412,6 +1417,49 @@
         </plugins>
       </build>
     </profile>
+
+
+    <!--
+    The following profiles optimize the build for each team, according to their
+     stack layers (batch, server and web teams)
+    -->
+    <profile>
+      <!-- disable all tests -->
+      <id>skipTests</id>
+      <activation>
+        <property>
+          <name>skipTests</name>
+        </property>
+      </activation>
+      <properties>
+        <skipWebTests>true</skipWebTests>
+        <skipBatchTests>true</skipBatchTests>
+        <skipServerTests>true</skipServerTests>
+      </properties>
+    </profile>
+    <profile>
+      <id>batch</id>
+      <properties>
+        <skipServerTests>true</skipServerTests>
+        <skipWebTests>true</skipWebTests>
+      </properties>
+    </profile>
+    <profile>
+      <id>server</id>
+      <properties>
+        <skipBatchTests>true</skipBatchTests>
+        <skipWebTests>true</skipWebTests>
+      </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>
   </profiles>
 
 </project>