fixed cyclic dependencies

diff --git a/server/pom.xml b/server/pom.xml
index 131d3efcbcd69870e4a891f7cd42e7ad3bcfe455..27d1fc77c4fcce293dd4a6361175093a788649f7 100644 (file)
--- 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 94c2090e4480563ece2bcd1130b30a6256d9dbb3..c5b4876e70089ba61470d05558debbff66ae186e 100644 (file)
--- 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 d5ee17653b5ede0ef521ccaf5f90c1abb15292fc..6c941681ba34dbb231f5bc6ca1c3a6c4bad3c1ba 100644 (file)
--- 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>