SONAR-6370 Shade sonar-* libraries into sonar-plugin-api

diff --git a/plugins/sonar-xoo-plugin/pom.xml b/plugins/sonar-xoo-plugin/pom.xml
index b46b87db14898108e76da1d6dd898e93def89293..f447c845372c06e001df8eee83efb60d0964e3fa 100644 (file)
--- a/plugins/sonar-xoo-plugin/pom.xml
+++ b/plugins/sonar-xoo-plugin/pom.xml
@@ -17,26 +17,24 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>10.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-plugin-api</artifactId>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-plugin-api</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index f3e2d0bd2a7d937c222d06cd44fd269316156175..2c911baec3436e944b64caf3fb9bdeb09cb58629 100644 (file)
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -105,14 +105,18 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -198,14 +202,12 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <minimizeJar>true</minimizeJar>
+              <!-- can't minimize dependencies because of some classes of sonar-duplications
+              that required by sonar-batch -->
+              <minimizeJar>false</minimizeJar>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <artifactSet>
                 <excludes>
-                  <exclude>org.codehaus.sonar:sonar-duplications</exclude>
-                  <exclude>org.codehaus.sonar:sonar-channel</exclude>
-                  <exclude>org.codehaus.sonar:sonar-colorizer</exclude>
-                  <exclude>org.codehaus.sonar:sonar-check-api</exclude>
                   <exclude>org.codehaus.sonar.plugins:sonar-email-notifications-plugin</exclude>
                   <exclude>org.codehaus.woodstox:woodstox-core-lgpl</exclude>
                   <exclude>org.codehaus.woodstox:stax2-api</exclude>