You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/06/05 21:05:44 UTC
ambari git commit: AMBARI-11714: [WinTP2] Address build issues on
Windows (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk e881532da -> 6b382fc70
AMBARI-11714: [WinTP2] Address build issues on Windows (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b382fc7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b382fc7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b382fc7
Branch: refs/heads/trunk
Commit: 6b382fc709e843bf4247dca94fb61c304c60ae72
Parents: e881532
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Fri Jun 5 12:05:40 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Fri Jun 5 12:05:40 2015 -0700
----------------------------------------------------------------------
ambari-metrics/pom.xml | 2 +-
ambari-web/set-ambari-version.cmd | 2 +-
ambari-web/set-default-stack-version.cmd | 2 +-
ambari-web/toggle-experimental.cmd | 2 +-
contrib/views/capacity-scheduler/pom.xml | 16 ++++++++++++++++
.../src/main/resources/ui/package.json | 3 +--
contrib/views/files/pom.xml | 16 ++++++++++++++++
.../views/files/src/main/resources/ui/package.json | 3 +--
contrib/views/pig/pom.xml | 16 ++++++++++++++++
.../pig/src/main/resources/ui/pig-web/package.json | 3 +--
10 files changed, 55 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 782664a..106f79b 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -154,7 +154,7 @@
<name>package-release</name>
<value>${project.version}</value>
<regex>
- ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)).*
+ ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
</regex>
<replacement>$5</replacement>
<failIfNoMatch>true</failIfNoMatch>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-web/set-ambari-version.cmd
----------------------------------------------------------------------
diff --git a/ambari-web/set-ambari-version.cmd b/ambari-web/set-ambari-version.cmd
index 14fdec6..2b827fc 100644
--- a/ambari-web/set-ambari-version.cmd
+++ b/ambari-web/set-ambari-version.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-ambari-version.ps1 %*
\ No newline at end of file
+powershell -File set-ambari-version.ps1 %* < NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-web/set-default-stack-version.cmd
----------------------------------------------------------------------
diff --git a/ambari-web/set-default-stack-version.cmd b/ambari-web/set-default-stack-version.cmd
index e724e1f..9f8a252 100644
--- a/ambari-web/set-default-stack-version.cmd
+++ b/ambari-web/set-default-stack-version.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-default-stack-version.ps1 %*
\ No newline at end of file
+powershell -File set-default-stack-version.ps1 %* < NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-web/toggle-experimental.cmd
----------------------------------------------------------------------
diff --git a/ambari-web/toggle-experimental.cmd b/ambari-web/toggle-experimental.cmd
index 9552279..6cda98e 100644
--- a/ambari-web/toggle-experimental.cmd
+++ b/ambari-web/toggle-experimental.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File toggle-experimental.ps1 %*
\ No newline at end of file
+powershell -File toggle-experimental.ps1 %* < NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/capacity-scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml
index fb71094..d3f11e3 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -161,6 +161,22 @@
</configuration>
</execution>
<execution>
+ <id>Bower install</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${ui.directory}</workingDirectory>
+ <executable>${ui.directory}/node/${node.executable}</executable>
+ <arguments>
+ <argument>${ui.directory}/node_modules/bower/bin/bower</argument>
+ <argument>install</argument>
+ <argument>--allow-root</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
<id>Brunch build</id>
<phase>generate-resources</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/package.json b/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
index 47f29b7..2cdc672 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
@@ -11,8 +11,7 @@
"node": "~0.6.10 || 0.8 || 0.9"
},
"scripts": {
- "start": "brunch watch --server",
- "postinstall" : "bower --allow-root install"
+ "start": "brunch watch --server"
},
"dependencies": {
"javascript-brunch": "^1.7.1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index 1cac902..5026ee6 100644
--- a/contrib/views/files/pom.xml
+++ b/contrib/views/files/pom.xml
@@ -183,6 +183,22 @@
</configuration>
</execution>
<execution>
+ <id>Bower install</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${ui.directory}</workingDirectory>
+ <executable>${ui.directory}/node/${node.executable}</executable>
+ <arguments>
+ <argument>${ui.directory}/node_modules/bower/bin/bower</argument>
+ <argument>install</argument>
+ <argument>--allow-root</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
<id>Brunch build</id>
<phase>generate-resources</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/files/src/main/resources/ui/package.json
----------------------------------------------------------------------
diff --git a/contrib/views/files/src/main/resources/ui/package.json b/contrib/views/files/src/main/resources/ui/package.json
index 34bb1d8..1fab7e8 100644
--- a/contrib/views/files/src/main/resources/ui/package.json
+++ b/contrib/views/files/src/main/resources/ui/package.json
@@ -13,8 +13,7 @@
},
"scripts": {
"test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
- "start": "brunch watch --server",
- "postinstall" : "bower --allow-root install"
+ "start": "brunch watch --server"
},
"dependencies": {
"javascript-brunch": "^1.7.1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 568e668..7ad7597 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -198,6 +198,22 @@
</configuration>
</execution>
<execution>
+ <id>Bower install</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${ui.directory}</workingDirectory>
+ <executable>${ui.directory}/node/${node.executable}</executable>
+ <arguments>
+ <argument>${ui.directory}/node_modules/bower/bin/bower</argument>
+ <argument>install</argument>
+ <argument>--allow-root</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
<id>Brunch build</id>
<phase>generate-resources</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/pig/src/main/resources/ui/pig-web/package.json
----------------------------------------------------------------------
diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/package.json b/contrib/views/pig/src/main/resources/ui/pig-web/package.json
index 97cc1a0..3221483 100644
--- a/contrib/views/pig/src/main/resources/ui/pig-web/package.json
+++ b/contrib/views/pig/src/main/resources/ui/pig-web/package.json
@@ -6,8 +6,7 @@
},
"scripts": {
"test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
- "start": "brunch watch --server",
- "postinstall" : "bower --allow-root install"
+ "start": "brunch watch --server"
},
"dependencies": {
"brunch": "1.7.17",