From c818fc85b3d32c358b5149647d384cc42f4ba5a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Tue, 4 Jul 2017 17:12:34 +0200
Subject: [PATCH] SONAR-9507 move CeConfiguration to module ce and delete
 module ce-api

---
 pom.xml                                       |  5 --
 server/pom.xml                                |  1 -
 server/sonar-ce-api/pom.xml                   | 62 -------------------
 .../ce/configuration/CeConfiguration.java     |  0
 .../ce/configuration/CeConfigurationImpl.java |  0
 .../sonar/ce/configuration/package-info.java  |  0
 .../CeConfigurationImplTest.java              |  0
 server/sonar-server/pom.xml                   |  4 --
 8 files changed, 72 deletions(-)
 delete mode 100644 server/sonar-ce-api/pom.xml
 rename server/{sonar-ce-api => sonar-ce}/src/main/java/org/sonar/ce/configuration/CeConfiguration.java (100%)
 rename server/{sonar-ce-api => sonar-ce}/src/main/java/org/sonar/ce/configuration/CeConfigurationImpl.java (100%)
 rename server/{sonar-ce-api => sonar-ce}/src/main/java/org/sonar/ce/configuration/package-info.java (100%)
 rename server/{sonar-ce-api => sonar-ce}/src/test/java/org/sonar/ce/configuration/CeConfigurationImplTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 4a21c1852ff..a830b38d557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -439,11 +439,6 @@
         <artifactId>sonar-update-center-common</artifactId>
         <version>${sonarUpdateCenter.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.sonarsource.sonarqube</groupId>
-        <artifactId>sonar-ce-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-server</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index ab6a336bdb4..6e66e967f74 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,6 @@
     <module>sonar-db-migration</module>
     <module>sonar-db-dao</module>
     <module>sonar-db-testing</module>
-    <module>sonar-ce-api</module>
     <module>sonar-server</module>
     <module>sonar-ce</module>
     <module>sonar-plugin-bridge</module>
diff --git a/server/sonar-ce-api/pom.xml b/server/sonar-ce-api/pom.xml
deleted file mode 100644
index 174d67c4cac..00000000000
--- a/server/sonar-ce-api/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>server</artifactId>
-    <version>6.6-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>sonar-ce-api</artifactId>
-  <name>SonarQube :: Compute Engine API</name>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.picocontainer</groupId>
-      <artifactId>picocontainer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>sonar-plugin-api</artifactId>
-    </dependency>
-
-    <!-- unit tests -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tngtech.java</groupId>
-      <artifactId>junit-dataprovider</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-db-testing</artifactId>
-      <type>pom</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/server/sonar-ce-api/src/main/java/org/sonar/ce/configuration/CeConfiguration.java b/server/sonar-ce/src/main/java/org/sonar/ce/configuration/CeConfiguration.java
similarity index 100%
rename from server/sonar-ce-api/src/main/java/org/sonar/ce/configuration/CeConfiguration.java
rename to server/sonar-ce/src/main/java/org/sonar/ce/configuration/CeConfiguration.java
diff --git a/server/sonar-ce-api/src/main/java/org/sonar/ce/configuration/CeConfigurationImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/configuration/CeConfigurationImpl.java
similarity index 100%
rename from server/sonar-ce-api/src/main/java/org/sonar/ce/configuration/CeConfigurationImpl.java
rename to server/sonar-ce/src/main/java/org/sonar/ce/configuration/CeConfigurationImpl.java
diff --git a/server/sonar-ce-api/src/main/java/org/sonar/ce/configuration/package-info.java b/server/sonar-ce/src/main/java/org/sonar/ce/configuration/package-info.java
similarity index 100%
rename from server/sonar-ce-api/src/main/java/org/sonar/ce/configuration/package-info.java
rename to server/sonar-ce/src/main/java/org/sonar/ce/configuration/package-info.java
diff --git a/server/sonar-ce-api/src/test/java/org/sonar/ce/configuration/CeConfigurationImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/configuration/CeConfigurationImplTest.java
similarity index 100%
rename from server/sonar-ce-api/src/test/java/org/sonar/ce/configuration/CeConfigurationImplTest.java
rename to server/sonar-ce/src/test/java/org/sonar/ce/configuration/CeConfigurationImplTest.java
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 49a4e5d7738..1d73103fa0b 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -111,10 +111,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>sonar-ce-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-- 
2.39.5