Replace groupIds org.codehaus by org.sonarsource

57 files changed, 264 insertions, 253 deletions

diff --git a/it/it-plugins/access-secured-props-plugin/pom.xml b/it/it-plugins/access-secured-props-plugin/pom.xml
index 61adaec8c60..06e56bc3851 100644
--- a/it/it-plugins/access-secured-props-plugin/pom.xml
+++ b/it/it-plugins/access-secured-props-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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>
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -15,7 +15,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -25,9 +25,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>AccessSecuredPropsPlugin</pluginClass>
diff --git a/it/it-plugins/batch-plugin/pom.xml b/it/it-plugins/batch-plugin/pom.xml
index ceb46b9862e..08f79e87dfb 100644
--- a/it/it-plugins/batch-plugin/pom.xml
+++ b/it/it-plugins/batch-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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>
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -15,7 +15,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -25,9 +25,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>com.sonarsource.BatchPlugin</pluginClass>
diff --git a/it/it-plugins/extension-lifecycle-plugin/pom.xml b/it/it-plugins/extension-lifecycle-plugin/pom.xml
index bb83417f01b..ee650e63e48 100644
--- a/it/it-plugins/extension-lifecycle-plugin/pom.xml
+++ b/it/it-plugins/extension-lifecycle-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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>
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -23,9 +23,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>ExtensionLifecyclePlugin</pluginClass>
diff --git a/it/it-plugins/global-property-change-plugin/pom.xml b/it/it-plugins/global-property-change-plugin/pom.xml
index dd98ded898c..1a25ebf097a 100644
--- a/it/it-plugins/global-property-change-plugin/pom.xml
+++ b/it/it-plugins/global-property-change-plugin/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -26,9 +26,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>GlobalPropertyChangePlugin</pluginClass>
diff --git a/it/it-plugins/l10n-fr-pack/pom.xml b/it/it-plugins/l10n-fr-pack/pom.xml
index 94f31bdaf6b..c16df931308 100644
--- a/it/it-plugins/l10n-fr-pack/pom.xml
+++ b/it/it-plugins/l10n-fr-pack/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -26,9 +26,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <basePlugin>l10nen</basePlugin>
diff --git a/it/it-plugins/license-plugin/pom.xml b/it/it-plugins/license-plugin/pom.xml
index e2480fb86b7..997bb0b15d2 100644
--- a/it/it-plugins/license-plugin/pom.xml
+++ b/it/it-plugins/license-plugin/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -15,7 +15,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -25,9 +25,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>LicensePlugin</pluginClass>
diff --git a/it/it-plugins/pom.xml b/it/it-plugins/pom.xml
index db917ba0e3c..b0d7c374cef 100644
--- a/it/it-plugins/pom.xml
+++ b/it/it-plugins/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
diff --git a/it/it-plugins/project-builder-plugin/pom.xml b/it/it-plugins/project-builder-plugin/pom.xml
index c9480e41ef3..4e40bfe12e0 100644
--- a/it/it-plugins/project-builder-plugin/pom.xml
+++ b/it/it-plugins/project-builder-plugin/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -14,7 +14,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -23,9 +23,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>ProjectBuilderPlugin</pluginClass>
diff --git a/it/it-plugins/property-relocation-plugin/pom.xml b/it/it-plugins/property-relocation-plugin/pom.xml
index 1f3e0d353a6..03a4978308b 100644
--- a/it/it-plugins/property-relocation-plugin/pom.xml
+++ b/it/it-plugins/property-relocation-plugin/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -26,9 +26,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>PropertyRelocationPlugin</pluginClass>
diff --git a/it/it-plugins/property-sets-plugin/pom.xml b/it/it-plugins/property-sets-plugin/pom.xml
index 21386137c0e..284498ef620 100644
--- a/it/it-plugins/property-sets-plugin/pom.xml
+++ b/it/it-plugins/property-sets-plugin/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -19,7 +19,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -29,9 +29,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>PropertySetsPlugin</pluginClass>
diff --git a/it/it-plugins/server-plugin/pom.xml b/it/it-plugins/server-plugin/pom.xml
index 82c49fae573..65b99998c13 100644
--- a/it/it-plugins/server-plugin/pom.xml
+++ b/it/it-plugins/server-plugin/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -26,9 +26,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>ServerPlugin</pluginClass>
diff --git a/it/it-plugins/settings-encryption-plugin/pom.xml b/it/it-plugins/settings-encryption-plugin/pom.xml
index b82228ddd26..a807699242d 100644
--- a/it/it-plugins/settings-encryption-plugin/pom.xml
+++ b/it/it-plugins/settings-encryption-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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>
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -23,9 +23,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>SettingsEncryptionPlugin</pluginClass>
diff --git a/it/it-plugins/settings-plugin/pom.xml b/it/it-plugins/settings-plugin/pom.xml
index 9196eae40fc..5ca3aa02c9b 100644
--- a/it/it-plugins/settings-plugin/pom.xml
+++ b/it/it-plugins/settings-plugin/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -26,9 +26,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>SettingsPlugin</pluginClass>
diff --git a/it/it-plugins/sonar-fake-plugin/pom.xml b/it/it-plugins/sonar-fake-plugin/pom.xml
index c2ce047c495..b0239cc882f 100644
--- a/it/it-plugins/sonar-fake-plugin/pom.xml
+++ b/it/it-plugins/sonar-fake-plugin/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -17,7 +17,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -27,10 +27,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <configuration>
           <pluginClass>FakePlugin</pluginClass>
           <pluginKey>fake</pluginKey>
diff --git a/it/it-plugins/sonar-subcategories-plugin/pom.xml b/it/it-plugins/sonar-subcategories-plugin/pom.xml
index 69817d7a7db..ccbbac086aa 100644
--- a/it/it-plugins/sonar-subcategories-plugin/pom.xml
+++ b/it/it-plugins/sonar-subcategories-plugin/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it-plugins</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -21,7 +21,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${apiVersion}</version>
       <scope>provided</scope>
@@ -31,9 +31,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.12.1</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>SubCategoriesPlugin</pluginClass>
diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
index 6aab2199197..64fa4ec6820 100644
--- a/it/it-tests/pom.xml
+++ b/it/it-tests/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.it</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>it</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
@@ -23,23 +23,23 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.4.1</version>
+      <version>3.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar.plugins</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-xoo-plugin</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-application</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.sonarsource.it</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>it-plugins</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
diff --git a/it/pom.xml b/it/pom.xml
index d642948a94b..3827d74ab41 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -4,12 +4,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.sonarsource.it</groupId>
   <artifactId>it</artifactId>
   <version>5.2-SNAPSHOT</version>
   <name>SonarQube Integration Tests</name>
diff --git a/microbenchmark-template/pom.xml b/microbenchmark-template/pom.xml
index 3a23a5b48a4..33bff66e07f 100644
--- a/microbenchmark-template/pom.xml
+++ b/microbenchmark-template/pom.xml
@@ -3,8 +3,8 @@
          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.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
   <artifactId>microbenchmark-template</artifactId>
diff --git a/plugins/sonar-batch-maven-plugin/pom.xml b/plugins/sonar-batch-maven-plugin/pom.xml
index 1905981221a..6aa5bc1d1d3 100644
--- a/plugins/sonar-batch-maven-plugin/pom.xml
+++ b/plugins/sonar-batch-maven-plugin/pom.xml
@@ -4,13 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
-  <groupId>org.codehaus.sonar.plugins</groupId>
   <artifactId>sonar-batch-maven-plugin</artifactId>
   <name>SonarQube :: Batch Maven Plugin</name>
   <packaging>sonar-plugin</packaging>
@@ -23,7 +22,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -38,7 +37,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
         <configuration>
           <pluginKey>mavenbatch</pluginKey>
diff --git a/plugins/sonar-xoo-plugin/pom.xml b/plugins/sonar-xoo-plugin/pom.xml
index 1e43aaa48c2..29310fb8f1a 100644
--- a/plugins/sonar-xoo-plugin/pom.xml
+++ b/plugins/sonar-xoo-plugin/pom.xml
@@ -2,12 +2,11 @@
 <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.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
-  <groupId>org.codehaus.sonar.plugins</groupId>
   <artifactId>sonar-xoo-plugin</artifactId>
   <name>SonarQube :: Plugins :: Xoo</name>
   <packaging>sonar-plugin</packaging>
@@ -36,15 +35,14 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
-      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- unit testing -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
@@ -53,7 +51,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
         <configuration>
           <pluginKey>xoo</pluginKey>
diff --git a/pom.xml b/pom.xml
index 5aa601f2bf9..8abc7eb112a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,8 @@
          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>org.codehaus.sonar</groupId>
-  <artifactId>sonar</artifactId>
+  <groupId>org.sonarsource.sonarqube</groupId>
+  <artifactId>sonarqube</artifactId>
   <packaging>pom</packaging>
   <version>5.2-SNAPSHOT</version>
   <name>SonarQube</name>
@@ -272,9 +272,9 @@
           <version>1.8</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.sonar</groupId>
+          <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
           <artifactId>sonar-packaging-maven-plugin</artifactId>
-          <version>${sonarUpdateCenter.version}</version>
+          <version>1.15</version>
         </plugin>
         <plugin>
           <!-- declared to avoid enforcer error during SQ analysis when Clirr plugin installed -->
@@ -434,7 +434,7 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
@@ -573,6 +573,12 @@
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-channel</artifactId>
         <version>4.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
@@ -580,47 +586,47 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-markdown</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-check-api</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-colorizer</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-core</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-db</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-batch-protocol</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-ws</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-duplications</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-home</artifactId>
         <version>${sq.version}</version>
       </dependency>
@@ -645,7 +651,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-plugin-api</artifactId>
         <version>${sq.version}</version>
       </dependency>
@@ -655,12 +661,27 @@
         <version>${sonarUpdateCenter.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>sonar-server</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar.plugins</groupId>
+        <groupId>org.codehaus.sonar</groupId>
+        <artifactId>sonar-squid</artifactId>
+        <version>4.1</version>
+        <exclusions>
+          <exclusion>
+            <!--
+            Provided at runtime by sonar-plugin-api.
+            Do not use transitive version 4.1 but the current version.
+             -->
+            <groupId>org.codehaus.sonar</groupId>
+            <artifactId>sonar-check-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-xoo-plugin</artifactId>
         <version>${sq.version}</version>
         <scope>test</scope>
@@ -678,12 +699,12 @@
         <type>sonar-plugin</type>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-testing-harness</artifactId>
         <version>${sq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-views-bridge</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -727,6 +748,10 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1356,11 +1381,11 @@
                   <pluginExecutions>
                     <pluginExecution>
                       <pluginExecutionFilter>
-                        <groupId>org.codehaus.sonar</groupId>
+                        <groupId>org.sonarsource.sonarqube</groupId>
                         <artifactId>sonar-packaging-maven-plugin</artifactId>
                         <versionRange>[1.0,)</versionRange>
                         <goals>
-                          <goal>check-dependencies</goal>
+                          <goal>check</goal>
                         </goals>
                       </pluginExecutionFilter>
                       <action>
diff --git a/server/pom.xml b/server/pom.xml
index e1fafe5fa9c..ccd761577e9 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -2,8 +2,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
   <artifactId>server</artifactId>
diff --git a/server/sonar-process-monitor/pom.xml b/server/sonar-process-monitor/pom.xml
index c1b0f4ea123..6ff38e1b682 100644
--- a/server/sonar-process-monitor/pom.xml
+++ b/server/sonar-process-monitor/pom.xml
@@ -1,7 +1,7 @@
 <?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/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-process</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -45,7 +45,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
@@ -55,7 +55,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-process</artifactId>
       <type>test-jar</type>
       <version>${project.version}</version>
diff --git a/server/sonar-process/pom.xml b/server/sonar-process/pom.xml
index 85dc25c5778..8e25d9a3649 100644
--- a/server/sonar-process/pom.xml
+++ b/server/sonar-process/pom.xml
@@ -1,7 +1,7 @@
 <?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/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
@@ -36,7 +36,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/server/sonar-search/pom.xml b/server/sonar-search/pom.xml
index 0263b8a1320..d8349dcde7a 100644
--- a/server/sonar-search/pom.xml
+++ b/server/sonar-search/pom.xml
@@ -1,7 +1,7 @@
 <?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/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
@@ -15,7 +15,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-process</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -50,7 +50,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/server/sonar-server-benchmarks/pom.xml b/server/sonar-server-benchmarks/pom.xml
index 2a93d45402c..47a150f4cd6 100644
--- a/server/sonar-server-benchmarks/pom.xml
+++ b/server/sonar-server-benchmarks/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
@@ -17,27 +17,27 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-db</artifactId>
       <type>test-jar</type>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-server</artifactId>
       <type>test-jar</type>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-search</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -48,7 +48,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index ec53f2d96d1..32e13c87fc1 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -3,7 +3,7 @@
          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.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
@@ -61,35 +61,34 @@
       <artifactId>h2</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-channel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-colorizer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-db</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-batch-protocol</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-home</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-markdown</artifactId>
+      <exclusions>
+        <exclusion>
+          <!-- already shaded with sonar-plugin-api -->
+          <groupId>org.codehaus.sonar</groupId>
+          <artifactId>sonar-channel</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-process</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -98,7 +97,7 @@
       <artifactId>sonar-update-center-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${project.version}</version>
       <exclusions>
@@ -184,19 +183,19 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-views-bridge</artifactId>
     </dependency>
     <!-- unit tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-db</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
@@ -221,7 +220,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-search</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/server/sonar-server/src/test/projects/pom.xml b/server/sonar-server/src/test/projects/pom.xml
index f244768228e..2ae2bb8b9ec 100644
--- a/server/sonar-server/src/test/projects/pom.xml
+++ b/server/sonar-server/src/test/projects/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>parent</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml b/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml
index 21f7ed5558d..982be1c0170 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml
+++ b/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-base-plugin</artifactId>
   <version>0.2-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -21,9 +21,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>testbase</pluginKey>
diff --git a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml b/server/sonar-server/src/test/projects/test-base-plugin/pom.xml
index 61b994c4754..c4e95936e74 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml
+++ b/server/sonar-server/src/test/projects/test-base-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-base-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -21,9 +21,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>testbase</pluginKey>
diff --git a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml b/server/sonar-server/src/test/projects/test-core-plugin/pom.xml
index fc3f082f6ec..d3e86d6cf95 100644
--- a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml
+++ b/server/sonar-server/src/test/projects/test-core-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-core-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -21,9 +21,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>core</pluginKey>
diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml b/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml
index 9b20de15a6a..e23667e6318 100644
--- a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml
+++ b/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-extend-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -21,9 +21,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>testextend</pluginKey>
diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml b/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml
index e7d242135db..2d49cca2cf2 100644
--- a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml
+++ b/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-libs-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -34,9 +34,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>testlibs</pluginKey>
diff --git a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml b/server/sonar-server/src/test/projects/test-require-plugin/pom.xml
index 2c45fb3afb0..62462ffbf34 100644
--- a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml
+++ b/server/sonar-server/src/test/projects/test-require-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-require-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -17,7 +17,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar.tests</groupId>
+      <groupId>org.sonarsource.sonarqube.tests</groupId>
       <artifactId>test-base-plugin</artifactId>
       <version>0.1-SNAPSHOT</version>
       <type>sonar-plugin</type>
@@ -28,9 +28,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>testrequire</pluginKey>
diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml b/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml
index 58aee047206..044cd94e8f0 100644
--- a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml
+++ b/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>test-requirenew-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -17,7 +17,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar.tests</groupId>
+      <groupId>org.sonarsource.sonarqube.tests</groupId>
       <artifactId>test-base-plugin</artifactId>
       <version>0.1-SNAPSHOT</version>
       <type>sonar-plugin</type>
@@ -28,9 +28,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>testrequire</pluginKey>
diff --git a/server/sonar-views-bridge/pom.xml b/server/sonar-views-bridge/pom.xml
index 18a2b0a5075..5b20b1d6376 100644
--- a/server/sonar-views-bridge/pom.xml
+++ b/server/sonar-views-bridge/pom.xml
@@ -3,7 +3,7 @@
          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.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
@@ -13,11 +13,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-plugin-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-core</artifactId>
     </dependency>
     <dependency>
diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml
index b63cb655ca3..eb7d79919e1 100644
--- a/server/sonar-web/pom.xml
+++ b/server/sonar-web/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar</groupId>
+    <groupId>org.sonarsource.sonarqube</groupId>
     <artifactId>server</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
@@ -20,7 +20,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-colorizer</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 5fb7b1b236f..582acb454b9 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -13,7 +13,7 @@
       <useTransitiveFiltering>false</useTransitiveFiltering>
       <useProjectArtifact>true</useProjectArtifact>
       <includes>
-        <include>org.codehaus.sonar:sonar-application</include>
+        <include>org.sonarsource.sonarqube:sonar-application</include>
       </includes>
     </dependencySet>
 
@@ -52,7 +52,7 @@
       <useTransitiveDependencies>true</useTransitiveDependencies>
       <useTransitiveFiltering>false</useTransitiveFiltering>
       <includes>
-        <include>org.codehaus.sonar:sonar-search</include>
+        <include>org.sonarsource.sonarqube:sonar-search</include>
       </includes>
       <scope>provided</scope>
     </dependencySet>
@@ -63,7 +63,7 @@
       <useTransitiveDependencies>true</useTransitiveDependencies>
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <includes>
-        <include>org.codehaus.sonar:sonar-server</include>
+        <include>org.sonarsource.sonarqube:sonar-server</include>
       </includes>
       <scope>provided</scope>
     </dependencySet>
@@ -73,7 +73,7 @@
       <outputDirectory>lib/batch</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
-        <include>org.codehaus.sonar:sonar-batch-shaded</include>
+        <include>org.sonarsource.sonarqube:sonar-batch-shaded</include>
       </includes>
       <scope>provided</scope>
     </dependencySet>
@@ -91,7 +91,7 @@
     <dependencySet>
       <outputDirectory>web</outputDirectory>
       <includes>
-        <include>org.codehaus.sonar:sonar-web</include>
+        <include>org.sonarsource.sonarqube:sonar-web</include>
       </includes>
       <unpack>true</unpack>
       <scope>provided</scope>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index f192e47cbfb..405a83a5a43 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -21,12 +21,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-process</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-process-monitor</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -43,25 +43,25 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-server</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-search</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-batch-shaded</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-web</artifactId>
       <version>${project.version}</version>
       <type>war</type>
@@ -120,7 +120,7 @@
 
     <!-- unit tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-batch-protocol/pom.xml b/sonar-batch-protocol/pom.xml
index 8fb61e4cabc..774286a2d69 100644
--- a/sonar-batch-protocol/pom.xml
+++ b/sonar-batch-protocol/pom.xml
@@ -2,8 +2,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -39,13 +39,13 @@
       <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-core</artifactId>
     </dependency>
 
     <!-- unit tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-batch-shaded/pom.xml b/sonar-batch-shaded/pom.xml
index 74e4bb04a02..64a1a6d0d93 100644
--- a/sonar-batch-shaded/pom.xml
+++ b/sonar-batch-shaded/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index 94c0a17be0c..39343a10fd5 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -2,8 +2,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -33,7 +33,7 @@
       <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-core</artifactId>
       <exclusions>
         <exclusion>
@@ -47,19 +47,19 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-batch-protocol</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-ws</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-home</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <exclusions>
         <exclusion>
@@ -112,7 +112,7 @@
 
     <!-- unit tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
@@ -130,7 +130,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
@@ -145,7 +145,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar.plugins</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-xoo-plugin</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml
index af8aae840d0..f418c71fb86 100644
--- a/sonar-check-api/pom.xml
+++ b/sonar-check-api/pom.xml
@@ -2,8 +2,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml
index 9d590ec2d77..5e004d2f7e9 100644
--- a/sonar-colorizer/pom.xml
+++ b/sonar-colorizer/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
@@ -32,7 +32,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index 010524b4614..97c475b3a0f 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -41,21 +41,12 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-squid</artifactId>
-      <version>4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-update-center-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-home</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-graph</artifactId>
-    </dependency>
 
     <!-- logging -->
     <dependency>
@@ -81,7 +72,7 @@
 
     <dependency>
       <!-- sonar-api-deps.jar is copied into target JAR file -->
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-plugin-api-deps</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
@@ -91,7 +82,7 @@
 
     <!-- tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-core/src/test/projects/base-plugin/pom.xml b/sonar-core/src/test/projects/base-plugin/pom.xml
index 1f15c59228c..484d5b78dea 100644
--- a/sonar-core/src/test/projects/base-plugin/pom.xml
+++ b/sonar-core/src/test/projects/base-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>base-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -11,7 +11,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>5.2-SNAPSHOT</version>
       <scope>provided</scope>
@@ -21,9 +21,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>base</pluginKey>
diff --git a/sonar-core/src/test/projects/dependent-plugin/pom.xml b/sonar-core/src/test/projects/dependent-plugin/pom.xml
index d414af74fe6..dcb4754e3fc 100644
--- a/sonar-core/src/test/projects/dependent-plugin/pom.xml
+++ b/sonar-core/src/test/projects/dependent-plugin/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>dependent-plugin</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>sonar-plugin</packaging>
@@ -11,13 +11,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>5.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar.tests</groupId>
+      <groupId>org.sonarsource.sonarqube.tests</groupId>
       <artifactId>base-plugin</artifactId>
       <version>0.1-SNAPSHOT</version>
       <type>sonar-plugin</type>
@@ -28,9 +28,9 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.sonar</groupId>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
           <pluginKey>dependent</pluginKey>
diff --git a/sonar-core/src/test/projects/pom.xml b/sonar-core/src/test/projects/pom.xml
index 0af144c8b18..8448b9ca0e4 100644
--- a/sonar-core/src/test/projects/pom.xml
+++ b/sonar-core/src/test/projects/pom.xml
@@ -2,7 +2,7 @@
 <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.codehaus.sonar.tests</groupId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>parent</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml
index 51e80f759c2..70ddd30c12f 100644
--- a/sonar-db/pom.xml
+++ b/sonar-db/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -33,11 +33,11 @@
       <artifactId>commons-csv</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-batch-protocol</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-core</artifactId>
     </dependency>
     <dependency>
@@ -77,7 +77,7 @@
 
     <!-- tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml
index 9e6ec34f5b6..021999e4982 100644
--- a/sonar-duplications/pom.xml
+++ b/sonar-duplications/pom.xml
@@ -2,8 +2,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -54,7 +54,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-home/pom.xml b/sonar-home/pom.xml
index b4877e29ce2..cc66e2116ea 100644
--- a/sonar-home/pom.xml
+++ b/sonar-home/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -21,7 +21,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml
index c653230d96e..ed77869e1cb 100644
--- a/sonar-markdown/pom.xml
+++ b/sonar-markdown/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
@@ -31,7 +31,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-plugin-api-deps/pom.xml b/sonar-plugin-api-deps/pom.xml
index f0f9356b03a..5d34bbfa09d 100644
--- a/sonar-plugin-api-deps/pom.xml
+++ b/sonar-plugin-api-deps/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index bb4634befcb..9d4519922d2 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
@@ -57,11 +57,11 @@
     embedded by plugins.
     -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-check-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-colorizer</artifactId>
       <exclusions>
         <exclusion>
@@ -71,7 +71,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-duplications</artifactId>
       <exclusions>
         <exclusion>
@@ -163,7 +163,7 @@
 
     <!-- unit tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml
index ec1271e33d1..27eced04d92 100644
--- a/sonar-testing-harness/pom.xml
+++ b/sonar-testing-harness/pom.xml
@@ -2,8 +2,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-testing-harness</artifactId>
diff --git a/sonar-ws/pom.xml b/sonar-ws/pom.xml
index 7a9c8c2a797..172d8863701 100644
--- a/sonar-ws/pom.xml
+++ b/sonar-ws/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
+    <groupId>org.sonarsource.sonarqube</groupId>
+    <artifactId>sonarqube</artifactId>
     <version>5.2-SNAPSHOT</version>
   </parent>
 
diff --git a/travis.sh b/travis.sh
index 36081781f97..a088cd267a8 100755
--- a/travis.sh
+++ b/travis.sh
@@ -34,7 +34,7 @@ MYSQL)
   ;;
 
 WEB)
-  set +eu
+set +eu
   source ~/.nvm/nvm.sh && nvm install 4
   cd server/sonar-web && npm install && npm test
   ;;
@@ -59,6 +59,7 @@ ITS)
     echo "Ignore this job since it needs access to private test licenses."
   else
     installTravisTools
+
     start_xvfb
 
     CATEGORIES=($(echo "$IT_CATEGORY" | tr '_' '\n'))