SONAR-9590 rename sonar-process-monitor to sonar-main

75 files changed, 4 insertions, 4 deletions

diff --git a/server/pom.xml b/server/pom.xml
index 6ecf0057406..bd0564d4620 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -14,7 +14,7 @@
 
   <modules>
     <module>sonar-process</module>
-    <module>sonar-process-monitor</module>
+    <module>sonar-main</module>
     <module>sonar-db-core</module>
     <module>sonar-db-migration</module>
     <module>sonar-db-dao</module>
diff --git a/server/sonar-process-monitor/pom.xml b/server/sonar-main/pom.xml
index 6551c151014..9aa79852803 100644
--- a/server/sonar-process-monitor/pom.xml
+++ b/server/sonar-main/pom.xml
@@ -10,8 +10,8 @@
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>sonar-process-monitor</artifactId>
-  <name>SonarQube :: Process Monitor</name>
+  <artifactId>sonar-main</artifactId>
+  <name>SonarQube :: Main Process</name>
 
   <properties>
     <!--
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppFileSystem.java b/server/sonar-main/src/main/java/org/sonar/application/AppFileSystem.java
index f397d608d55..f397d608d55 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppFileSystem.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppFileSystem.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppLogging.java b/server/sonar-main/src/main/java/org/sonar/application/AppLogging.java
index 5e19aab5945..5e19aab5945 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppLogging.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppLogging.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloader.java b/server/sonar-main/src/main/java/org/sonar/application/AppReloader.java
index f475e10f20c..f475e10f20c 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloader.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppReloader.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloaderImpl.java b/server/sonar-main/src/main/java/org/sonar/application/AppReloaderImpl.java
index 3463c1effd6..3463c1effd6 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloaderImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppReloaderImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppState.java b/server/sonar-main/src/main/java/org/sonar/application/AppState.java
index 43cb69e75c3..43cb69e75c3 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppState.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppState.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateFactory.java b/server/sonar-main/src/main/java/org/sonar/application/AppStateFactory.java
index 196aa2a9fa0..196aa2a9fa0 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateFactory.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppStateFactory.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateImpl.java b/server/sonar-main/src/main/java/org/sonar/application/AppStateImpl.java
index 9c5e03c296c..9c5e03c296c 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppStateImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateListener.java b/server/sonar-main/src/main/java/org/sonar/application/AppStateListener.java
index 581ea4004aa..581ea4004aa 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateListener.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/AppStateListener.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/FileSystem.java b/server/sonar-main/src/main/java/org/sonar/application/FileSystem.java
index efdbcd2853f..efdbcd2853f 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/FileSystem.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/FileSystem.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/NodeLifecycle.java b/server/sonar-main/src/main/java/org/sonar/application/NodeLifecycle.java
index 62e09a6adab..62e09a6adab 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/NodeLifecycle.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/NodeLifecycle.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/Scheduler.java b/server/sonar-main/src/main/java/org/sonar/application/Scheduler.java
index f69b61d2190..f69b61d2190 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/Scheduler.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/Scheduler.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
index 7311297dd3c..7311297dd3c 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java
index 5e5f2b0c717..5e5f2b0c717 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProcess.java
index b9b33402444..b9b33402444 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProcess.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
index f33877f4562..f33877f4562 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/HazelcastCluster.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
index a1e4f77fdba..a1e4f77fdba 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/package-info.java
index 4501fba7bf3..4501fba7bf3 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/package-info.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/package-info.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettings.java
index 784e7b1f173..784e7b1f173 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettings.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsImpl.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsImpl.java
index 02828a78d11..02828a78d11 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoader.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoader.java
index 5362c050370..5362c050370 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoader.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoader.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java
index 50436b6468c..50436b6468c 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/ClusterSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
index b6b8ce39128..b6b8ce39128 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/ClusterSettings.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/CommandLineParser.java b/server/sonar-main/src/main/java/org/sonar/application/config/CommandLineParser.java
index 14422fbfaf2..14422fbfaf2 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/CommandLineParser.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/CommandLineParser.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/FileSystemSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
index b7953aca498..b7953aca498 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/FileSystemSettings.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/JdbcSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/JdbcSettings.java
index 9011f167c8e..9011f167c8e 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/JdbcSettings.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/JdbcSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java b/server/sonar-main/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java
index 11b23e9bea8..11b23e9bea8 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/config/package-info.java
index 192ba670e01..192ba670e01 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/package-info.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/package-info.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/package-info.java
index 7dc3ab211ef..7dc3ab211ef 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/package-info.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/package-info.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java
index 1583a726a30..1583a726a30 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/EsProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/EsProcessMonitor.java
index 52c0a9d917a..52c0a9d917a 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/EsProcessMonitor.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/EsProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/Lifecycle.java b/server/sonar-main/src/main/java/org/sonar/application/process/Lifecycle.java
index 4d185fa71cb..4d185fa71cb 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/Lifecycle.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/Lifecycle.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java
index a54f53f7f8f..a54f53f7f8f 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessEventListener.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessEventListener.java
index a7f6a7b92b5..a7f6a7b92b5 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessEventListener.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessEventListener.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncher.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncher.java
index c39f91bc8fa..c39f91bc8fa 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncher.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncher.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
index 549e4ddfe4e..549e4ddfe4e 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java
index 384499b10c2..384499b10c2 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessMonitor.java
index 9a88393ef10..9a88393ef10 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessMonitor.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/SQProcess.java b/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
index 6aa7a29bac1..6aa7a29bac1 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/SQProcess.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcher.java b/server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcher.java
index 2fef4abd2f3..2fef4abd2f3 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcher.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcher.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java
index fc042f614c3..fc042f614c3 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StreamGobbler.java b/server/sonar-main/src/main/java/org/sonar/application/process/StreamGobbler.java
index b920360c37b..b920360c37b 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StreamGobbler.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/StreamGobbler.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/process/package-info.java
index 26e8d8e27b1..26e8d8e27b1 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/package-info.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/package-info.java
diff --git a/server/sonar-process-monitor/src/main/resources/org/sonar/application/process/elasticsearch.yml b/server/sonar-main/src/main/resources/org/sonar/application/process/elasticsearch.yml
index bca86355509..bca86355509 100644
--- a/server/sonar-process-monitor/src/main/resources/org/sonar/application/process/elasticsearch.yml
+++ b/server/sonar-main/src/main/resources/org/sonar/application/process/elasticsearch.yml
diff --git a/server/sonar-process-monitor/src/main/resources/sonarqube-version.txt b/server/sonar-main/src/main/resources/sonarqube-version.txt
index 6b7ce460f25..6b7ce460f25 100644
--- a/server/sonar-process-monitor/src/main/resources/sonarqube-version.txt
+++ b/server/sonar-main/src/main/resources/sonarqube-version.txt
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppFileSystemTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppFileSystemTest.java
index 3786190fb37..3786190fb37 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppFileSystemTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/AppFileSystemTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppLoggingTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java
index 61b5feb26db..61b5feb26db 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppLoggingTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppReloaderImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppReloaderImplTest.java
index 972720a6c7e..972720a6c7e 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppReloaderImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/AppReloaderImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateFactoryTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppStateFactoryTest.java
index ffffcc00855..ffffcc00855 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateFactoryTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/AppStateFactoryTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppStateImplTest.java
index e49c5f54758..e49c5f54758 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/AppStateImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
index f7336820816..f7336820816 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/TestAppState.java b/server/sonar-main/src/test/java/org/sonar/application/TestAppState.java
index d01b12901c7..d01b12901c7 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/TestAppState.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/TestAppState.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java
index fd0497c4932..fd0497c4932 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java
index 5472d575746..5472d575746 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java
index 05e471c7ffd..05e471c7ffd 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
index 28103e103d8..28103e103d8 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java
index 76724b38c4d..76724b38c4d 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsImplTest.java
index 2ea6215052e..2ea6215052e 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java
index d1337a8c6bc..d1337a8c6bc 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java
index de28db4592c..de28db4592c 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java
index ed89b4685d7..ed89b4685d7 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/CommandLineParserTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/CommandLineParserTest.java
index d94851e0cfc..d94851e0cfc 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/CommandLineParserTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/CommandLineParserTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java
index dd902f0d5b4..dd902f0d5b4 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/JdbcSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java
index 5b4eb945364..5b4eb945364 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/JdbcSettingsTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java
index 93c1aa065c0..93c1aa065c0 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/TestAppSettings.java b/server/sonar-main/src/test/java/org/sonar/application/config/TestAppSettings.java
index 18f063f340b..18f063f340b 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/TestAppSettings.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/config/TestAppSettings.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/LifecycleTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/LifecycleTest.java
index 79c9e47b273..79c9e47b273 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/LifecycleTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/LifecycleTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java
index 66c60fc73ee..66c60fc73ee 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
index a0a4bba391d..a0a4bba391d 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/SQProcessTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java
index 004ef445d38..004ef445d38 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/SQProcessTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java
index 6d0b9725453..6d0b9725453 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/StreamGobblerTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/StreamGobblerTest.java
index 2f1498d16dc..2f1498d16dc 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/StreamGobblerTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/StreamGobblerTest.java
diff --git a/server/sonar-process-monitor/src/test/resources/logback-test.xml b/server/sonar-main/src/test/resources/logback-test.xml
index 4c62d576dee..4c62d576dee 100644
--- a/server/sonar-process-monitor/src/test/resources/logback-test.xml
+++ b/server/sonar-main/src/test/resources/logback-test.xml
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 0baa854c572..ec4f84def41 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-process-monitor</artifactId>
+      <artifactId>sonar-main</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!--must declare this dependency of sonar-process-monitor here, again,-->