SONAR-6922 Fix assembly size

diff --git a/sonar-batch-protocol/pom.xml b/sonar-batch-protocol/pom.xml
index 66104efcdf958b3fdf0c3157659534b5093b2599..225cc6eb6d87bbadf93c77222f67f2dfe8cc7c7f 100644 (file)
--- a/sonar-batch-protocol/pom.xml
+++ b/sonar-batch-protocol/pom.xml
@@ -65,15 +65,14 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <finalName>scanner-report-viewer-${project.version}</finalName>
-          <appendAssemblyId>false</appendAssemblyId>
           <archive>
             <manifest>
               <mainClass>org.sonar.batch.protocol.viewer.ViewerApplication</mainClass>
             </manifest>
           </archive>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
+          <descriptors>
+            <descriptor>src/main/assembly/viewer.xml</descriptor>
+          </descriptors>
         </configuration>
         <executions>
           <execution>

diff --git a/sonar-batch-protocol/src/main/assembly/viewer.xml b/sonar-batch-protocol/src/main/assembly/viewer.xml
new file mode 100644 (file)
index 0000000..dcb1ad0
--- /dev/null
+++ b/sonar-batch-protocol/src/main/assembly/viewer.xml
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>full</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file