4 files changed, 15 insertions, 24 deletions
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>