You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/10/11 07:42:25 UTC
incubator-griffin git commit: 20171011 upgrdate angular2 build
Repository: incubator-griffin
Updated Branches:
refs/heads/master 42ee88634 -> 13107d2a8
20171011 upgrdate angular2 build
Author: William Guo <gu...@icloud.com>
Closes #131 from guoyuepeng/20171011_upgrdate_angular2_build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/13107d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/13107d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/13107d2a
Branch: refs/heads/master
Commit: 13107d2a8515d76a9f5dafbf986a937639d26fe9
Parents: 42ee886
Author: William Guo <gu...@icloud.com>
Authored: Wed Oct 11 15:42:28 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Oct 11 15:42:28 2017 +0800
----------------------------------------------------------------------
.gitignore | 1 +
merge_pr.py | 0
ui/pom.xml | 4 ++--
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/13107d2a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ad52fe5..c9f7b00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ target/**
*.ear
target
service/src/main/resources/public/
+ui/.tmp/
.project
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/13107d2a/merge_pr.py
----------------------------------------------------------------------
diff --git a/merge_pr.py b/merge_pr.py
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/13107d2a/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 6541986..f9523e6 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -60,7 +60,7 @@ under the License.
<version>1.0</version>
<configuration>
<workingDirectory>angular</workingDirectory>
- <installDirectory>tmp</installDirectory>
+ <installDirectory>.tmp</installDirectory>
</configuration>
<executions>
<!-- It will install nodejs and npm -->
@@ -86,7 +86,7 @@ under the License.
</configuration>
</execution>
- <!-- It will execute command "npm build" inside "/angular" directory to clean and create "/dist" directory-->
+ <!-- It will execute command "npm build" inside "/angular" directory to clean and create "/.tmp" directory-->
<execution>
<id>npm build</id>
<goals>