aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-05-12 18:40:06 +0200
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-05-12 18:44:06 +0200
commitf59a579d18a7dc338c9adab23806019b14ac5c27 (patch)
tree792c9123b409379e42f4d3a401a79669085a7c8b
parent05242f4403fab7cbaa276d601b86d09634a14672 (diff)
downloadsonarqube-f59a579d18a7dc338c9adab23806019b14ac5c27.tar.gz
sonarqube-f59a579d18a7dc338c9adab23806019b14ac5c27.zip
SONAR-4636 Include branding resources when building final WAR
-rw-r--r--sonar-server/pom.xml60
1 files changed, 34 insertions, 26 deletions
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index c6aeeb8c2a7..9ad742f721f 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -260,32 +260,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>download-branding-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <!-- download file -->
- <get src="${branding.url}/_footer.html.erb"
- dest="${project.build.directory}/${project.build.finalName}/WEB-INF/app/views/branding"
- verbose="false"
- usetimestamp="false"/>
- <get src="${branding.url}/logo.png"
- dest="${project.build.directory}/${project.build.finalName}/images"
- verbose="false"
- usetimestamp="false"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -362,8 +336,42 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-branding-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- download file -->
+ <mkdir dir="${project.build.directory}/${project.build.finalName}/branding/WEB-INF/app/views/branding"/>
+ <mkdir dir="${project.build.directory}/${project.build.finalName}/branding/images"/>
+ <get src="${branding.url}/_footer.html.erb"
+ dest="${project.build.directory}/${project.build.finalName}/branding/WEB-INF/app/views/branding"
+ verbose="false"
+ usetimestamp="false"/>
+ <get src="${branding.url}/logo.png"
+ dest="${project.build.directory}/${project.build.finalName}/branding/images"
+ verbose="false"
+ usetimestamp="false"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <webResources>
+ <resource>
+ <directory>${project.build.directory}/${project.build.finalName}/branding</directory>
+ <include>**/*</include>
+ </resource>
+ </webResources>
<packagingExcludes>
**/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,javascripts/*-min.js,stylesheets/*-min.css,javascripts/tests/**/*,
build/**,coffee/**,less/**,templates/**