This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 185c37cdb0f5664ea8f51233de64f673ccbda3e0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jun 25 12:43:03 2014 +0200 fix version lib --- pollen-ui-angular/bower.json | 5 ++--- pollen-ui-angular/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 54f3ce2..57deb61 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -16,8 +16,7 @@ "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", "bootstrap": "3.1.1", - "jquery": "2.2.1", - "jqplot": "1.0.8" + "jquery": "2.1.1", + "jqplot": "*" } } - diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index e46b933..025d5d7 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -23,6 +23,54 @@ <build> <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <phase>generate-sources</phase> + <configuration> + <target name="building"> + <echo> + <!-- NPM INSTALL --> + </echo> + <exec executable="cmd" dir="${project.basedir}" + osfamily="windows" failonerror="true"> + <arg line="/c npm config set color false"/> + </exec> + <exec executable="bash" dir="${project.basedir}" + osfamily="unix" failonerror="true"> + <arg line="npm config set color false"/> + </exec> + <exec executable="cmd" dir="${project.basedir}" + osfamily="windows" failonerror="true"> + <arg line="/c npm install"/> + </exec> + <exec executable="bash" dir="${project.basedir}" + osfamily="unix" failonerror="true"> + <arg line="npm install"/> + </exec> + <echo> + <!-- BOWER --> + </echo> + <exec executable="cmd" dir="${project.basedir}" + osfamily="windows" resultproperty="cmdresult"> + <arg line="/c bower install --no-color"/> + </exec> + <exec executable="bash" dir="${project.basedir}" + osfamily="unix" resultproperty="cmdresult"> + <arg line="bower install --no-color"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> +<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> @@ -43,6 +91,7 @@ <workingDirectory>${basedir}</workingDirectory> </configuration> </plugin> +--> </plugins> </build> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.