SONAR-9057 add module sonar-ce-api

this module provides code shared by sonar-web and sonar-ce

diff --git a/pom.xml b/pom.xml
index 751f4aba531db35fe9a05026571cd7d85170b925..54c626c4bde63581284e4dad33c18cc86ab2dae8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -437,6 +437,11 @@
         <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 4d38ba0c36edf517db444e9f3048ee04af12ac81..b66092b0788e6172bd31a64e135b4ae6ebdd8814 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,6 +20,7 @@
     <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
new file mode 100644 (file)
index 0000000..c492649
--- /dev/null
+++ b/server/sonar-ce-api/pom.xml
@@ -0,0 +1,62 @@
+<?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.4-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/pom.xml b/server/sonar-ce/pom.xml
index db5569fea92a3427ee7127250778c13e8a2631f4..bf8e0519a62a2f7566500f37c0b6e36f29182204 100644 (file)
--- a/server/sonar-ce/pom.xml
+++ b/server/sonar-ce/pom.xml
@@ -14,7 +14,6 @@
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-server</artifactId>
-      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -48,6 +47,17 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-guava</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- TODO to be removed -->
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 555b2714e285a1be51fb44a63c7bc3cd0ed7e99f..2e7d895e487b2745013adf2d9415a18f7ee73a83 100644 (file)
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -115,6 +115,10 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-ce-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>