This is an automated email from the ASF dual-hosted git repository. iwasakims pushed a commit to branch branch-2.10 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 6b53f52232d879ae0db45412f3c94c4315e5c058 Author: Masatake Iwasaki <iwasak...@apache.org> AuthorDate: Thu Dec 19 19:27:31 2019 +0900 YARN-10037. Upgrade build tools for YARN Web UI v2. (cherry picked from commit 7868da894ae148bff1d5e5159a2bc1aad44fd6aa) (cherry picked from commit 2eb6bf6bb104b5fda4bbd40b8c06827c63575fd0) Conflicts: hadoop-project/pom.xml --- hadoop-project/pom.xml | 2 +- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md | 2 +- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index e1da314a0319..f7c54b9dd576 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -146,7 +146,7 @@ <surefire.fork.timeout>900</surefire.fork.timeout> <aws-java-sdk.version>1.11.271</aws-java-sdk.version> <hsqldb.version>2.3.4</hsqldb.version> - <frontend-maven-plugin.version>1.5</frontend-maven-plugin.version> + <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version> <!-- the version of Hadoop declared in the version resources; can be overridden so that Hadoop 3.x can declare itself a 2.x artifact. --> <declared.hadoop.version>${project.version}</declared.hadoop.version> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md index 22cdb1258c44..77071c200a02 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md @@ -37,7 +37,7 @@ All the following commands must be run inside `src/main/webapp`. You will need the following things properly installed on your computer. -* Install [Yarn](https://yarnpkg.com) v0.21.3 +* Install [Yarn](https://yarnpkg.com) v1.21.1 * Install [Bower](http://bower.io/) v1.8.8 * Install all dependencies by running `yarn install` & `bower install` diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml index e09b0f97df24..66df22f05d18 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -147,8 +147,8 @@ <goal>install-node-and-yarn</goal> </goals> <configuration> - <nodeVersion>v5.12.0</nodeVersion> - <yarnVersion>v0.21.3</yarnVersion> + <nodeVersion>v8.17.0</nodeVersion> + <yarnVersion>v1.21.1</yarnVersion> </configuration> </execution> <execution> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org