aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gageot <david@gageot.net>2015-06-03 13:01:27 +0200
committerDavid Gageot <david@gageot.net>2015-06-03 14:26:56 +0200
commitd9add414c8a3ce8d34af21262d26313bd1dd03eb (patch)
treecbe512e01beb4add8eff37fabb8257e6b2a281ce
parent00c361c7ac7032214792766ecb83caeb769ec42d (diff)
downloadsonarqube-d9add414c8a3ce8d34af21262d26313bd1dd03eb.tar.gz
sonarqube-d9add414c8a3ce8d34af21262d26313bd1dd03eb.zip
Support unzipped sonarqube-application
mci -Ddev \ -Dassembly.format=dir \ -Dassembly.includeBaseDirectory=false \ -Dassembly.checksum=false
-rw-r--r--sonar-application/assembly.xml4
-rw-r--r--sonar-application/pom.xml5
2 files changed, 6 insertions, 3 deletions
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" />