From: David Gageot <david@gageot.net>
Date: Wed, 3 Jun 2015 11:01:27 +0000 (+0200)
Subject: Support unzipped sonarqube-application
X-Git-Tag: 5.2-RC1~1655
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d9add414c8a3ce8d34af21262d26313bd1dd03eb;p=sonarqube.git

Support unzipped sonarqube-application

mci -Ddev \
  -Dassembly.format=dir \
  -Dassembly.includeBaseDirectory=false \
  -Dassembly.checksum=false
---

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index d9c8521589a..d9c5df27888 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -2,9 +2,9 @@
 <assembly>
   <id>distribution</id>
   <formats>
-    <format>zip</format>
+    <format>${assembly.format}</format>
   </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
+  <includeBaseDirectory>${assembly.includeBaseDirectory}</includeBaseDirectory>
   <dependencySets>
     <!-- Libraries -->
     <dependencySet>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 2224bc4acb0..444e2aade81 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -15,9 +15,11 @@
 
   <properties>
     <assembly.recompressZippedFiles>true</assembly.recompressZippedFiles>
+    <assembly.format>zip</assembly.format>
+    <assembly.includeBaseDirectory>true</assembly.includeBaseDirectory>
+    <checksum.failOnError>true</checksum.failOnError>
   </properties>
 
-
   <dependencies>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
@@ -206,6 +208,7 @@
           <execution>
             <phase>package</phase>
             <configuration>
+              <failOnError>${checksum.failOnError}</failOnError>
               <target>
                 <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="md5" />
                 <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="sha" />