Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pipeline {
YETUS_ARGS+=("--build-url-artifacts=artifact/out")

# plugins to enable
YETUS_ARGS+=("--plugins=all")
YETUS_ARGS+=("--plugins=all,-jshint")

# use Hadoop's bundled shelldocs
YETUS_ARGS+=("--shelldocs=${WORKSPACE}/${SOURCEDIR}/dev-support/bin/shelldocs")
Expand Down Expand Up @@ -216,4 +216,4 @@ pipeline {
}
}
}
}
}
2 changes: 2 additions & 0 deletions build-tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
git \
gpg \
gpg-agent \
libgbm-dev \
libgtk-3-0 \
libffi-dev \
locales \
make \
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<roaringbitmap.version>0.7.45</roaringbitmap.version>
<protoc.path>${env.PROTOC_PATH}</protoc.path>
<scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
<frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
<frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<checkstyle.version>8.35</checkstyle.version>
Expand Down Expand Up @@ -969,7 +969,7 @@
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>1.7.9</version>
<version>1.8.0</version>
<dependencies>
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
<dependency>
Expand Down
30 changes: 11 additions & 19 deletions tez-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
<properties>
<webappDir>src/main/webapp</webappDir>

<nodeVersion>v5.12.0</nodeVersion>
<nodeVersion>v14.18.1</nodeVersion>
<yarnVersion>v1.22.15</yarnVersion>
<nodeExecutable>${basedir}/src/main/webapp/node/node</nodeExecutable>

<packageManagerScript>node/yarn/dist/bin/yarn.js</packageManagerScript>
Expand Down Expand Up @@ -232,9 +233,6 @@
<fileset>
<directory>${webappDir}/node_modules</directory>
</fileset>
<fileset>
<directory>${webappDir}/bower_components</directory>
</fileset>
</filesets>
</configuration>
</plugin>
Expand Down Expand Up @@ -332,26 +330,30 @@
<excludes>
<exclude>src/main/webapp/node/**/*</exclude>
<exclude>src/main/webapp/node_modules/**/*</exclude>
<exclude>src/main/webapp/bower_components/**/*</exclude>
<exclude>src/main/webapp/.tmp/**/*</exclude>
<exclude>src/main/webapp/dist/**/*</exclude>
<exclude>src/main/webapp/tmp/**/*</exclude>
<exclude>src/main/webapp/.bowerrc</exclude>
<exclude>src/main/webapp/.editorconfig</exclude>
<exclude>src/main/webapp/.ember-cli</exclude>
<exclude>src/main/webapp/.eslintignore</exclude>
<exclude>src/main/webapp/.gitignore</exclude>
<exclude>src/main/webapp/.jshintrc</exclude>
<exclude>src/main/webapp/.jshintignore</exclude>
<exclude>src/main/webapp/.prettierignore</exclude>
<exclude>src/main/webapp/.travis.yml</exclude>
<exclude>src/main/webapp/config/optional-features.json</exclude>
<exclude>src/main/webapp/config/ember-cli-update.json</exclude>
<exclude>src/main/webapp/tests/.jshintrc</exclude>
<exclude>src/main/webapp/blueprints/.jshintrc</exclude>
<exclude>src/main/webapp/.watchmanconfig</exclude>
<exclude>src/main/webapp/bower.json</exclude>
<exclude>src/main/webapp/bower-shrinkwrap.json</exclude>
<exclude>src/main/webapp/ember-cli-build.js</exclude>
<exclude>src/main/webapp/package.json</exclude>
<exclude>src/main/webapp/yarn.lock</exclude>
<exclude>src/main/webapp/tests/helpers/.gitkeep</exclude>
<exclude>src/main/webapp/testem.json</exclude>
<exclude>src/main/webapp/public/assets/images/*</exclude>
<exclude>src/main/webapp/WEB-INF/wro.xml</exclude>
<exclude>src/main/webapp/WEB-INF/wro.properties</exclude>
</excludes>
</configuration>
</plugin>
Expand All @@ -374,7 +376,7 @@
</goals>
<configuration>
<nodeVersion>${nodeVersion}</nodeVersion>
<yarnVersion>v0.21.3</yarnVersion>
<yarnVersion>${yarnVersion}</yarnVersion>
</configuration>
</execution>
<execution>
Expand All @@ -387,16 +389,6 @@
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<phase>generate-resources</phase>
<id>bower install</id>
<configuration>
<arguments>install ${allow-root-build}</arguments>
</configuration>
<goals>
<goal>bower</goal>
</goals>
</execution>
</executions>
</plugin>

Expand Down
1 change: 0 additions & 1 deletion tez-ui/src/main/resources/META-INF/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ The Apache TEZ tez-ui bundles the following files under the MIT License:
- ember-bootstrap v0.5.1 (https://github.com/kaliber5/ember-bootstrap) - Copyright 2015 kaliber5 GmbH.
- more-js v0.8.2 (https://github.com/sreenaths/snippet-ss)
- snippet-ss v1.11.0 (https://github.com/sreenaths/snippet-ss)
- em-tgraph v0.0.4 (https://github.com/sreenaths/em-tgraph)
- ember-cli-app-version v1.0.0 (https://github.com/EmberSherpa/ember-cli-app-version) - Authored by Taras Mankovski <[email protected]>
- ember-cli-auto-register v1.1.0 (https://github.com/williamsbdev/ember-cli-auto-register) - Copyright © 2015 Brandon Williams http://williamsbdev.com
- ember-cli-content-security-policy v0.4.0 (https://github.com/rwjblue/ember-cli-content-security-policy)
Expand Down
7 changes: 0 additions & 7 deletions tez-ui/src/main/webapp/.bowerrc

This file was deleted.

1 change: 0 additions & 1 deletion tez-ui/src/main/webapp/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
21 changes: 21 additions & 0 deletions tez-ui/src/main/webapp/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
76 changes: 76 additions & 0 deletions tez-ui/src/main/webapp/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
// 'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js',
'server/**/*.js',
],
parserOptions: {
sourceType: 'script',
},
env: {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
27 changes: 18 additions & 9 deletions tez-ui/src/main/webapp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node
/node_modules
/bower_components
/bower_components/
/node_modules/
/node/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
3 changes: 3 additions & 0 deletions tez-ui/src/main/webapp/.jshintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist/**
node/**
node_modules/**
21 changes: 21 additions & 0 deletions tez-ui/src/main/webapp/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,8 @@
* limitations under the License.
*/

import Ember from 'ember';
'use strict';

export function initialize(/* application */) {
Ember.$(document).tooltip({
tooltipClass: 'generic-tooltip'
});

Ember.$.ajaxSetup({
cache: false
});
}

export default {
name: 'jquery',
initialize
module.exports = {
singleQuote: true,
};
23 changes: 23 additions & 0 deletions tez-ui/src/main/webapp/.template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

'use strict';

module.exports = {
extends: 'octane',
};
28 changes: 28 additions & 0 deletions tez-ui/src/main/webapp/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
language: node_js
node_js:
- "10"

dist: xenial

addons:
chrome: stable

cache:
yarn: true

env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1

branches:
only:
- master

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

script:
- yarn test
6 changes: 6 additions & 0 deletions tez-ui/src/main/webapp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ You will need the following things properly installed on your computer.

* `yarn test`

### Linting

* `yarn lint:hbs`
* `yarn lint:js`
* `yarn lint:js --fix`

### Building

* `yarn run build` (production)
Expand Down
Loading