From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Fri, 14 Sep 2012 10:22:07 +0000 (+0600)
Subject: Get rid of unnecessary files in assembly
X-Git-Tag: 3.3~295^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d506f789ec47d6b8ea9c04fa767039a4696ce41;p=sonarqube.git

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 7f78f4485e4..bcc90d21bc3 100644
--- 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 95586403dcf..f2d3f81f581 100644
--- 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 4f8085530e9..5676d17208e 100644
--- 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>