You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/12/03 18:55:52 UTC
ambari git commit: AMBARI-8527. Slider View: UI unit tests doesn't
run correctly using maven (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk bc8c32937 -> a3bc46cf8
AMBARI-8527. Slider View: UI unit tests doesn't run correctly using maven (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a3bc46cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3bc46cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3bc46cf
Branch: refs/heads/trunk
Commit: a3bc46cf8400d7e829f8d4968518714d444163f4
Parents: bc8c329
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Dec 3 18:52:57 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Dec 3 19:55:45 2014 +0200
----------------------------------------------------------------------
contrib/views/slider/pom.xml | 47 ++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3bc46cf/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index 355e4b4..9742026 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -449,14 +449,14 @@
</goals>
<configuration>
<target name="slider-ui-clean">
- <exec dir="${ui.directory}" executable="${executable.rmdir}">
- <arg value="${args.rm.clean}"/>
- <arg value="public"/>
- <arg value="node_modules"/>
- </exec>
- <exec dir="${ui.directory}" executable="${executable.mkdir}">
- <arg value="${args.mkdir.clean}"/>
- </exec>
+ <exec dir="${ui.directory}" executable="${executable.rmdir}">
+ <arg value="${args.rm.clean}"/>
+ <arg value="public"/>
+ <arg value="node_modules"/>
+ </exec>
+ <exec dir="${ui.directory}" executable="${executable.mkdir}">
+ <arg value="${args.mkdir.clean}"/>
+ </exec>
</target>
</configuration>
</execution>
@@ -468,18 +468,12 @@
</goals>
<configuration>
<target name="slider-ui-compile">
- <exec dir="${ui.directory}" executable="${executable.npm}" failonerror="true">
- <arg value="${args.npm.install}"/>
- </exec>
- <exec dir="${ui.directory}" executable="${executable.brunch}" failonerror="true">
- <arg value="${args.brunch.build}"/>
- </exec>
- <exec dir="${ui.directory}" executable="${executable.gzip}" failonerror="false">
- <arg value="-f"/>
- <arg value="public/javascripts/app.js"/>
- <arg value="public/javascripts/vendor.js"/>
- <arg value="public/stylesheets/app.css"/>
- </exec>
+ <exec dir="${ui.directory}" executable="${executable.npm}" failonerror="true">
+ <arg value="${args.npm.install}"/>
+ </exec>
+ <exec dir="${ui.directory}" executable="${executable.brunch}" failonerror="true">
+ <arg value="${args.brunch.build}"/>
+ </exec>
</target>
</configuration>
</execution>
@@ -499,13 +493,20 @@
</configuration>
</execution>
<execution>
- <id>package</id>
- <phase>package</phase>
+ <id>prepare-package</id>
+ <phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <target name="slider-ui-package">
+ <target name="slider-ui-prepare-package">
+ <exec dir="${ui.directory}" executable="${executable.gzip}" failonerror="false">
+ <arg value="-f"/>
+ <arg value="public/javascripts/app.js"/>
+ <arg value="public/javascripts/vendor.js"/>
+ <arg value="public/stylesheets/app.css"/>
+ </exec>
+
<!-- <copy toDir="${project.build.directory}/ambari-server-${project.version}-dist/ambari-server-${project.version}/web/">
<fileset dir="${ui.directory}/../ambari-web/public"/> </copy> -->
</target>