Fix classloader issue with ant 1.7.x

38 files changed, 20 insertions, 23 deletions

diff --git a/src/test/java/org/sonar/runner/internal/bootstrapper/BootstrapClassLoaderTest.java b/src/test/java/org/sonar/runner/BootstrapClassLoaderTest.java
index 9510e32..935297e 100644
--- a/src/test/java/org/sonar/runner/internal/bootstrapper/BootstrapClassLoaderTest.java
+++ b/src/test/java/org/sonar/runner/BootstrapClassLoaderTest.java
@@ -17,9 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.internal.bootstrapper;
-
-import org.sonar.runner.internal.bootstrapper.BootstrapClassLoader;
+package org.sonar.runner;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,14 +31,16 @@ public class BootstrapClassLoaderTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @Test
-  public void shouldRestrictLoadingFromParent() throws Exception {
-    BootstrapClassLoader classLoader = new BootstrapClassLoader(getClass().getClassLoader(), "org.sonar.ant");
-    assertThat(classLoader.canLoadFromParent("org.sonar.ant.Launcher")).isTrue();
+  public void should_restrict_loading_from_parent() throws Exception {
+    BootstrapClassLoader classLoader = new BootstrapClassLoader(getClass().getClassLoader(), "org.apache.ant");
+    assertThat(classLoader.canLoadFromParent("org.sonar.runner.batch.Launcher")).isFalse();
+    assertThat(classLoader.canLoadFromParent("org.sonar.runner.Runner")).isTrue();
     assertThat(classLoader.canLoadFromParent("org.objectweb.asm.ClassVisitor")).isFalse();
+    assertThat(classLoader.canLoadFromParent("org.apache.ant.project.Project")).isTrue();
   }
 
   @Test
-  public void use_isolated_system_classloader_when_parent_is_excluded() throws ClassNotFoundException {
+  public void should_use_isolated_system_classloader_when_parent_is_excluded() throws ClassNotFoundException {
     thrown.expect(ClassNotFoundException.class);
     thrown.expectMessage("org.junit.Test");
     ClassLoader parent = getClass().getClassLoader();
@@ -52,7 +52,7 @@ public class BootstrapClassLoaderTest {
   }
 
   @Test
-  public void find_in_parent_when_matches_unmasked_packages() throws ClassNotFoundException {
+  public void should_find_in_parent_when_matches_unmasked_packages() throws ClassNotFoundException {
     ClassLoader parent = getClass().getClassLoader();
     BootstrapClassLoader classLoader = new BootstrapClassLoader(parent, "org.junit");
 
diff --git a/src/test/java/org/sonar/runner/internal/bootstrapper/BootstrapperTest.java b/src/test/java/org/sonar/runner/BootstrapperTest.java
index e153695..24a73e2 100644
--- a/src/test/java/org/sonar/runner/internal/bootstrapper/BootstrapperTest.java
+++ b/src/test/java/org/sonar/runner/BootstrapperTest.java
@@ -17,9 +17,9 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.internal.bootstrapper;
+package org.sonar.runner;
 
-import org.sonar.runner.internal.bootstrapper.Bootstrapper;
+import org.sonar.runner.Bootstrapper;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/sonar/runner/RunnerTest.java b/src/test/java/org/sonar/runner/RunnerTest.java
index 1e61b1c..7b89f13 100644
--- a/src/test/java/org/sonar/runner/RunnerTest.java
+++ b/src/test/java/org/sonar/runner/RunnerTest.java
@@ -19,9 +19,6 @@
  */
 package org.sonar.runner;
 
-import org.sonar.runner.internal.bootstrapper.BootstrapException;
-import org.sonar.runner.internal.bootstrapper.Bootstrapper;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -149,8 +146,8 @@ public class RunnerTest {
 
     // but fails with older versions
     when(bootstrapper.getServerVersion()).thenReturn("2.1");
-    thrown.expect(BootstrapException.class);
-    thrown.expectMessage("Sonar 2.1 does not support Standalone Runner. Please upgrade Sonar to version 2.11 or more.");
+    thrown.expect(RunnerException.class);
+    thrown.expectMessage("Sonar 2.1 is not supported. Please upgrade Sonar to version 2.11 or more.");
     runner.checkSonarVersion(bootstrapper);
   }
 
diff --git a/src/test/java/org/sonar/runner/utils/SonarRunnerVersionTest.java b/src/test/java/org/sonar/runner/VersionTest.java
index 5b94ee4..1324f86 100644
--- a/src/test/java/org/sonar/runner/utils/SonarRunnerVersionTest.java
+++ b/src/test/java/org/sonar/runner/VersionTest.java
@@ -17,17 +17,18 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.utils;
+package org.sonar.runner;
 
 import org.junit.Test;
+import org.sonar.runner.Version;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-public class SonarRunnerVersionTest {
+public class VersionTest {
 
   @Test
   public void shouldLoadVersion() {
-    String version = SonarRunnerVersion.getVersion();
+    String version = Version.getVersion();
     assertThat(version).contains(".");
     assertThat(version).doesNotContain("$");
   }
diff --git a/src/test/java/org/sonar/runner/internal/batch/LauncherTest.java b/src/test/java/org/sonar/runner/batch/LauncherTest.java
index 979a517..54c1a92 100644
--- a/src/test/java/org/sonar/runner/internal/batch/LauncherTest.java
+++ b/src/test/java/org/sonar/runner/batch/LauncherTest.java
@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.internal.batch;
+package org.sonar.runner.batch;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.configuration.BaseConfiguration;
diff --git a/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java b/src/test/java/org/sonar/runner/batch/SonarProjectBuilderTest.java
index aa8209f..cb8b1f0 100644
--- a/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java
+++ b/src/test/java/org/sonar/runner/batch/SonarProjectBuilderTest.java
@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.internal.batch;
+package org.sonar.runner.batch;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/src/test/java/org/sonar/runner/utils/SonarRunnerUtilsTest.java b/src/test/java/org/sonar/runner/batch/SonarRunnerUtilsTest.java
index c98c8f8..0d368bf 100644
--- a/src/test/java/org/sonar/runner/utils/SonarRunnerUtilsTest.java
+++ b/src/test/java/org/sonar/runner/batch/SonarRunnerUtilsTest.java
@@ -17,14 +17,13 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.utils;
+package org.sonar.runner.batch;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.sonar.test.TestUtils;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 
@@ -48,7 +47,7 @@ public class SonarRunnerUtilsTest {
     assertThat(SonarRunnerUtils.getListFromProperty(props, "prop")).containsOnly("foo", "bar", "toto", "tutu");
   }
 
-  private Properties loadPropsFromFile(String filePath) throws FileNotFoundException, IOException {
+  private Properties loadPropsFromFile(String filePath) throws IOException {
     Properties props = new Properties();
     FileInputStream fileInputStream = null;
     try {
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
index 4e29926..4e29926 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
index 460d349..460d349 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
index d25a9e9..d25a9e9 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
index 4744284..4744284 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties
index 615f5c7..615f5c7 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
index c50d50b..c50d50b 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
index c1640b1..c1640b1 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/any-file.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
index 460d349..460d349 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties
index e246f8c..e246f8c 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
index 67fbf34..67fbf34 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
index e246f8c..e246f8c 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/shouldFilterFiles/exclude.txt b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/shouldFilterFiles/exclude.txt
index e69de29..e69de29 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/shouldFilterFiles/exclude.txt
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/shouldFilterFiles/exclude.txt
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/shouldFilterFiles/include.txt b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/shouldFilterFiles/include.txt
index e69de29..e69de29 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/shouldFilterFiles/include.txt
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/shouldFilterFiles/include.txt
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/shouldGetFile/foo.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/shouldGetFile/foo.properties
index 8fbb104..8fbb104 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/shouldGetFile/foo.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/shouldGetFile/foo.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib1.txt b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib1.txt
index 81d4e95..81d4e95 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib1.txt
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib1.txt
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib2.txt b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib2.txt
index 7dacac0..7dacac0 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib2.txt
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/libs/lib2.txt
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sonar-project.properties
index acf3c83..acf3c83 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-deprecated-props/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
index 0b83b11..0b83b11 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/libs/lib1.txt b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/libs/lib1.txt
index 81d4e95..81d4e95 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/libs/lib1.txt
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/libs/lib1.txt
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/libs/lib2.txt b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/libs/lib2.txt
index 7dacac0..7dacac0 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/libs/lib2.txt
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/libs/lib2.txt
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/sonar-project.properties b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/sonar-project.properties
index ea8a1b5..ea8a1b5 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/sonar-project.properties
diff --git a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/sources/Fake.java b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/internal/batch/SonarProjectBuilderTest/simple-project/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/batch/SonarProjectBuilderTest/simple-project/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/utils/SonarRunnerUtilsTest/shouldGetList/foo.properties b/src/test/resources/org/sonar/runner/batch/SonarRunnerUtilsTest/shouldGetList/foo.properties
index 8fbb104..8fbb104 100644
--- a/src/test/resources/org/sonar/runner/utils/SonarRunnerUtilsTest/shouldGetList/foo.properties
+++ b/src/test/resources/org/sonar/runner/batch/SonarRunnerUtilsTest/shouldGetList/foo.properties