diff --git a/dev-support/create-release.sh b/dev-support/create-release.sh index 7a3dd70..792a805 100755 --- a/dev-support/create-release.sh +++ b/dev-support/create-release.sh @@ -88,7 +88,7 @@ run ${MVN} apache-rat:check # Create SRC and BIN tarballs for release, # Using 'install’ goal instead of 'package' so artifacts are available # in the Maven local cache for the site generation -run ${MVN} install -Pdist,src,native -DskipTests -Dtar +run ${MVN} install -Pdist,src,native,yarn-ui -DskipTests -Dtar # Create site for release run ${MVN} site site:stage -Pdist -Psrc diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md index c86adca..575ebc7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md @@ -1,15 +1,18 @@ - Hadoop: YARN-UI V2 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 12ad127..bfb81c7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -46,34 +46,15 @@ apache-rat-plugin - src/main/webapp/node/**/* - src/main/webapp/node_modules/**/* - src/main/webapp/bower_components/**/* - src/main/webapp/.tmp/**/* - src/main/webapp/dist/**/* - src/main/webapp/tmp/**/* - src/main/webapp/.bowerrc - src/main/webapp/.editorconfig - src/main/webapp/.ember-cli - src/main/webapp/.gitignore - src/main/webapp/.jshintrc - src/main/webapp/jsconfig.json - src/main/webapp/tests/.jshintrc - src/main/webapp/blueprints/.jshintrc - src/main/webapp/.travis.yml - src/main/webapp/.watchmanconfig - src/main/webapp/bower.json - src/main/webapp/ember-cli-build.js - src/main/webapp/package.json - src/main/webapp/testem.json - src/main/webapp/public/assets/images/* - src/main/webapp/public/robots.txt - .jshintrc - .travis.yml - .ember-cli - .editorconfig - .watchmanconfig - public/crossdomain.xml + ${basedir}/src/main/webapp/node_modules/**/* + ${basedir}/src/main/webapp/bower_components/**/* + ${basedir}/src/main/webapp/jsconfig.json + ${basedir}/src/main/webapp/bower.json + ${basedir}/src/main/webapp/package.json + ${basedir}/src/main/webapp/testem.json + ${basedir}/src/main/webapp/public/assets/images/**/* + ${basedir}/src/main/webapp/public/robots.txt + ${basedir}/public/crossdomain.xml @@ -85,26 +66,11 @@ false - ${basedir}/dist - - - ${basedir}/tmp - - - ${basedir}/src/main/webapp/dist - - ${basedir}/src/main/webapp/bower_components ${basedir}/src/main/webapp/node_modules - - ${basedir}/src/main/webapp/tmp - - - ${basedir}/src/main/webapp/node - @@ -186,6 +152,8 @@ build -prod + --output-path + ${basedir}/target/dist @@ -204,6 +172,21 @@ + + cleanup tmp + generate-sources + + exec + + + ${webappDir} + rm + + -rf + tmp + + + @@ -213,7 +196,7 @@ maven-war-plugin ${basedir}/src/main/webapp/WEB-INF/web.xml - ${webappDir}/dist + ${basedir}/target/dist false diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/resources/META-INF/NOTICE.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/resources/META-INF/NOTICE.txt deleted file mode 100644 index 9a6feaf..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/resources/META-INF/NOTICE.txt +++ /dev/null @@ -1,10 +0,0 @@ -Apache Tez -Copyright (c) 2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This tez-ui bundle includes fonts protected under the Open Font License. -These fonts can only be distributed as part of a piece of software, but -not individually. See the license for details. http://scripts.sil.org/OFL. -More information on included fonts can be found in the LICENSE file.