This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch 1.2.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.2.0-release by this push:
new 644c30c Front-end supplemental license (#1549)
644c30c is described below
commit 644c30cfcbd807835649508d090ff79d84416a0e
Author: break60 <[email protected]>
AuthorDate: Tue Dec 24 17:08:45 2019 +0800
Front-end supplemental license (#1549)
* Front-end compliance modification
* Front-end supplemental license
* Modify naming
---
.../src/main/release-docs/LICENSE | 15 ++++----
.../release-docs/licenses/LICENSE-jquery-ui.txt | 45 ++++++++++++++++++++++
dolphinscheduler-ui/package.json | 8 ++--
3 files changed, 57 insertions(+), 11 deletions(-)
diff --git
a/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/LICENSE
b/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/LICENSE
index ae3f723..b1b917b 100644
--- a/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/LICENSE
+++ b/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/LICENSE
@@ -211,21 +211,22 @@ licenses.
========================================
MIT licenses
========================================
- vue 2.5.17: https://github.com/vuejs/vue MIT
- jquery 1.12.4: https://github.com/jquery/jquery MIT
- vue-router 2.7.0: https://github.com/vuejs/vue-router MIT
- vuex 3.0.0: https://github.com/vuejs/vuex MIT
+ ans-UI 0.0.22: https://github.com/analysys/ans-ui MIT
+ axios 0.16.2: https://github.com/axios/axios MIT
bootstrap 3.3.7: https://github.com/twbs/bootstrap MIT
canvg 1.5.1: https://github.com/canvg/canvg MIT
clipboard 2.0.1: https://github.com/zenorocha/clipboard.js MIT
codemirror 5.43.0: https://github.com/codemirror/CodeMirror MIT
dayjs 1.7.8: https://github.com/iamkun/dayjs MIT
html2canvas 0.5.0-beta4: https://github.com/niklasvh/html2canvas MIT
+ jquery 1.12.4: https://github.com/jquery/jquery MIT
+ jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT
+ jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2
lodash 4.17.11: https://github.com/lodash/lodash MIT
+ vue 2.5.17: https://github.com/vuejs/vue MIT
+ vue-router 2.7.0: https://github.com/vuejs/vue-router MIT
+ vuex 3.0.0: https://github.com/vuejs/vuex MIT
vuex-router-sync 4.1.2: https://github.com/vuejs/vuex-router-sync MIT
- ans-UI 0.0.22: https://github.com/analysys/ans-ui MIT
- axios 0.16.2: https://github.com/axios/axios MIT
- jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2
========================================
Apache 2.0 licenses
diff --git
a/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/licenses/LICENSE-jquery-ui.txt
b/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/licenses/LICENSE-jquery-ui.txt
new file mode 100644
index 0000000..6b42d96
--- /dev/null
+++
b/dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/licenses/LICENSE-jquery-ui.txt
@@ -0,0 +1,45 @@
+MIT License
+
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery-ui
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code contained within the demos directory.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index 4ee1291..748521b 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -1,8 +1,8 @@
{
- "name": "dolphinscheduler",
- "version": "1.0.0",
- "description": "dolphinscheduler",
- "author": "gongzijian <[email protected]>",
+ "name": "dolphinscheduler-ui-frontend",
+ "version": "1.2.0",
+ "description": "A vue.js project",
+ "author": "DolphinScheduler",
"scripts": {
"build": "npm run clean && cross-env NODE_ENV=production webpack --config
./build/webpack.config.prod.js",
"dev": "cross-env NODE_ENV=development webpack-dev-server --config
./build/webpack.config.dev.js",
