Cleanup scanner ITs

* remove Maven test suite
* rename BatchTest -> ScannerTest

60 files changed, 3 insertions, 1147 deletions

diff --git a/it/it-projects/maven/inclusions_apply_to_source_dirs/pom.xml b/it/it-projects/maven/inclusions_apply_to_source_dirs/pom.xml
deleted file mode 100644
index 7727b4aa943..00000000000
--- a/it/it-projects/maven/inclusions_apply_to_source_dirs/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-
-  <groupId>com.sonarsource.it.samples</groupId>
-  <artifactId>inclusions_apply_to_source_dirs</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <properties>
-    <sonar.inclusions>src/main/java/**/Hello2.java</sonar.inclusions>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/it/it-projects/maven/inclusions_apply_to_source_dirs/src/main/java/Hello.java b/it/it-projects/maven/inclusions_apply_to_source_dirs/src/main/java/Hello.java
deleted file mode 100644
index 224a668297d..00000000000
--- a/it/it-projects/maven/inclusions_apply_to_source_dirs/src/main/java/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
-  public String hello() {
-    return "hello";
-  }
-}
diff --git a/it/it-projects/maven/inclusions_apply_to_source_dirs/src/main/java/Hello2.java b/it/it-projects/maven/inclusions_apply_to_source_dirs/src/main/java/Hello2.java
deleted file mode 100644
index 4bb53827bb6..00000000000
--- a/it/it-projects/maven/inclusions_apply_to_source_dirs/src/main/java/Hello2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello2 {
-  public String hello() {
-    return "hello";
-  }
-}
diff --git a/it/it-projects/maven/jee/ear-module/pom.xml b/it/it-projects/maven/jee/ear-module/pom.xml
deleted file mode 100644
index b432a49d0c2..00000000000
--- a/it/it-projects/maven/jee/ear-module/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.sonarsource.it.samples.jee</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>ear-module</artifactId>
-  <name>ear-module</name>
-  <packaging>ear</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>java-module</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ejb-module</artifactId>
-      <version>${project.version}</version>
-      <type>ejb</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>web-module</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-ear-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <modules>
-            <javaModule>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>java-module</artifactId>
-            </javaModule>
-            <ejbModule>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>ejb-module</artifactId>
-            </ejbModule>
-            <webModule>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>web-module</artifactId>
-              <contextRoot>jee-sample</contextRoot>
-            </webModule>
-          </modules>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/jee/ejb-module/pom.xml b/it/it-projects/maven/jee/ejb-module/pom.xml
deleted file mode 100644
index c2aafad18d6..00000000000
--- a/it/it-projects/maven/jee/ejb-module/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.sonarsource.it.samples.jee</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>ejb-module</artifactId>
-  <name>ejb-module</name>
-  <packaging>ejb</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_2.1_spec</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>java-module</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/jee/ejb-module/src/main/java/org/sonar/tests/App.java b/it/it-projects/maven/jee/ejb-module/src/main/java/org/sonar/tests/App.java
deleted file mode 100644
index ddc6d08253b..00000000000
--- a/it/it-projects/maven/jee/ejb-module/src/main/java/org/sonar/tests/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.sonar.tests;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/it/it-projects/maven/jee/ejb-module/src/main/resources/META-INF/ejb-jar.xml b/it/it-projects/maven/jee/ejb-module/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index f97427d26aa..00000000000
--- a/it/it-projects/maven/jee/ejb-module/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE ejb-jar PUBLIC 
-   '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN' 
-   'http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd'>
-
-<ejb-jar>
-   <enterprise-beans>
-
-     
-   </enterprise-beans>
-   <assembly-descriptor></assembly-descriptor>
-</ejb-jar>
diff --git a/it/it-projects/maven/jee/ejb-module/src/test/java/org/sonar/tests/AppTest.java b/it/it-projects/maven/jee/ejb-module/src/test/java/org/sonar/tests/AppTest.java
deleted file mode 100644
index ce03155a801..00000000000
--- a/it/it-projects/maven/jee/ejb-module/src/test/java/org/sonar/tests/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sonar.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/it/it-projects/maven/jee/java-module/pom.xml b/it/it-projects/maven/jee/java-module/pom.xml
deleted file mode 100644
index 44dd3ae593c..00000000000
--- a/it/it-projects/maven/jee/java-module/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.sonarsource.it.samples.jee</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>java-module</artifactId>
-  <name>java-module</name>
-
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/jee/java-module/src/main/java/org/sonar/tests/App.java b/it/it-projects/maven/jee/java-module/src/main/java/org/sonar/tests/App.java
deleted file mode 100644
index ddc6d08253b..00000000000
--- a/it/it-projects/maven/jee/java-module/src/main/java/org/sonar/tests/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.sonar.tests;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/it/it-projects/maven/jee/java-module/src/test/java/org/sonar/tests/AppTest.java b/it/it-projects/maven/jee/java-module/src/test/java/org/sonar/tests/AppTest.java
deleted file mode 100644
index ce03155a801..00000000000
--- a/it/it-projects/maven/jee/java-module/src/test/java/org/sonar/tests/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sonar.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/it/it-projects/maven/jee/pom.xml b/it/it-projects/maven/jee/pom.xml
deleted file mode 100644
index d5dfb916675..00000000000
--- a/it/it-projects/maven/jee/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sonarsource.it.samples.jee</groupId>
-  <artifactId>parent</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>JEE project</name>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <modules>
-    <module>java-module</module>
-    <module>ejb-module</module>
-    <module>web-module</module>
-    <module>ear-module</module>
-  </modules>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/jee/web-module/pom.xml b/it/it-projects/maven/jee/web-module/pom.xml
deleted file mode 100644
index 9751d52f2b1..00000000000
--- a/it/it-projects/maven/jee/web-module/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.sonarsource.it.samples.jee</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>web-module</artifactId>
-  <packaging>war</packaging>
-  <name>web-module Maven Webapp</name>
-
-  <build>
-    <finalName>web-module</finalName>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_2.1_spec</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>java-module</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ejb-module</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-      <type>ejb</type>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/jee/web-module/src/main/webapp/WEB-INF/web.xml b/it/it-projects/maven/jee/web-module/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f9632..00000000000
--- a/it/it-projects/maven/jee/web-module/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
-</web-app>
diff --git a/it/it-projects/maven/jee/web-module/src/main/webapp/index.jsp b/it/it-projects/maven/jee/web-module/src/main/webapp/index.jsp
deleted file mode 100644
index c38169bb958..00000000000
--- a/it/it-projects/maven/jee/web-module/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
diff --git a/it/it-projects/maven/maven-bad-parameters/module_a/pom.xml b/it/it-projects/maven/maven-bad-parameters/module_a/pom.xml
deleted file mode 100644
index e74835222cc..00000000000
--- a/it/it-projects/maven/maven-bad-parameters/module_a/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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>
-  <artifactId>module_a</artifactId>
-  <packaging>jar</packaging>
-  <name>Module A</name>
-
-  <parent>
-    <groupId>com.sonarsource.it.samples.maven-bad-parameters</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/maven-bad-parameters/module_a/src/main/java/org/sonar/tests/Hello.java b/it/it-projects/maven/maven-bad-parameters/module_a/src/main/java/org/sonar/tests/Hello.java
deleted file mode 100644
index 4d61fb482fd..00000000000
--- a/it/it-projects/maven/maven-bad-parameters/module_a/src/main/java/org/sonar/tests/Hello.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.sonar.tests;
-
-public class Hello {
-	public static String s=null;
-	
-	public String toString() {
-		while(true) 
-		  s="hello";	
-	}
-}
\ No newline at end of file
diff --git a/it/it-projects/maven/maven-bad-parameters/module_b/pom.xml b/it/it-projects/maven/maven-bad-parameters/module_b/pom.xml
deleted file mode 100644
index 84194b9c290..00000000000
--- a/it/it-projects/maven/maven-bad-parameters/module_b/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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>
-  <artifactId>module_b</artifactId>
-  <packaging>jar</packaging>
-  <name>Module B</name>
-
-  <parent>
-    <groupId>com.sonarsource.it.samples.maven-bad-parameters</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/maven-bad-parameters/module_b/src/main/java/org/sonar/tests/Hello.java b/it/it-projects/maven/maven-bad-parameters/module_b/src/main/java/org/sonar/tests/Hello.java
deleted file mode 100644
index 4d61fb482fd..00000000000
--- a/it/it-projects/maven/maven-bad-parameters/module_b/src/main/java/org/sonar/tests/Hello.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.sonar.tests;
-
-public class Hello {
-	public static String s=null;
-	
-	public String toString() {
-		while(true) 
-		  s="hello";	
-	}
-}
\ No newline at end of file
diff --git a/it/it-projects/maven/maven-bad-parameters/pom.xml b/it/it-projects/maven/maven-bad-parameters/pom.xml
deleted file mode 100644
index a38b06c51b9..00000000000
--- a/it/it-projects/maven/maven-bad-parameters/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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>
-  <groupId>com.sonarsource.it.samples.maven-bad-parameters</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Sonar tests - maven-bad-parameters</name>
-  <modules>
-    <module>module_a</module>
-    <module>module_b</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-          <!-- SONAR-518 -->
-          <skip>true</skip>
-          <!-- SONAR-593 -->
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <!-- SONAR-519 -->
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <!-- SONAR-593 -->
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/maven-bad-sources-property/pom.xml b/it/it-projects/maven/maven-bad-sources-property/pom.xml
deleted file mode 100644
index daab137db14..00000000000
--- a/it/it-projects/maven/maven-bad-sources-property/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-
-  <groupId>com.sonarsource.it.samples</groupId>
-  <artifactId>maven-bad-sources-property</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <properties>
-    <sonar.sources>src/main/java2</sonar.sources>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/it/it-projects/maven/maven-bad-sources-property/src/main/java/Hello.java b/it/it-projects/maven/maven-bad-sources-property/src/main/java/Hello.java
deleted file mode 100644
index 224a668297d..00000000000
--- a/it/it-projects/maven/maven-bad-sources-property/src/main/java/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
-  public String hello() {
-    return "hello";
-  }
-}
diff --git a/it/it-projects/maven/maven-bad-tests-property/pom.xml b/it/it-projects/maven/maven-bad-tests-property/pom.xml
deleted file mode 100644
index 024b8505d0d..00000000000
--- a/it/it-projects/maven/maven-bad-tests-property/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-
-  <groupId>com.sonarsource.it.samples</groupId>
-  <artifactId>maven-bad-tests-property</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <properties>
-    <sonar.tests>src/test/java2</sonar.tests>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/it/it-projects/maven/maven-bad-tests-property/src/main/java/Hello.java b/it/it-projects/maven/maven-bad-tests-property/src/main/java/Hello.java
deleted file mode 100644
index 224a668297d..00000000000
--- a/it/it-projects/maven/maven-bad-tests-property/src/main/java/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
-  public String hello() {
-    return "hello";
-  }
-}
diff --git a/it/it-projects/maven/maven-bad-tests-property/src/test/java/HelloTest.java b/it/it-projects/maven/maven-bad-tests-property/src/test/java/HelloTest.java
deleted file mode 100644
index ffa7ea2109e..00000000000
--- a/it/it-projects/maven/maven-bad-tests-property/src/test/java/HelloTest.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class HelloTest {
-
-}
diff --git a/it/it-projects/maven/maven-extensions/pom.xml b/it/it-projects/maven/maven-extensions/pom.xml
deleted file mode 100644
index 1634b63e61b..00000000000
--- a/it/it-projects/maven/maven-extensions/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<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>
-  <groupId>com.sonarsource.it.samples</groupId>
-  <artifactId>maven-extensions</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>Sonar tests - maven extensions</name>
-  <description>http://jira.codehaus.org/browse/SONAR-222</description>
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.jvnet.wagon-svn</groupId>
-        <artifactId>wagon-svn</artifactId>
-        <version>1.9</version>
-      </extension>
-
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-2</version>
-      </extension>
-    </extensions>
-  </build>
-</project>
\ No newline at end of file
diff --git a/it/it-projects/maven/maven-extensions/src/main/java/org/sonar/tests/mavenExtensions/Hello.java b/it/it-projects/maven/maven-extensions/src/main/java/org/sonar/tests/mavenExtensions/Hello.java
deleted file mode 100644
index 5967512fb80..00000000000
--- a/it/it-projects/maven/maven-extensions/src/main/java/org/sonar/tests/mavenExtensions/Hello.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.sonar.tests.mavenExtensions;
-
-public class Hello {
-  private String hello;
-  
-  public Hello(String s){
-    this.hello = s;
-  }
-  
-  public String say() {
-  	return hello;
-  }
-}
diff --git a/it/it-projects/maven/maven-only-test-dir/pom.xml b/it/it-projects/maven/maven-only-test-dir/pom.xml
deleted file mode 100644
index e1b343f6b53..00000000000
--- a/it/it-projects/maven/maven-only-test-dir/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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>
-
-  <groupId>com.sonarsource.it.samples</groupId>
-  <artifactId>maven-only-test-dir</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/it/it-projects/maven/maven-only-test-dir/src/test/java/HelloTest.java b/it/it-projects/maven/maven-only-test-dir/src/test/java/HelloTest.java
deleted file mode 100644
index bef477b4c1c..00000000000
--- a/it/it-projects/maven/maven-only-test-dir/src/test/java/HelloTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotSame;
-
-public class HelloTest {
-  @Test
-  public void hiho() {
-    assertNotSame("hi", "ho");
-  }
-}
diff --git a/it/it-projects/maven/maven-override-sources/pom.xml b/it/it-projects/maven/maven-override-sources/pom.xml
deleted file mode 100644
index a8fbbac3cde..00000000000
--- a/it/it-projects/maven/maven-override-sources/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-
-  <groupId>com.sonarsource.it.samples</groupId>
-  <artifactId>maven-override-sources</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <properties>
-    <sonar.sources>src/main/java2</sonar.sources>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/it/it-projects/maven/maven-override-sources/src/main/java/Hello.java b/it/it-projects/maven/maven-override-sources/src/main/java/Hello.java
deleted file mode 100644
index 224a668297d..00000000000
--- a/it/it-projects/maven/maven-override-sources/src/main/java/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
-  public String hello() {
-    return "hello";
-  }
-}
diff --git a/it/it-projects/maven/maven-override-sources/src/main/java2/Hello2.java b/it/it-projects/maven/maven-override-sources/src/main/java2/Hello2.java
deleted file mode 100644
index 4bb53827bb6..00000000000
--- a/it/it-projects/maven/maven-override-sources/src/main/java2/Hello2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello2 {
-  public String hello() {
-    return "hello";
-  }
-}
diff --git a/it/it-projects/maven/modules-declaration/module_a/pom.xml b/it/it-projects/maven/modules-declaration/module_a/pom.xml
deleted file mode 100644
index 73191c11f29..00000000000
--- a/it/it-projects/maven/modules-declaration/module_a/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-declaration</groupId>
-    <artifactId>root</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>module_a</artifactId>
-
-  <name>Module A</name>
-
-</project>
diff --git a/it/it-projects/maven/modules-declaration/module_a/src/main/java/HelloA.java b/it/it-projects/maven/modules-declaration/module_a/src/main/java/HelloA.java
deleted file mode 100644
index ac7c3f94636..00000000000
--- a/it/it-projects/maven/modules-declaration/module_a/src/main/java/HelloA.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloA {
-}
diff --git a/it/it-projects/maven/modules-declaration/module_b/pom.xml b/it/it-projects/maven/modules-declaration/module_b/pom.xml
deleted file mode 100644
index b31c90d4731..00000000000
--- a/it/it-projects/maven/modules-declaration/module_b/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-declaration</groupId>
-    <artifactId>root</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>module_b</artifactId>
-
-  <name>Module B</name>
-
-</project>
diff --git a/it/it-projects/maven/modules-declaration/module_b/src/main/java/HelloB.java b/it/it-projects/maven/modules-declaration/module_b/src/main/java/HelloB.java
deleted file mode 100644
index 4ee68d3ed39..00000000000
--- a/it/it-projects/maven/modules-declaration/module_b/src/main/java/HelloB.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloB {
-}
diff --git a/it/it-projects/maven/modules-declaration/module_c/pom.xml b/it/it-projects/maven/modules-declaration/module_c/pom.xml
deleted file mode 100644
index ab027ada34b..00000000000
--- a/it/it-projects/maven/modules-declaration/module_c/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-declaration</groupId>
-    <artifactId>root</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>module_c</artifactId>
-
-  <name>Module C</name>
-
-</project>
diff --git a/it/it-projects/maven/modules-declaration/module_c/src/main/java/HelloC.java b/it/it-projects/maven/modules-declaration/module_c/src/main/java/HelloC.java
deleted file mode 100644
index 242abb3a77f..00000000000
--- a/it/it-projects/maven/modules-declaration/module_c/src/main/java/HelloC.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloC {
-}
diff --git a/it/it-projects/maven/modules-declaration/module_d/mypom.xml b/it/it-projects/maven/modules-declaration/module_d/mypom.xml
deleted file mode 100644
index 13a86363e0e..00000000000
--- a/it/it-projects/maven/modules-declaration/module_d/mypom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-declaration</groupId>
-    <artifactId>root</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>module_d</artifactId>
-
-  <name>Module D</name>
-
-</project>
diff --git a/it/it-projects/maven/modules-declaration/module_d/src/main/java/HelloD.java b/it/it-projects/maven/modules-declaration/module_d/src/main/java/HelloD.java
deleted file mode 100644
index b01a5d8d3ba..00000000000
--- a/it/it-projects/maven/modules-declaration/module_d/src/main/java/HelloD.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloD {
-}
diff --git a/it/it-projects/maven/modules-declaration/module_e/mypom b/it/it-projects/maven/modules-declaration/module_e/mypom
deleted file mode 100644
index de92d8431ec..00000000000
--- a/it/it-projects/maven/modules-declaration/module_e/mypom
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-declaration</groupId>
-    <artifactId>root</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>module_e</artifactId>
-
-  <name>Module E</name>
-
-</project>
diff --git a/it/it-projects/maven/modules-declaration/module_e/src/main/java/HelloE.java b/it/it-projects/maven/modules-declaration/module_e/src/main/java/HelloE.java
deleted file mode 100644
index 041f6e8984b..00000000000
--- a/it/it-projects/maven/modules-declaration/module_e/src/main/java/HelloE.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloE {
-}
diff --git a/it/it-projects/maven/modules-declaration/pom.xml b/it/it-projects/maven/modules-declaration/pom.xml
deleted file mode 100644
index 0d4eedf4e96..00000000000
--- a/it/it-projects/maven/modules-declaration/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<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>
-
-  <groupId>org.sonar.tests.modules-declaration</groupId>
-  <artifactId>root</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Root</name>
-
-  <modules>
-    <!-- Standard/normal way - directory name -->
-    <module>module_a</module>
-
-    <!-- Just in case - trailing slash in a directory name -->
-    <module>module_b/</module>
-
-    <!-- File with usual name -->
-    <module>module_c/pom.xml</module>
-
-    <!-- Strange use case, but seems valid (tested with Maven 2.0.11, 2.2.1 and 3.0.3) - file with unusual name -->
-    <module>module_d/mypom.xml</module>
-    <module>module_e/mypom</module>
-  </modules>
-
-</project>
diff --git a/it/it-projects/maven/modules-order/README.txt b/it/it-projects/maven/modules-order/README.txt
deleted file mode 100644
index 0401f824428..00000000000
--- a/it/it-projects/maven/modules-order/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Order of modules during build would look as following :
-parent
-module_a
-module_b
-root
diff --git a/it/it-projects/maven/modules-order/module_a/pom.xml b/it/it-projects/maven/modules-order/module_a/pom.xml
deleted file mode 100644
index 9fe82af9acb..00000000000
--- a/it/it-projects/maven/modules-order/module_a/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-order</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <artifactId>module_a</artifactId>
-
-  <name>Module A</name>
-</project>
diff --git a/it/it-projects/maven/modules-order/module_a/src/main/java/HelloA.java b/it/it-projects/maven/modules-order/module_a/src/main/java/HelloA.java
deleted file mode 100644
index ac7c3f94636..00000000000
--- a/it/it-projects/maven/modules-order/module_a/src/main/java/HelloA.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloA {
-}
diff --git a/it/it-projects/maven/modules-order/module_b/pom.xml b/it/it-projects/maven/modules-order/module_b/pom.xml
deleted file mode 100644
index 00883638007..00000000000
--- a/it/it-projects/maven/modules-order/module_b/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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.sonar.tests.modules-order</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <artifactId>module_b</artifactId>
-
-  <name>Module B</name>
-</project>
diff --git a/it/it-projects/maven/modules-order/module_b/src/main/java/HelloB.java b/it/it-projects/maven/modules-order/module_b/src/main/java/HelloB.java
deleted file mode 100644
index 4ee68d3ed39..00000000000
--- a/it/it-projects/maven/modules-order/module_b/src/main/java/HelloB.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class HelloB {
-}
diff --git a/it/it-projects/maven/modules-order/parent/pom.xml b/it/it-projects/maven/modules-order/parent/pom.xml
deleted file mode 100644
index 54873b339db..00000000000
--- a/it/it-projects/maven/modules-order/parent/pom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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>
-
-  <groupId>org.sonar.tests.modules-order</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Parent</name>
-</project>
diff --git a/it/it-projects/maven/modules-order/pom.xml b/it/it-projects/maven/modules-order/pom.xml
deleted file mode 100644
index 4b646b849c8..00000000000
--- a/it/it-projects/maven/modules-order/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<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>
-
-  <groupId>org.sonar.tests.modules-order</groupId>
-  <artifactId>root</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Sonar tests - modules order</name>
-
-  <modules>
-    <module>parent</module>
-    <module>module_a</module>
-    <module>module_b</module>
-  </modules>
-</project>
diff --git a/it/it-projects/maven/project-with-module-without-sources/pom.xml b/it/it-projects/maven/project-with-module-without-sources/pom.xml
deleted file mode 100644
index afb83f459ea..00000000000
--- a/it/it-projects/maven/project-with-module-without-sources/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sonarsource.it.samples.project-with-module-without-sources</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>with-sources</module>
-    <module>without-sources</module>
-  </modules>
-</project>
diff --git a/it/it-projects/maven/project-with-module-without-sources/with-sources/pom.xml b/it/it-projects/maven/project-with-module-without-sources/with-sources/pom.xml
deleted file mode 100644
index 393f9202bd7..00000000000
--- a/it/it-projects/maven/project-with-module-without-sources/with-sources/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<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>com.sonarsource.it.samples.project-with-module-without-sources</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>with-sources</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Module with sources</name>
- 
-</project>
diff --git a/it/it-projects/maven/project-with-module-without-sources/with-sources/src/main/java/sample/Sample.java b/it/it-projects/maven/project-with-module-without-sources/with-sources/src/main/java/sample/Sample.java
deleted file mode 100644
index b1210973dd9..00000000000
--- a/it/it-projects/maven/project-with-module-without-sources/with-sources/src/main/java/sample/Sample.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;
-
-public class Sample {
-	
-	public Sample(int i) {
-		int j = i++;
-	}
-	
-	private String myMethod() {
-		return "hello";
-	}
-}
diff --git a/it/it-projects/maven/project-with-module-without-sources/without-sources/pom.xml b/it/it-projects/maven/project-with-module-without-sources/without-sources/pom.xml
deleted file mode 100644
index cdd2f0096a1..00000000000
--- a/it/it-projects/maven/project-with-module-without-sources/without-sources/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<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>com.sonarsource.it.samples.project-with-module-without-sources</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>without-sources</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Module without sources</name>
- 
-</project>
diff --git a/it/it-projects/maven/shade-with-dependency-reduced-pom/child1/pom.xml b/it/it-projects/maven/shade-with-dependency-reduced-pom/child1/pom.xml
deleted file mode 100644
index 2c0049a65de..00000000000
--- a/it/it-projects/maven/shade-with-dependency-reduced-pom/child1/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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.foo.bar</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>child1</artifactId>
- 
-</project>
diff --git a/it/it-projects/maven/shade-with-dependency-reduced-pom/child2/pom.xml b/it/it-projects/maven/shade-with-dependency-reduced-pom/child2/pom.xml
deleted file mode 100644
index a25279f1f8b..00000000000
--- a/it/it-projects/maven/shade-with-dependency-reduced-pom/child2/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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.foo.bar</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>child2</artifactId>
- 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.7.1</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <!-- here lies a problem, (true is the default)  -->
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.foo.bar</groupId>
-            <artifactId>child1</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-
-</project>
diff --git a/it/it-projects/maven/shade-with-dependency-reduced-pom/pom.xml b/it/it-projects/maven/shade-with-dependency-reduced-pom/pom.xml
deleted file mode 100644
index af12af572e3..00000000000
--- a/it/it-projects/maven/shade-with-dependency-reduced-pom/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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>
-
-    
-    <groupId>org.foo.bar</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    
-    <modules>
-        <module>child1</module>
-        <module>child2</module>
-    </modules>
-
-
-
-</project>
-
diff --git a/it/it-tests/src/test/java/it/Category3Suite.java b/it/it-tests/src/test/java/it/Category3Suite.java
index 910f4e4b6c0..7d96b505825 100644
--- a/it/it-tests/src/test/java/it/Category3Suite.java
+++ b/it/it-tests/src/test/java/it/Category3Suite.java
@@ -20,12 +20,11 @@
 package it;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.analysis.BatchTest;
+import it.analysis.ScannerTest;
 import it.analysis.ExtensionLifecycleTest;
 import it.analysis.IssueJsonReportTest;
 import it.analysis.IssuesModeTest;
 import it.analysis.LinksTest;
-import it.analysis.MavenTest;
 import it.analysis.MultiLanguageTest;
 import it.analysis.ProjectBuilderTest;
 import it.analysis.ProjectProvisioningTest;
@@ -48,13 +47,12 @@ import static util.ItUtils.xooPlugin;
   // analysis
   ExtensionLifecycleTest.class,
   LinksTest.class,
-  MavenTest.class,
   ProjectBuilderTest.class,
   TempFolderTest.class,
   MultiLanguageTest.class,
   IssueJsonReportTest.class,
   ProjectProvisioningTest.class,
-  BatchTest.class,
+  ScannerTest.class,
   IssuesModeTest.class,
   SettingsEncryptionTest.class,
   ReportDumpTest.class,
diff --git a/it/it-tests/src/test/java/it/analysis/MavenTest.java b/it/it-tests/src/test/java/it/analysis/MavenTest.java
deleted file mode 100644
index ad9d0cc33cd..00000000000
--- a/it/it-tests/src/test/java/it/analysis/MavenTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package it.analysis;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.BuildResult;
-import com.sonar.orchestrator.build.MavenBuild;
-import it.Category3Suite;
-import java.util.List;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.sonar.wsclient.Sonar;
-import org.sonar.wsclient.services.Resource;
-import org.sonar.wsclient.services.ResourceQuery;
-import util.ItUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MavenTest {
-
-  @ClassRule
-  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
-
-  @Before
-  public void deleteData() {
-    orchestrator.resetData();
-  }
-
-  @Test
-  public void shouldSupportJarWithoutSources() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/project-with-module-without-sources"))
-      .setCleanSonarGoals();
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient()
-      .find(ResourceQuery.createForMetrics("com.sonarsource.it.samples.project-with-module-without-sources:parent", "files"));
-    assertThat(project.getMeasureIntValue("files")).isEqualTo(1);
-
-    Resource subProject = orchestrator.getServer().getWsClient().find(ResourceQuery.create("com.sonarsource.it.samples.project-with-module-without-sources:without-sources"));
-    assertThat(subProject).isNotNull();
-  }
-
-  /**
-   * See SONAR-594
-   */
-  @Test
-  public void shouldSupportJeeProjects() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/jee"))
-      .setGoals("clean install", "sonar:sonar");
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("com.sonarsource.it.samples.jee:parent", "files"));
-    assertThat(project.getMeasureIntValue("files")).isEqualTo(2);
-
-    List<Resource> modules = orchestrator.getServer().getWsClient().findAll(ResourceQuery.create("com.sonarsource.it.samples.jee:parent").setDepth(-1).setQualifiers("BRC"));
-    assertThat(modules).hasSize(4);
-  }
-
-  /**
-   * See SONAR-222
-   */
-  @Test
-  public void shouldSupportMavenExtensions() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/maven-extensions"))
-      .setCleanSonarGoals();
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("com.sonarsource.it.samples:maven-extensions", "files"));
-    assertThat(project.getMeasureIntValue("files")).isEqualTo(1);
-  }
-
-  /**
-   * This test should be splitted. It checks multiple use-cases at the same time : SONAR-518, SONAR-519 and SONAR-593
-   */
-  @Test
-  public void testBadMavenParameters() {
-    // should not fail
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/maven-bad-parameters"))
-      .setCleanSonarGoals();
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("com.sonarsource.it.samples.maven-bad-parameters:parent", "files"));
-    assertThat(project.getMeasureIntValue("files")).isGreaterThan(0);
-  }
-
-  @Test
-  public void shouldAnalyzeMultiModules() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/modules-order"))
-      .setCleanSonarGoals()
-      .setProperty("sonar.dynamicAnalysis", "false");
-    orchestrator.executeBuild(build);
-
-    Sonar sonar = orchestrator.getServer().getWsClient();
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-order:root")).getName()).isEqualTo("Sonar tests - modules order");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-order:parent")).getName()).isEqualTo("Parent");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-order:module_a")).getName()).isEqualTo("Module A");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-order:module_a:src/main/java/HelloA.java")).getName()).isEqualTo("HelloA.java");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-order:module_b")).getName()).isEqualTo("Module B");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-order:module_b:src/main/java/HelloB.java")).getName()).isEqualTo("HelloB.java");
-  }
-
-  /**
-   * See SONAR-2735
-   */
-  @Test
-  public void shouldSupportDifferentDeclarationsForModules() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/modules-declaration"))
-      .setCleanSonarGoals()
-      .setProperty("sonar.dynamicAnalysis", "false");
-    orchestrator.executeBuild(build);
-    Sonar sonar = orchestrator.getServer().getWsClient();
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:root")).getName()).isEqualTo("Root");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_a")).getName()).isEqualTo("Module A");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_a:src/main/java/HelloA.java")).getName()).isEqualTo("HelloA.java");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_b")).getName()).isEqualTo("Module B");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_b:src/main/java/HelloB.java")).getName()).isEqualTo("HelloB.java");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_c")).getName()).isEqualTo("Module C");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_c:src/main/java/HelloC.java")).getName()).isEqualTo("HelloC.java");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_d")).getName()).isEqualTo("Module D");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_d:src/main/java/HelloD.java")).getName()).isEqualTo("HelloD.java");
-
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_e")).getName()).isEqualTo("Module E");
-    assertThat(sonar.find(new ResourceQuery("org.sonar.tests.modules-declaration:module_e:src/main/java/HelloE.java")).getName()).isEqualTo("HelloE.java");
-  }
-
-  /**
-   * See SONAR-3843
-   */
-  @Test
-  public void should_support_shade_with_dependency_reduced_pom_with_clean_install_sonar_goals() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/shade-with-dependency-reduced-pom"))
-      .setProperty("sonar.dynamicAnalysis", "false")
-      .setGoals("clean", "install", "sonar:sonar");
-
-    orchestrator.executeBuild(build);
-  }
-
-  /**
-   * SONAR-4245
-   */
-  @Test
-  @Ignore("This test should be moved to a Medium test of the Compute Engine")
-  public void should_prevent_analysis_of_module_then_project() {
-    MavenBuild scan = MavenBuild.create(ItUtils.projectPom("shared/multi-modules-sample/module_a"))
-      .setProperty("sonar.dynamicAnalysis", "false")
-      .setCleanSonarGoals();
-    orchestrator.executeBuild(scan);
-
-    scan = MavenBuild.create(ItUtils.projectPom("shared/multi-modules-sample"))
-      .setProperty("sonar.dynamicAnalysis", "false")
-      .setCleanSonarGoals();
-    BuildResult result = orchestrator.executeBuildQuietly(scan);
-    assertThat(result.getStatus()).isNotEqualTo(0);
-    assertThat(result.getLogs()).contains("The project 'com.sonarsource.it.samples:module_a' is already defined in SonarQube "
-      + "but not as a module of project 'com.sonarsource.it.samples:multi-modules-sample'. "
-      + "If you really want to stop directly analysing project 'com.sonarsource.it.samples:module_a', "
-      + "please first delete it from SonarQube and then relaunch the analysis of project 'com.sonarsource.it.samples:multi-modules-sample'.");
-  }
-
-  /**
-   * src/main/java is missing
-   */
-  @Test
-  public void maven_project_with_only_test_dir() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/maven-only-test-dir")).setCleanPackageSonarGoals();
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("com.sonarsource.it.samples:maven-only-test-dir", "tests", "files"));
-    assertThat(project.getMeasureIntValue("tests")).isEqualTo(1);
-    assertThat(project.getMeasure("files")).isNull();
-  }
-
-  /**
-   * The property sonar.sources overrides the source dirs as declared in Maven
-   */
-  @Test
-  public void override_sources() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/maven-override-sources")).setGoals("sonar:sonar");
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("com.sonarsource.it.samples:maven-override-sources", "files"));
-    assertThat(project.getMeasureIntValue("files")).isEqualTo(1);
-
-    Resource file = orchestrator.getServer().getWsClient().find(ResourceQuery.create("com.sonarsource.it.samples:maven-override-sources:src/main/java2/Hello2.java"));
-    assertThat(file).isNotNull();
-  }
-
-  /**
-   * The property sonar.inclusions overrides the property sonar.sources
-   */
-  @Test
-  public void inclusions_apply_to_source_dirs() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/inclusions_apply_to_source_dirs")).setGoals("sonar:sonar");
-    orchestrator.executeBuild(build);
-
-    Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("com.sonarsource.it.samples:inclusions_apply_to_source_dirs", "files"));
-    assertThat(project.getMeasureIntValue("files")).isEqualTo(1);
-
-    Resource file = orchestrator.getServer().getWsClient().find(ResourceQuery.create("com.sonarsource.it.samples:inclusions_apply_to_source_dirs:src/main/java/Hello2.java"));
-    assertThat(file).isNotNull();
-  }
-
-  /**
-   * The property sonar.sources has a typo -> fail, like in sonar-runner
-   */
-  @Test
-  public void fail_if_bad_value_of_sonar_sources_property() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/maven-bad-sources-property")).setGoals("sonar:sonar");
-    BuildResult result = orchestrator.executeBuildQuietly(build);
-    assertThat(result.getStatus()).isNotEqualTo(0);
-    assertThat(result.getLogs()).contains(
-      "java2' does not exist for Maven module com.sonarsource.it.samples:maven-bad-sources-property:jar:1.0-SNAPSHOT. Please check the property sonar.sources");
-  }
-
-  /**
-   * The property sonar.sources has a typo -> fail, like in sonar-runner
-   */
-  @Test
-  public void fail_if_bad_value_of_sonar_tests_property() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("maven/maven-bad-tests-property")).setGoals("sonar:sonar");
-    BuildResult result = orchestrator.executeBuildQuietly(build);
-    assertThat(result.getStatus()).isNotEqualTo(0);
-    assertThat(result.getLogs()).contains(
-      "java2' does not exist for Maven module com.sonarsource.it.samples:maven-bad-tests-property:jar:1.0-SNAPSHOT. Please check the property sonar.tests");
-  }
-
-}
diff --git a/it/it-tests/src/test/java/it/analysis/BatchTest.java b/it/it-tests/src/test/java/it/analysis/ScannerTest.java
index 194c2b74f07..61220c4fa99 100644
--- a/it/it-tests/src/test/java/it/analysis/BatchTest.java
+++ b/it/it-tests/src/test/java/it/analysis/ScannerTest.java
@@ -49,7 +49,7 @@ import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BatchTest {
+public class ScannerTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;