From a9611c345fd6ad51c37f9470b1b08fea0e062946 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Fri, 8 Aug 2014 10:35:39 +0200
Subject: fixed cyclic dependencies

---
 server/pom.xml                    | 1 +
 server/sonar-process-test/pom.xml | 3 ++-
 server/sonar-process/pom.xml      | 6 ------
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'server')

diff --git a/server/pom.xml b/server/pom.xml
index 131d3efcbcd..27d1fc77c4f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -11,6 +11,7 @@
   <name>SonarQube :: Server :: Parent</name>
 
   <modules>
+    <module>sonar-process-test</module>
     <module>sonar-process</module>
     <module>sonar-search</module>
     <module>sonar-server</module>
diff --git a/server/sonar-process-test/pom.xml b/server/sonar-process-test/pom.xml
index 94c2090e448..c5b4876e700 100644
--- a/server/sonar-process-test/pom.xml
+++ b/server/sonar-process-test/pom.xml
@@ -20,6 +20,7 @@
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-process</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -85,7 +86,7 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
+              <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
               <minimizeJar>true</minimizeJar>
             </configuration>
           </execution>
diff --git a/server/sonar-process/pom.xml b/server/sonar-process/pom.xml
index d5ee17653b5..6c941681ba3 100644
--- a/server/sonar-process/pom.xml
+++ b/server/sonar-process/pom.xml
@@ -68,12 +68,6 @@
       <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-process-test</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
-- 
cgit v1.2.3