diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2014-02-27 16:58:20 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2014-02-27 16:58:20 +0100 |
| commit | 80f575362028eb64a3be5ba993d13f9aecf1a39f (patch) | |
| tree | 0e79a263094cf52afa813ed889d3a003cbc7062f /sonar-server | |
| parent | a96b40cbce10ff461223f1dfe4bc07f268632170 (diff) | |
| download | sonarqube-80f575362028eb64a3be5ba993d13f9aecf1a39f.tar.gz sonarqube-80f575362028eb64a3be5ba993d13f9aecf1a39f.zip | |
SONAR-5080 integrate requirejs optimizer to maven build
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/pom.xml | 24 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/javascripts/build.js | 2 |
2 files changed, 24 insertions, 2 deletions
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index 335fa0a0a2c..b255244d61b 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -249,6 +249,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> @@ -273,6 +274,27 @@ </plugin> <plugin> + <groupId>com.github.bringking</groupId> + <artifactId>requirejs-maven-plugin</artifactId> + <version>2.0.3</version> + <executions> + <execution> + <goals> + <goal>optimize</goal> + </goals> + </execution> + </executions> + <configuration> + <configFile>${basedir}/src/main/webapp/javascripts/build.js</configFile> + <optimizerParameters> + <parameter>dir=${project.build.directory}/${project.build.finalName}/javascripts</parameter> + <parameter>skipDirOptimize=true</parameter> + <parameter>keepBuildDir=true</parameter> + </optimizerParameters> + </configuration> + </plugin> + + <plugin> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-dev-maven-plugin</artifactId> <executions> @@ -297,7 +319,7 @@ <artifactId>maven-war-plugin</artifactId> <configuration> <packagingExcludes> - **/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,javascripts/*-min.js,stylesheets/*-min.css + **/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,javascripts/*-min.js,stylesheets/*-min.css,javascripts/tests, </packagingExcludes> <warSourceExcludes> **/* diff --git a/sonar-server/src/main/webapp/javascripts/build.js b/sonar-server/src/main/webapp/javascripts/build.js index 5fbb2c90018..a2495120805 100644 --- a/sonar-server/src/main/webapp/javascripts/build.js +++ b/sonar-server/src/main/webapp/javascripts/build.js @@ -1,7 +1,7 @@ ({ appDir: '.', baseUrl: '.', - dir: 'build', + dir: 'DEFINED IN POM.XML', modules: [ { name: 'quality-gate/app' }, |