You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/06/19 01:32:31 UTC

zeppelin git commit: Blocking the zeppelin-web build error.

Repository: zeppelin
Updated Branches:
  refs/heads/master 4a0dce525 -> 19c479770


Blocking the zeppelin-web build error.

### What is this PR for?
This PR is for blocking unnecessary zeppelin-web build errors.
```
[ERROR] npm WARN package.json zeppelin-web0.0.0 No license field.
[ERROR] bower perfect-scrollbar extra-resolution Unnecessary resolution: perfect-scrollbar#~0.5.4
```

### What type of PR is it?
Improvement

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1014

### How should this be tested?
You can run ```mvn clean package -DskipTests``` in the zeppelin-web folder.

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: astroshim <hs...@nflabs.com>

Closes #1018 from astroshim/ZEPPELIN-1014 and squashes the following commits:

991ef8c [astroshim] fix zeppelin-web build error.


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/19c47977
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/19c47977
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/19c47977

Branch: refs/heads/master
Commit: 19c479770e7b49938c11a6a482ee7e694914c658
Parents: 4a0dce5
Author: astroshim <hs...@nflabs.com>
Authored: Thu Jun 16 01:01:33 2016 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Sun Jun 19 10:32:20 2016 +0900

----------------------------------------------------------------------
 zeppelin-web/bower.json   | 3 ---
 zeppelin-web/package.json | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/19c47977/zeppelin-web/bower.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 2000281..a414653 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -36,9 +36,6 @@
     "angular-mocks": "1.5.0"
   },
   "appPath": "src",
-  "resolutions": {
-    "perfect-scrollbar": "~0.5.4"
-  },
   "overrides": {
     "ace-builds": {
       "main": [

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/19c47977/zeppelin-web/package.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
index 036de44..08715f1 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
@@ -1,5 +1,6 @@
 {
   "name": "zeppelin-web",
+  "license": "Apache-2.0",
   "version": "0.0.0",
   "dependencies": {
     "grunt-angular-templates": "^0.5.7",