Get rid of unnecessary files in assembly

This requires upgrade of maven-assembly-plugin to 2.2.2 because of
MASSEMBLY-570. Also should be noted that upgrade to 2.3 more
complicated - see comments for MASSEMBLY-449.

diff --git a/pom.xml b/pom.xml
index 7f78f4485e4c26c06e08ce6baf167c18be33cb43..bcc90d21bc367c011cb31b9c5c9591d68ae89545 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2.1</version>
+          <version>2.2.2</version>
           <configuration>
             <archiverConfig>
               <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 -->

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 95586403dcff64baef7c99cacc48b846a0b771bd..f2d3f81f581748a1d66ff8d13b96075e937ee29d 100644 (file)
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -26,7 +26,7 @@
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
         <include>org.codehaus.sonar.plugins:*</include>
-        <include>org.codehaus.sonar-plugins.*:*</include>
+        <include>org.codehaus.sonar-plugins.*:sonar-*-plugin</include>
       </includes>
     </dependencySet>
     <!-- Server -->

diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 4f8085530e9692543fa4758ef0eb13c300dd6f28..5676d17208e410eee587d3afb3fd11a2ad5a172b 100644 (file)
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -216,7 +216,7 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <maxsize>54000000</maxsize>
+                  <maxsize>52600000</maxsize>
                   <minsize>52000000</minsize>
                   <files>
                     <file>${project.build.directory}/sonar-${project.version}.zip</file>