This is an automated email from the ASF dual-hosted git repository. twalthr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 6451a1f445c52ee81122c3234f266c428aebb837 Author: 子扬 <junhan.yangjun...@alibaba-inc.com> AuthorDate: Fri Jul 30 16:50:34 2021 +0800 [FLINK-23111][runtime-web] Fix maven build node version, several dependencies, and NOTICE This closes #16603. --- flink-runtime-web/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 188 ++++++++++----------- flink-runtime-web/web-dashboard/angular.json | 1 + flink-runtime-web/web-dashboard/package-lock.json | 8 +- flink-runtime-web/web-dashboard/package.json | 2 +- 5 files changed, 103 insertions(+), 98 deletions(-) diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml index a764680..977b571 100644 --- a/flink-runtime-web/pom.xml +++ b/flink-runtime-web/pom.xml @@ -268,7 +268,7 @@ under the License. <goal>install-node-and-npm</goal> </goals> <configuration> - <nodeVersion>v10.9.0</nodeVersion> + <nodeVersion>v12.14.1</nodeVersion> </configuration> </execution> <execution> diff --git a/flink-runtime-web/src/main/resources/META-INF/NOTICE b/flink-runtime-web/src/main/resources/META-INF/NOTICE index 1d33b47..1f433fb 100644 --- a/flink-runtime-web/src/main/resources/META-INF/NOTICE +++ b/flink-runtime-web/src/main/resources/META-INF/NOTICE @@ -4,77 +4,77 @@ Copyright 2014-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -@angular/animations 7.2.10 : MIT License -@angular/cdk 7.3.6 : MIT License -@angular/common 7.2.10 : MIT License -@angular/compiler 7.2.10 : MIT License -@angular/core 7.2.10 : MIT License -@angular/forms 7.2.10 : MIT License -@angular/platform-browser 7.2.10 : MIT License -@angular/platform-browser-dynamic 7.2.10 : MIT License -@angular/router 7.2.10 : MIT License -@ant-design/icons-angular 2.0.2 : MIT License +@angular/animations 12.1.3 : MIT License +@angular/cdk 12.1.3 : MIT License +@angular/common 12.1.3 : MIT License +@angular/compiler 12.1.3 : MIT License +@angular/core 12.1.3 : MIT License +@angular/forms 12.1.3 : MIT License +@angular/platform-browser 12.1.3 : MIT License +@angular/platform-browser-dynamic 12.1.3 : MIT License +@angular/router 12.1.3 : MIT License +@ant-design/icons-angular 12.0.3 : MIT License @antv/adjust 0.1.1 : MIT License @antv/attr 0.1.2 : MIT License -@antv/component 0.3.1 : MIT License +@antv/component 0.3.9 : MIT License @antv/coord 0.1.0 : MIT License -@antv/g 3.3.6 : MIT License -@antv/g2 3.4.10 : MIT License +@antv/g 3.4.10 : MIT License +@antv/g2 3.5.17 : MIT License @antv/gl-matrix 2.7.1 : MIT License -@antv/scale 0.1.2 : MIT License +@antv/scale 0.1.5 : MIT License @antv/util 1.3.1 : ISC License align-text 0.1.4 : MIT License amdefine 1.0.1 : MIT License -ansi-regex 2.1.1 : MIT License +ansi-regex 5.0.0 : MIT License ant-design-palettes 1.1.3 : MIT License -balanced-match 1.0.0 : MIT License +balanced-match 1.0.2 : MIT License brace-expansion 1.1.11 : MIT License -camelcase 1.2.1 : MIT License +camelcase 5.3.1 : MIT License center-align 0.1.3 : MIT License -Chalk 1.1.3 : MIT License -cliui 2.1.0 : ISC License -Commander.js 2.19.0 : MIT License +Chalk 2.4.2 : MIT License +cliui 7.0.4 : ISC License +Commander.js 2.20.3 : MIT License contour_plot 0.0.1 : MIT License -core-js v2.6.5 : MIT License -cpettitt/graphlib 2.1.7 : MIT License +core-js v2.6.12 : MIT License +cpettitt/graphlib 2.1.8 : MIT License d3-array 1.2.4 : BSD 3-clause "New" or "Revised" License d3-axis 1.0.12 : BSD 3-clause "New" or "Revised" License -d3-brush 1.0.6 : BSD 3-clause "New" or "Revised" License +d3-brush 1.1.6 : BSD 3-clause "New" or "Revised" License d3-chord 1.0.6 : BSD 3-clause "New" or "Revised" License d3-collection 1.0.7 : BSD 3-clause "New" or "Revised" License -d3-color 1.2.3 : BSD 3-clause "New" or "Revised" License +d3-color 1.4.1 : BSD 3-clause "New" or "Revised" License d3-contour 1.3.2 : BSD 3-clause "New" or "Revised" License -d3-dispatch 1.0.5 : BSD 3-clause "New" or "Revised" License -d3-drag 1.2.3 : BSD 3-clause "New" or "Revised" License -d3-dsv 1.1.1 : BSD 3-clause "New" or "Revised" License -d3-ease 1.0.5 : BSD 3-clause "New" or "Revised" License -d3-fetch 1.1.2 : BSD 3-clause "New" or "Revised" License +d3-dispatch 1.0.6 : BSD 3-clause "New" or "Revised" License +d3-drag 1.2.5 : BSD 3-clause "New" or "Revised" License +d3-dsv 1.2.0 : BSD 3-clause "New" or "Revised" License +d3-ease 1.0.7 : BSD 3-clause "New" or "Revised" License +d3-fetch 1.2.0 : BSD 3-clause "New" or "Revised" License d3-force 1.2.1 : BSD 3-clause "New" or "Revised" License -d3-format 1.3.2 : BSD 3-clause "New" or "Revised" License -d3-geo 1.11.3 : BSD 3-clause "New" or "Revised" License -d3-hierarchy 1.1.8 : BSD 3-clause "New" or "Revised" License +d3-format 1.4.5 : BSD 3-clause "New" or "Revised" License +d3-geo 1.12.1 : BSD 3-clause "New" or "Revised" License +d3-hierarchy 1.1.9 : BSD 3-clause "New" or "Revised" License d3-interpolate v1.1.6 : BSD 3-clause "New" or "Revised" License -d3-path 1.0.7 : BSD 3-clause "New" or "Revised" License -d3-polygon v1.0.5 : BSD 3-clause "New" or "Revised" License -d3-quadtree 1.0.6 : BSD 3-clause "New" or "Revised" License +d3-path 1.0.9 : BSD 3-clause "New" or "Revised" License +d3-polygon v1.0.6 : BSD 3-clause "New" or "Revised" License +d3-quadtree 1.0.7 : BSD 3-clause "New" or "Revised" License d3-random 1.1.2 : BSD 3-clause "New" or "Revised" License d3-scale 2.2.2 : BSD 3-clause "New" or "Revised" License -d3-scale-chromatic 1.3.3 : BSD 3-clause "New" or "Revised" License -d3-selection v1.4.0 : BSD 3-clause "New" or "Revised" License -d3-shape v1.3.5 : BSD 3-clause "New" or "Revised" License -d3-time 1.0.11 : BSD 3-clause "New" or "Revised" License -d3-time-format 2.1.3 : BSD 3-clause "New" or "Revised" License -d3-timer v1.0.9 : BSD 3-clause "New" or "Revised" License -d3-transition v1.2.0 : BSD 3-clause "New" or "Revised" License +d3-scale-chromatic 1.5.0 : BSD 3-clause "New" or "Revised" License +d3-selection v1.4.2 : BSD 3-clause "New" or "Revised" License +d3-shape v1.3.7 : BSD 3-clause "New" or "Revised" License +d3-time 1.1.0 : BSD 3-clause "New" or "Revised" License +d3-time-format 2.3.0 : BSD 3-clause "New" or "Revised" License +d3-timer v1.0.10 : BSD 3-clause "New" or "Revised" License +d3-transition v1.3.2 : BSD 3-clause "New" or "Revised" License d3-voronoi v1.1.4 : (BSD 3-clause "New" or "Revised" License AND MIT License) -d3-zoom 1.7.3 : BSD 3-clause "New" or "Revised" License -D3.js 5.9.2 : BSD 3-clause "New" or "Revised" License -dagre 0.8.4 : MIT License +d3-zoom 1.8.3 : BSD 3-clause "New" or "Revised" License +D3.js 5.16.0 : BSD 3-clause "New" or "Revised" License +dagre 0.8.5 : MIT License Decamelize 1.2.0 : MIT License define-properties v1.1.3 : MIT License defined 1.0.0 : MIT License -es-abstract 1.13.0 : MIT License -es-to-primitive 1.2.0 : MIT License +es-abstract 1.18.3 : MIT License +es-to-primitive 1.2.1 : MIT License escape-string-regexp 1.0.5 : MIT License fecha 2.3.3 : MIT License fmin 0.0.2 : BSD 3-clause "New" or "Revised" License @@ -82,57 +82,57 @@ fs.realpath 1.0.0 : ISC License function-bind 1.1.1 : MIT License has 1.0.3 : MIT License has-ansi 2.0.0 : MIT License -has-symbols 1.0.0 : MIT License +has-symbols 1.0.2 : MIT License iconv-lite v0.4.24 : MIT License inflight 1.0.6 : ISC License -inherits 2.0.3 : ISC License +inherits 2.0.4 : ISC License is-buffer 1.1.6 : MIT License -is-callable 1.1.4 : MIT License -is-date-object 1.0.1 : MIT License -is-regex 1.0.4 : MIT License -is-symbol 1.0.2 : MIT License +is-callable 1.2.3 : MIT License +is-date-object 1.0.4 : MIT License +is-regex 1.1.3 : MIT License +is-symbol 1.0.4 : MIT License isaacs/once 1.4.0 : ISC License json2module 0.0.3 : BSD 3-clause "New" or "Revised" License -kind-of 3.2.2 : MIT License +kind-of 6.0.3 : MIT License kossnocorp/date-fns 1.30.1 : MIT License lazy-cache 1.0.4 : MIT License -Lo-Dash 4.17.11 : MIT License +Lo-Dash 4.17.21 : MIT License longest 1.0.1 : MIT License minimatch 3.0.4 : ISC License -minimist 1.2.0 : MIT License -monaco-editor 0.16.2 : MIT License -ng-zorro-antd 7.2.0 : MIT License +minimist 1.2.5 : MIT License +monaco-editor 0.20.0 : MIT License +ng-zorro-antd 12.0.1 : MIT License node-concat-map 0.0.1 : MIT License -node-deep-equal 1.0.1 : MIT License -node-glob v7.1.3 : ISC License -node-source-map-support 0.3.3 : MIT License -node-tape v4.10.1 : MIT License -object-inspect 1.6.0 : MIT License -object-keys 1.1.0 : MIT License -parse5 5.1.0 : MIT License +node-deep-equal 1.1.1 : MIT License +node-glob v7.1.7 : ISC License +node-source-map-support 0.4.18 : MIT License +node-tape v4.14.0 : MIT License +object-inspect 1.11.0 : MIT License +object-keys 1.1.1 : MIT License +parse5 6.0.1 : MIT License path-is-absolute 1.0.1 : MIT License -path-parse 1.0.6 : MIT License +path-parse 1.0.7 : MIT License Raynos/for-each 0.3.3 : MIT License repeat-string 1.6.1 : MIT License -RESOLVE v1.10.0 : MIT License +RESOLVE v1.20.0 : MIT License resumer 0.0.0 : MIT License right-align 0.1.3 : MIT License rollup 0.25.8 : MIT License rw 1.3.3 : BSD 3-clause "New" or "Revised" License -RxJS 6.3.3 : Apache License 2.0 +RxJS 6.6.7 : Apache License 2.0 Copyright (c) 2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors No NOTICE file was provided by RxJS safer-buffer 2.1.2 : MIT License sindresorhus/ansi-styles 2.2.1 : MIT License -sindresorhus/supports-color 2.0.0 : MIT License +sindresorhus/supports-color 5.5.0 : MIT License source-map 0.1.32 : BSD 3-clause "New" or "Revised" License source-map 0.5.7 : BSD 3-clause "New" or "Revised" License -string.prototype.trim 1.1.2 : MIT License -Strip ANSI 3.0.1 : MIT License +string.prototype.trim 1.2.4 : MIT License +Strip ANSI 6.0.0 : MIT License through 2.3.8 : MIT License -TinyColor 1.4.1 : MIT License -tslib 1.9.3 : Apache License 2.0 +TinyColor 3.4.0 : MIT License +tslib 2.3.0 : Apache License 2.0 Copyright (c) Microsoft Corporation. All rights reserved. No NOTICE file was provided. @@ -143,13 +143,13 @@ window-size 0.1.0 : MIT License wolfy87-eventemitter 5.1.0 : The Unlicense wordwrap 0.0.2 : MIT License wrappy 1.0.2 : ISC License -yargs 3.10.0 : MIT License -Zone.js v0.8.29 : MIT License +yargs 17.0.1 : MIT License +Zone.js v0.11.4 : MIT License Licenses: Apache License 2.0 -(RxJS 6.3.3, tslib 1.9.3) +(RxJS 6.6.7, tslib 2.3.0) Apache License Version 2.0, January 2004 @@ -371,7 +371,7 @@ SUCH DAMAGE --- BSD 3-clause "New" or "Revised" License -(d3-array 1.2.4, d3-axis 1.0.12, d3-brush 1.0.6, d3-chord 1.0.6, d3-collection 1.0.7, d3-color 1.2.3, d3-contour 1.3.2, d3-dispatch 1.0.5, d3-drag 1.2.3, d3-dsv 1.1.1, d3-ease 1.0.5, d3-fetch 1.1.2, d3-force 1.2.1, d3-format 1.3.2, d3-geo 1.11.3, d3-hierarchy 1.1.8, d3-interpolate v1.1.6, d3-path 1.0.7, d3-polygon v1.0.5, d3-quadtree 1.0.6, d3-random 1.1.2, d3-scale 2.2.2, d3-scale-chromatic 1.3.3, d3-selection v1.4.0, d3-shape v1.3.5, d3-time 1.0.11, d3-time-format 2.1.3, d3-timer v1.0. [...] +(d3-array 1.2.4, d3-axis 1.0.12, d3-brush 1.1.6, d3-chord 1.0.6, d3-collection 1.0.7, d3-color 1.4.1, d3-contour 1.3.2, d3-dispatch 1.0.6, d3-drag 1.2.5, d3-dsv 1.2.0, d3-ease 1.0.7, d3-fetch 1.2.0, d3-force 1.2.1, d3-format 1.4.5, d3-geo 1.12.1, d3-hierarchy 1.1.9, d3-interpolate v1.1.6, d3-path 1.0.9, d3-polygon v1.0.6, d3-quadtree 1.0.7, d3-random 1.1.2, d3-scale 2.2.2, d3-scale-chromatic 1.5.0, d3-selection v1.4.2, d3-shape v1.3.7, d3-time 1.1.0, d3-time-format 2.3.0, d3-timer v1.0.1 [...] Copyright (c) <YEAR>, <OWNER> All rights reserved. @@ -484,7 +484,7 @@ Redistribution and use in source and binary forms, with or without --- ISC License -(cliui 2.1.0) +(cliui 7.0.4) Copyright (c) 2015, Contributors @@ -547,7 +547,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE --- ISC License -(inherits 2.0.3) +(inherits 2.0.4) The ISC License @@ -568,7 +568,7 @@ PERFORMANCE OF THIS SOFTWARE --- ISC License -(fs.realpath 1.0.0, isaacs/once 1.4.0, minimatch 3.0.4, node-glob v7.1.3) +(fs.realpath 1.0.0, isaacs/once 1.4.0, minimatch 3.0.4, node-glob v7.1.7) The ISC License @@ -619,7 +619,7 @@ Permission to use, copy, modify, and/or distribute this software for any --- MIT License -(Commander.js 2.19.0) +(Commander.js 2.20.3) (The MIT License) @@ -677,7 +677,7 @@ Permission is hereby granted, free of charge, to any person --- MIT License -(Lo-Dash 4.17.11) +(Lo-Dash 4.17.21) ==== @@ -795,7 +795,7 @@ THE SOFTWARE --- MIT License -(balanced-match 1.0.0) +(balanced-match 1.0.2) Copyright (c) 2013 Julian Gruber <jul...@juliangruber.com> @@ -848,7 +848,7 @@ OTHER DEALINGS IN THE SOFTWARE --- MIT License -(parse5 5.1.0) +(parse5 6.0.1) Copyright (c) 2013-2018 Ivan Nikulin (ifa...@gmail.com, https://github.com/inikulin) @@ -901,7 +901,7 @@ OTHER DEALINGS IN THE SOFTWARE --- MIT License -(TinyColor 1.4.1) +(TinyColor 3.4.0) Copyright (c), Brian Grinstead, http://briangrinstead.com @@ -1098,7 +1098,7 @@ THE SOFTWARE --- MIT License -(yargs 3.10.0) +(yargs 17.0.1) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1151,7 +1151,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE --- MIT License -(@angular/animations 7.2.10, @angular/cdk 7.3.6, @angular/common 7.2.10, @angular/compiler 7.2.10, @angular/core 7.2.10, @angular/forms 7.2.10, @angular/platform-browser 7.2.10, @angular/platform-browser-dynamic 7.2.10, @angular/router 7.2.10, @ant-design/icons-angular 2.0.2, @antv/adjust 0.1.1, @antv/attr 0.1.2, @antv/component 0.3.1, @antv/coord 0.1.0, @antv/g 3.3.6, @antv/g2 3.4.10, @antv/gl-matrix 2.7.1, @antv/scale 0.1.2, ant-design-palettes 1.1.3, contour_plot 0.0.1, core-js v2.6.5 [...] +(@angular/animations 12.1.3, @angular/cdk 12.1.3, @angular/common 12.1.3, @angular/compiler 12.1.3, @angular/core 12.1.3, @angular/forms 12.1.3, @angular/platform-browser 12.1.3, @angular/platform-browser-dynamic 12.1.3, @angular/router 12.1.3, @ant-design/icons-angular 12.0.3, @antv/adjust 0.1.1, @antv/attr 0.1.2, @antv/component 0.3.9, @antv/coord 0.1.0, @antv/g 3.4.10, @antv/g2 3.5.17, @antv/gl-matrix 2.7.1, @antv/scale 0.1.5, ant-design-palettes 1.1.3, contour_plot 0.0.1, core-js v2. [...] The MIT License =============== @@ -1205,7 +1205,7 @@ SOFTWARE --- MIT License -(node-source-map-support 0.3.3) +(node-source-map-support 0.4.18) The MIT License (MIT) @@ -1232,7 +1232,7 @@ SOFTWARE --- MIT License -(is-regex 1.0.4) +(is-regex 1.1.3) The MIT License (MIT) @@ -1312,7 +1312,7 @@ THE SOFTWARE --- MIT License -(kind-of 3.2.2) +(kind-of 6.0.3) The MIT License (MIT) @@ -1366,7 +1366,7 @@ THE SOFTWARE --- MIT License -(path-parse 1.0.6) +(path-parse 1.0.7) The MIT License (MIT) @@ -1420,7 +1420,7 @@ THE SOFTWARE --- MIT License -(es-to-primitive 1.2.0, is-date-object 1.0.1, is-symbol 1.0.2, string.prototype.trim 1.1.2) +(es-to-primitive 1.2.1, is-date-object 1.0.4, is-symbol 1.0.4, string.prototype.trim 1.2.4) The MIT License (MIT) @@ -1555,7 +1555,7 @@ THE SOFTWARE --- MIT License -(ansi-regex 2.1.1, camelcase 1.2.1, Decamelize 1.2.0, escape-string-regexp 1.0.5, has-ansi 2.0.0, path-is-absolute 1.0.1, sindresorhus/ansi-styles 2.2.1, sindresorhus/supports-color 2.0.0, Strip ANSI 3.0.1) +(ansi-regex 5.0.0, camelcase 5.3.1, Decamelize 1.2.0, escape-string-regexp 1.0.5, has-ansi 2.0.0, path-is-absolute 1.0.1, sindresorhus/ansi-styles 2.2.1, sindresorhus/supports-color 5.5.0, Strip ANSI 6.0.0) The MIT License (MIT) @@ -1582,7 +1582,7 @@ THE SOFTWARE --- MIT License -(defined 1.0.0, minimist 1.2.0, node-concat-map 0.0.1, node-deep-equal 1.0.1, object-inspect 1.6.0, resumer 0.0.0) +(defined 1.0.0, minimist 1.2.5, node-concat-map 0.0.1, node-deep-equal 1.1.1, object-inspect 1.11.0, resumer 0.0.0) This software is released under the MIT license: diff --git a/flink-runtime-web/web-dashboard/angular.json b/flink-runtime-web/web-dashboard/angular.json index be4153c..1bebc62 100644 --- a/flink-runtime-web/web-dashboard/angular.json +++ b/flink-runtime-web/web-dashboard/angular.json @@ -35,6 +35,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { + "allowedCommonJsDependencies": ["dagre"], "outputPath": "web", "index": "src/index.html", "main": "src/main.ts", diff --git a/flink-runtime-web/web-dashboard/package-lock.json b/flink-runtime-web/web-dashboard/package-lock.json index 36b1f68..dfa6061 100644 --- a/flink-runtime-web/web-dashboard/package-lock.json +++ b/flink-runtime-web/web-dashboard/package-lock.json @@ -24,7 +24,7 @@ "dagre": "^0.8.4", "monaco-editor": "^0.20.0", "ng-zorro-antd": "^12.0.1", - "rxjs": "^6.5.3", + "rxjs": "^6.6.7", "tslib": "^2.0.0", "zone.js": "~0.11.4" }, @@ -22206,7 +22206,9 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": {} + "requires": { + "ajv": "^8.0.0" + } }, "align-text": { "version": "0.1.4", @@ -23299,6 +23301,8 @@ "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==", "dev": true, "requires": { + "@angular/compiler": "9.0.0", + "@angular/core": "9.0.0", "app-root-path": "^3.0.0", "aria-query": "^3.0.0", "axobject-query": "2.0.2", diff --git a/flink-runtime-web/web-dashboard/package.json b/flink-runtime-web/web-dashboard/package.json index 6f420ae..a43d479 100644 --- a/flink-runtime-web/web-dashboard/package.json +++ b/flink-runtime-web/web-dashboard/package.json @@ -27,7 +27,7 @@ "dagre": "^0.8.4", "monaco-editor": "^0.20.0", "ng-zorro-antd": "^12.0.1", - "rxjs": "^6.5.3", + "rxjs": "^6.6.7", "tslib": "^2.0.0", "zone.js": "~0.11.4" },