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, 12 insertions, 0 deletions

diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml
index 321e44fbc93..2b1b94ba198 100644
--- a/sonar-java-api/pom.xml
+++ b/sonar-java-api/pom.xml
@@ -29,4 +29,16 @@
       <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>