This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit a2922bc6cc691b0978903da05dcfefe44bb4d239 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 19 14:12:41 2014 +0200 delete required nodejs installed --- pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/pom.xml | 64 +++++++++++++++++++++++++---- pollen-ui-angular/src/test/karma.conf.ci.js | 18 ++++++++ pom.xml | 7 ++++ 4 files changed, 83 insertions(+), 7 deletions(-) diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index c3551f4..aeec6e0 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,4 +1,5 @@ *.iml +node/* node_modules/* src/main/webapp/lib src/main/webapp/css/style.css diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 3fc9403..2453ffa 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -24,10 +24,58 @@ <build> <plugins> <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>0.0.16</version> + + <!-- optional --> + <configuration> + <workingDirectory>${project.basedir}</workingDirectory> + </configuration> + + <executions> + <execution> + <id>install node and npm</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <nodeVersion>v0.10.18</nodeVersion> + <npmVersion>1.3.8</npmVersion> + </configuration> + </execution> + + <execution> + <id>npm install</id> + <goals> + <goal>npm</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <arguments>install</arguments> + </configuration> + </execution> + + <execution> + <id>javascript tests</id> + <goals> + <goal>karma</goal> + </goals> + <phase>test</phase> + <configuration> + <!-- optional: the default is "karma.conf.js" in your working directory --> + <karmaConfPath>src/test/karma.conf.ci.js</karmaConfPath> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> - <execution> + <!--<execution> <id>npm</id> <phase>generate-sources</phase> <goals> @@ -40,17 +88,18 @@ </arguments> <workingDirectory>${basedir}</workingDirectory> </configuration> - </execution> + </execution>--> <execution> <id>bower</id> - <phase>generate-sources</phase> + <phase>generate-resources</phase> <goals> <goal>exec</goal> </goals> <configuration> - <executable>${basedir}/node_modules/bower/bin/bower</executable> + <executable>${basedir}/node/node</executable> <arguments> + <argument>${basedir}/node_modules/bower/bin/bower</argument> <argument>install</argument> </arguments> <workingDirectory>${basedir}</workingDirectory> @@ -77,11 +126,12 @@ <goals> <goal>compile</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> - <plugin> + <!--<plugin> <groupId>com.kelveden</groupId> <artifactId>maven-karma-plugin</artifactId> <version>1.6</version> @@ -94,7 +144,7 @@ </execution> </executions> <configuration> - <karmaExecutable>${basedir}/node_modules/karma/bin/karma</karmaExecutable> + <karmaExecutable>${basedir}/node/node ${basedir}/node_modules/karma/bin/karma</karmaExecutable> <configFile>src/test/karma.conf.js</configFile> <reportsDirectory>${project.build.directory}/karma-reports</reportsDirectory> <browsers>PhantomJS</browsers> @@ -106,7 +156,7 @@ <karmaFailureIgnore>${maven.test.failure.ignore}</karmaFailureIgnore> <reporters>dots,junit</reporters> </configuration> - </plugin> + </plugin>--> <plugin> <artifactId>maven-resources-plugin</artifactId> diff --git a/pollen-ui-angular/src/test/karma.conf.ci.js b/pollen-ui-angular/src/test/karma.conf.ci.js new file mode 100644 index 0000000..7f0ae59 --- /dev/null +++ b/pollen-ui-angular/src/test/karma.conf.ci.js @@ -0,0 +1,18 @@ +// load the base config +var baseConfig = require('./karma.conf.js'); + +module.exports = function(config) { + // load base config + baseConfig(config); + + // override base config + config.set({ + + browsers: ['PhantomJS'], + + singleRun: true, + + autoWatch: false + }); +}; + diff --git a/pom.xml b/pom.xml index 4dd24b2..0ebc6a8 100644 --- a/pom.xml +++ b/pom.xml @@ -505,6 +505,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>com.github.eirslett.frontend-plugins</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>0.0.16</version> + <scope>provided</scope> + </dependency> + <!--dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.