This is an automated email from the ASF dual-hosted git repository.

fjy pushed a commit to branch 0.14.0-incubating
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/0.14.0-incubating by this push:
     new d9e9f74  add license checker to web-console (#7028) (#7191)
d9e9f74 is described below

commit d9e9f7428cadf6302d093c600e93ffa5242f0798
Author: Jonathan Wei <[email protected]>
AuthorDate: Mon Mar 4 18:14:10 2019 -0800

    add license checker to web-console (#7028) (#7191)
    
    * add license checker to web-console to ensure npm dependencies are apache 
license compatible
    
    * add generate licenses file
    
    * update check to remove excludes due to blueprintjs downgrade
---
 web-console/.gitignore        |   1 +
 web-console/package-lock.json | 140 ++++++++++++++++++++++++++++++++++++++++++
 web-console/package.json      |   3 +
 web-console/pom.xml           |  21 +++++++
 4 files changed, 165 insertions(+)

diff --git a/web-console/.gitignore b/web-console/.gitignore
index 1e0bebd..defba19 100644
--- a/web-console/.gitignore
+++ b/web-console/.gitignore
@@ -12,3 +12,4 @@ index.html
 .tscache
 tscommand-*.tmp.txt
 
+licenses.json
\ No newline at end of file
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index 4cf737f..8c5035a 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -2115,6 +2115,12 @@
         "ms": "^2.1.1"
       }
     },
+    "debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";,
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": 
"https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";,
@@ -2302,6 +2308,16 @@
       "integrity": 
"sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
       "dev": true
     },
+    "dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz";,
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "diff": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";,
@@ -5391,6 +5407,36 @@
         "type-check": "~0.3.2"
       }
     },
+    "license-checker": {
+      "version": "25.0.1",
+      "resolved": 
"https://registry.npmjs.org/license-checker/-/license-checker-25.0.1.tgz";,
+      "integrity": 
"sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "debug": "^3.1.0",
+        "mkdirp": "^0.5.1",
+        "nopt": "^4.0.1",
+        "read-installed": "~4.0.3",
+        "semver": "^5.5.0",
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-satisfies": "^4.0.0",
+        "treeify": "^1.1.0"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";,
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "dev": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        }
+      }
+    },
     "load-json-file": {
       "version": "4.0.0",
       "resolved": 
"https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz";,
@@ -7742,6 +7788,42 @@
         }
       }
     },
+    "read-installed": {
+      "version": "4.0.3",
+      "resolved": 
"https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz";,
+      "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "graceful-fs": "^4.1.2",
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "slide": "~1.1.3",
+        "util-extend": "^1.0.1"
+      }
+    },
+    "read-package-json": {
+      "version": "2.0.13",
+      "resolved": 
"https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz";,
+      "integrity": 
"sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "json-parse-better-errors": "^1.0.1",
+        "normalize-package-data": "^2.0.0",
+        "slash": "^1.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";,
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+          "dev": true
+        }
+      }
+    },
     "read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz";,
@@ -7786,6 +7868,18 @@
         }
       }
     },
+    "readdir-scoped-modules": {
+      "version": "1.0.2",
+      "resolved": 
"https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz";,
+      "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
     "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz";,
@@ -8601,6 +8695,12 @@
       "integrity": 
"sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
       "dev": true
     },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";,
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": 
"https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";,
@@ -8805,6 +8905,17 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
+    "spdx-compare": {
+      "version": "1.0.0",
+      "resolved": 
"https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz";,
+      "integrity": 
"sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.2",
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-ranges": "^2.0.0"
+      }
+    },
     "spdx-correct": {
       "version": "3.1.0",
       "resolved": 
"https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";,
@@ -8837,6 +8948,23 @@
       "integrity": 
"sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==",
       "dev": true
     },
+    "spdx-ranges": {
+      "version": "2.1.0",
+      "resolved": 
"https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.0.tgz";,
+      "integrity": 
"sha512-OOWghvosfmECc9edy/A9j7GabERmn8bJWHc0J1knVytQtO5Rw7VfxK6CDqmivJhfMJqWhWWUfffNNMPYvyvyQA==",
+      "dev": true
+    },
+    "spdx-satisfies": {
+      "version": "4.0.1",
+      "resolved": 
"https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz";,
+      "integrity": 
"sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==",
+      "dev": true,
+      "requires": {
+        "spdx-compare": "^1.0.0",
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-ranges": "^2.0.0"
+      }
+    },
     "spdy": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz";,
@@ -9407,6 +9535,12 @@
         "punycode": "^2.1.0"
       }
     },
+    "treeify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz";,
+      "integrity": 
"sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==",
+      "dev": true
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": 
"https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";,
@@ -9757,6 +9891,12 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "util-extend": {
+      "version": "1.0.3",
+      "resolved": 
"https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz";,
+      "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=",
+      "dev": true
+    },
     "util.promisify": {
       "version": "1.0.0",
       "resolved": 
"https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";,
diff --git a/web-console/package.json b/web-console/package.json
index a2cd4a8..201100c 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -14,6 +14,8 @@
     "pretest": "./script/build",
     "run": "./script/run",
     "test": "jest --silent 2>&1",
+    "generate-licenses-file": "license-checker --production --json --out 
licenses.json",
+    "check-licenses": "license-checker --production --onlyAllow 
'Apache-1.1;Apache-2.0;BSD-2-Clause;BSD-3-Clause;MIT;CC0-1.0' --summary",
     "start": "webpack-dev-server --hot --open"
   },
   "dependencies": {
@@ -55,6 +57,7 @@
     "identity-obj-proxy": "^3.0.0",
     "ignore-styles": "^5.0.1",
     "jest": "^24.0.0",
+    "license-checker": "^25.0.1",
     "mocha": "^5.2.0",
     "node-sass": "^4.11.0",
     "node-sass-chokidar": "^1.3.4",
diff --git a/web-console/pom.xml b/web-console/pom.xml
index 936830d..88fe7ab 100644
--- a/web-console/pom.xml
+++ b/web-console/pom.xml
@@ -64,6 +64,16 @@
             </configuration>
           </execution>
           <execution>
+            <id>license-check</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>run check-licenses</arguments>
+              <workingDirectory>${project.build.directory}</workingDirectory>
+            </configuration>
+          </execution>
+          <execution>
             <id>test-console</id>
             <goals>
               <goal>npm</goal>
@@ -74,6 +84,17 @@
               <workingDirectory>${project.build.directory}</workingDirectory>
             </configuration>
           </execution>
+
+          <execution>
+            <id>generate-licenses-file</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>run generate-licenses-file</arguments>
+              <workingDirectory>${project.build.directory}</workingDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to