Update groupId, artifactId and packages

8 files changed, 38 insertions, 21 deletions

diff --git a/src/test/java/org/sonar/runner/cli/CliTest.java b/src/test/java/org/sonarsource/scanner/cli/CliTest.java
index 4afd99d..564146c 100644
--- a/src/test/java/org/sonar/runner/cli/CliTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/CliTest.java
@@ -17,9 +17,12 @@
  * 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.cli;
+package org.sonarsource.scanner.cli;
 
 import org.junit.Test;
+import org.sonarsource.scanner.cli.Cli;
+import org.sonarsource.scanner.cli.Exit;
+import org.sonarsource.scanner.cli.Logs;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/org/sonar/runner/cli/ConfTest.java b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
index 0bce176..a6d8149 100644
--- a/src/test/java/org/sonar/runner/cli/ConfTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/ConfTest.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.cli;
+package org.sonarsource.scanner.cli;
 
 import java.io.File;
 import java.util.Properties;
@@ -47,7 +47,7 @@ public class ConfTest {
 
   @Test
   public void should_load_global_settings_by_home() throws Exception {
-    File home = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByHome/").toURI());
+    File home = new File(getClass().getResource("ConfTest/shouldLoadRunnerSettingsByHome/").toURI());
     args.setProperty("runner.home", home.getCanonicalPath());
 
     assertThat(conf.properties().get("sonar.prop")).isEqualTo("value");
@@ -60,7 +60,7 @@ public class ConfTest {
 
   @Test
   public void should_load_conf_by_direct_path() throws Exception {
-    File settings = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties").toURI());
+    File settings = new File(getClass().getResource("ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties").toURI());
     args.setProperty("runner.settings", settings.getCanonicalPath());
 
     assertThat(conf.properties().get("sonar.prop")).isEqualTo("otherValue");
@@ -68,8 +68,8 @@ public class ConfTest {
 
   @Test
   public void shouldLoadCompleteConfiguration() throws Exception {
-    File runnerHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadCompleteConfiguration/runner").toURI());
-    File projectHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadCompleteConfiguration/project").toURI());
+    File runnerHome = new File(getClass().getResource("ConfTest/shouldLoadCompleteConfiguration/runner").toURI());
+    File projectHome = new File(getClass().getResource("ConfTest/shouldLoadCompleteConfiguration/project").toURI());
     args.setProperty("runner.home", runnerHome.getCanonicalPath());
     args.setProperty("project.home", projectHome.getCanonicalPath());
 
@@ -82,7 +82,7 @@ public class ConfTest {
 
   @Test
   public void shouldLoadModuleConfiguration() throws Exception {
-    File projectHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadModuleConfiguration/project").toURI());
+    File projectHome = new File(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI());
     args.setProperty("project.home", projectHome.getCanonicalPath());
 
     Properties properties = conf.properties();
@@ -93,7 +93,7 @@ public class ConfTest {
 
   @Test
   public void shouldSupportDeepModuleConfigurationInRoot() throws Exception {
-    File projectHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldSupportDeepModuleConfigurationInRoot/project").toURI());
+    File projectHome = new File(getClass().getResource("ConfTest/shouldSupportDeepModuleConfigurationInRoot/project").toURI());
     args.setProperty("project.home", projectHome.getCanonicalPath());
 
     Properties properties = conf.properties();
@@ -110,7 +110,7 @@ public class ConfTest {
 
   @Test
   public void shouldLoadModuleConfigurationOverrideBasedir() throws Exception {
-    File projectHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI());
+    File projectHome = new File(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI());
     args.setProperty("project.home", projectHome.getCanonicalPath());
 
     Properties properties = conf.properties();
@@ -122,7 +122,7 @@ public class ConfTest {
 
   @Test
   public void shouldSupportSettingBaseDirFromCli() throws Exception {
-    File projectHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadModuleConfiguration/project").toURI());
+    File projectHome = new File(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI());
     args.setProperty("project.home", temp.newFolder().getCanonicalPath());
     args.setProperty("sonar.projectBaseDir", projectHome.getCanonicalPath());
 
@@ -134,7 +134,7 @@ public class ConfTest {
 
   @Test
   public void ignoreEmptyModule() throws Exception {
-    File projectHome = new File(getClass().getResource("/org/sonar/runner/ConfTest/emptyModules/project").toURI());
+    File projectHome = new File(getClass().getResource("ConfTest/emptyModules/project").toURI());
     args.setProperty("project.home", temp.newFolder().getCanonicalPath());
     args.setProperty("sonar.projectBaseDir", projectHome.getCanonicalPath());
 
diff --git a/src/test/java/org/sonar/runner/cli/LogsTest.java b/src/test/java/org/sonarsource/scanner/cli/LogsTest.java
index 02a49b4..39bedff 100644
--- a/src/test/java/org/sonar/runner/cli/LogsTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/LogsTest.java
@@ -17,13 +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.cli;
+package org.sonarsource.scanner.cli;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-
+import org.sonarsource.scanner.cli.Logs;
 import java.io.PrintStream;
 
 import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/src/test/java/org/sonar/runner/cli/MainTest.java b/src/test/java/org/sonarsource/scanner/cli/MainTest.java
index 45f85a8..6875d1e 100644
--- a/src/test/java/org/sonar/runner/cli/MainTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/MainTest.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.cli;
+package org.sonarsource.scanner.cli;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -32,6 +32,13 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.sonar.runner.api.EmbeddedRunner;
+import org.sonarsource.scanner.cli.Cli;
+import org.sonarsource.scanner.cli.Conf;
+import org.sonarsource.scanner.cli.Exit;
+import org.sonarsource.scanner.cli.Logs;
+import org.sonarsource.scanner.cli.Main;
+import org.sonarsource.scanner.cli.RunnerFactory;
+import org.sonarsource.scanner.cli.Shutdown;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doThrow;
diff --git a/src/test/java/org/sonar/runner/cli/RunnerFactoryTest.java b/src/test/java/org/sonarsource/scanner/cli/RunnerFactoryTest.java
index 9ae2bfb..1caf5d5 100644
--- a/src/test/java/org/sonar/runner/cli/RunnerFactoryTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/RunnerFactoryTest.java
@@ -17,9 +17,11 @@
  * 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.cli;
+package org.sonarsource.scanner.cli;
 
 import org.sonar.runner.api.LogOutput.Level;
+import org.sonarsource.scanner.cli.Logs;
+import org.sonarsource.scanner.cli.RunnerFactory;
 import org.sonar.runner.api.LogOutput;
 import org.junit.Before;
 
diff --git a/src/test/java/org/sonar/runner/cli/ShutdownTest.java b/src/test/java/org/sonarsource/scanner/cli/ShutdownTest.java
index d41cf4e..0d6b3ba 100644
--- a/src/test/java/org/sonar/runner/cli/ShutdownTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/ShutdownTest.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.cli;
+package org.sonarsource.scanner.cli;
 
 import com.jayway.awaitility.Duration;
 import java.util.concurrent.Callable;
@@ -26,6 +26,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.sonarsource.scanner.cli.Exit;
+import org.sonarsource.scanner.cli.Shutdown;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.fest.assertions.Assertions.assertThat;
diff --git a/src/test/java/org/sonar/runner/cli/StatsTest.java b/src/test/java/org/sonarsource/scanner/cli/StatsTest.java
index 8523a1c..2d0034e 100644
--- a/src/test/java/org/sonar/runner/cli/StatsTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/StatsTest.java
@@ -17,10 +17,11 @@
  * 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.cli;
+package org.sonarsource.scanner.cli;
 
 import org.mockito.Mockito;
-
+import org.sonarsource.scanner.cli.Logs;
+import org.sonarsource.scanner.cli.Stats;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
diff --git a/src/test/java/org/sonar/runner/cli/SystemInfoTest.java b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
index ea5ba37..67bbf35 100644
--- a/src/test/java/org/sonar/runner/cli/SystemInfoTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.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.cli;
+package org.sonarsource.scanner.cli;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -26,10 +26,12 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import org.sonar.runner.api.RunnerVersion;
+import org.sonarsource.scanner.cli.Logs;
+import org.sonarsource.scanner.cli.SystemInfo;
+import org.sonarsource.scanner.cli.SystemInfo.System2;
 import org.junit.Before;
-import org.sonar.runner.cli.SystemInfo.System2;
 import org.junit.Test;
-import org.sonar.runner.cli.SystemInfo;
+
 import static org.fest.assertions.Assertions.assertThat;
 
 public class SystemInfoTest {