You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by sr...@apache.org on 2016/11/03 06:58:06 UTC

tez git commit: TEZ-3470. Tez UI: Make the build work in IBM PPC (sree)

Repository: tez
Updated Branches:
  refs/heads/master 2e121ec7e -> 90bd710d9


TEZ-3470. Tez UI: Make the build work in IBM PPC (sree)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/90bd710d
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/90bd710d
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/90bd710d

Branch: refs/heads/master
Commit: 90bd710d9d3691050661af2585b673acc2a9a15d
Parents: 2e121ec
Author: Sreenath Somarajapuram <sr...@apache.org>
Authored: Thu Nov 3 12:26:58 2016 +0530
Committer: Sreenath Somarajapuram <sr...@apache.org>
Committed: Thu Nov 3 12:26:58 2016 +0530

----------------------------------------------------------------------
 BUILDING.txt   |  8 +++++++-
 CHANGES.txt    |  1 +
 pom.xml        | 28 +---------------------------
 tez-ui/pom.xml |  8 ++++----
 4 files changed, 13 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/90bd710d/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index ccf8d90..5e8a30b 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -7,7 +7,7 @@ https://cwiki.apache.org/confluence/display/TEZ
 Requirements:
 
 * JDK 1.7+
-* Maven 3.0 or later
+* Maven 3.1 or later
 * Findbugs 2.0.2 or later (if running findbugs)
 * ProtocolBuffer 2.5.0
 * Internet connection for first build (to fetch all dependencies)
@@ -97,6 +97,12 @@ In case of issue with UI build, please clean the UI cache.
 
  $ mvn clean -PcleanUICache
 
+Issue with PhantomJS on building in PowerPC.
+
+ Official PhantomJS binaries are not yet available for Power platform. Hence you would have to
+ manually install it. Please refer to https://github.com/ibmsoe/phantomjs-1/blob/v2.1.1-ppc64/README.md
+ and install it globally for the build to work.
+
 ----------------------------------------------------------------------------------
 Protocol Buffer compiler:
 

http://git-wip-us.apache.org/repos/asf/tez/blob/90bd710d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 733a66e..569bc75 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -130,6 +130,7 @@ ALL CHANGES:
   TEZ-3469. Tez UI: Bump Phantom JS version to 2.1.1
   TEZ-3419. Tez UI: Applications page shows error, for users with only DAG level ACL permission
   TEZ-3484. Tez UI: Remove .travis.yml from webapp folder
+  TEZ-3470. Tez UI: Make the build work in IBM PPC
 
 Release 0.8.5: Unreleased
 

http://git-wip-us.apache.org/repos/asf/tez/blob/90bd710d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 369767f..e4d2dd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <scm.url>scm:git:https://git-wip-us.apache.org/repos/asf/tez.git</scm.url>
     <build.time>${maven.build.timestamp}</build.time>
-    <frontend-maven-plugin.version>0.0.23</frontend-maven-plugin.version>
+    <frontend-maven-plugin.version>1.1</frontend-maven-plugin.version>
     <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
     <javadoc-maven-plugin.version>2.9.1</javadoc-maven-plugin.version>
   </properties>
@@ -1254,32 +1254,6 @@
         </dependency>
       </dependencies>
     </profile>
-
-    <!-- fix for the frontend-maven-plugin - see TEZ-2560 -->
-    <profile>
-      <id>maven304</id>
-      <activation>
-        <property>
-          <name>maven.version</name>
-          <value>3.0.4</value>
-        </property>
-      </activation>
-      <properties>
-        <frontend-maven-plugin.version>0.0.22</frontend-maven-plugin.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>maven305</id>
-      <activation>
-        <property>
-          <name>maven.version</name>
-          <value>3.0.5</value>
-        </property>
-      </activation>
-      <properties>
-        <frontend-maven-plugin.version>0.0.22</frontend-maven-plugin.version>
-      </properties>
-    </profile>
   </profiles>
 
   <reporting>

http://git-wip-us.apache.org/repos/asf/tez/blob/90bd710d/tez-ui/pom.xml
----------------------------------------------------------------------
diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml
index 49749c6..e7be666 100644
--- a/tez-ui/pom.xml
+++ b/tez-ui/pom.xml
@@ -29,8 +29,8 @@
   <properties>
     <webappDir>src/main/webapp</webappDir>
     <node.executable>${basedir}/src/main/webapp/node/node</node.executable>
-    <nodeVersion>v0.12.2</nodeVersion>
-    <npmVersion>2.15.3</npmVersion>
+    <nodeVersion>v5.7.1</nodeVersion>
+    <npmVersion>3.6.0</npmVersion>
     <skipTests>false</skipTests>
   </properties>
 
@@ -151,7 +151,7 @@
               <workingDirectory>${webappDir}</workingDirectory>
               <executable>${node.executable}</executable>
               <arguments>
-                <argument>node/npm/bin/npm-cli</argument>
+                <argument>node/node_modules/npm/bin/npm-cli</argument>
                 <argument>run</argument>
                 <argument>build:mvn</argument>
               </arguments>
@@ -168,7 +168,7 @@
               <workingDirectory>${webappDir}</workingDirectory>
               <executable>${node.executable}</executable>
               <arguments>
-                <argument>node/npm/bin/npm-cli</argument>
+                <argument>node/node_modules/npm/bin/npm-cli</argument>
                 <argument>run</argument>
                 <argument>test:mvn</argument>
               </arguments>