This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.4
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.4 by this push:
new eae3265aa [Improve] Properly carry vue-vben-admin's license info
(#3694)
eae3265aa is described below
commit eae3265aaf1fb87d396071310854dd365e20dff7
Author: benjobs <[email protected]>
AuthorDate: Wed May 1 00:53:17 2024 +0800
[Improve] Properly carry vue-vben-admin's license info (#3694)
Co-authored-by: benjobs <[email protected]>
---
.dlc.json | 3 +
LICENSE | 1 +
.../ui-licenses/license-vue-vben-admin.txt | 21 +++
.../streampark-console-webapp/LICENSE | 201 ---------------------
.../streampark-console-webapp/README.md | 84 +--------
.../streampark-console-webapp/README.zh-CN.md | 96 ----------
6 files changed, 29 insertions(+), 377 deletions(-)
diff --git a/.dlc.json b/.dlc.json
index 99c96f25f..de93d07f2 100644
--- a/.dlc.json
+++ b/.dlc.json
@@ -20,6 +20,9 @@
},
{
"pattern": "^https://twitter.com*";
+ },
+ {
+ "pattern": "^/"
}
],
"timeout": "30s",
diff --git a/LICENSE b/LICENSE
index 0894d87a2..f55fb591b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -226,6 +226,7 @@ MIT License
The following components are provided under the MIT License
These files from https://github.com/vbenjs/vue-vben-admin
+The text of the license is included in
dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt
streampark-console/streampark-console-webapp/src/App.vue
streampark-console/streampark-console-webapp/src/main.ts
diff --git
a/dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt
b/dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt
new file mode 100644
index 000000000..ba2fe3b14
--- /dev/null
+++ b/dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-present, Vben
+
+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.
diff --git a/streampark-console/streampark-console-webapp/LICENSE
b/streampark-console/streampark-console-webapp/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/streampark-console/streampark-console-webapp/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/streampark-console/streampark-console-webapp/README.md
b/streampark-console/streampark-console-webapp/README.md
index 85292247e..5990ab012 100644
--- a/streampark-console/streampark-console-webapp/README.md
+++ b/streampark-console/streampark-console-webapp/README.md
@@ -1,81 +1,5 @@
-<div align="center">
- <br/>
- <h1>
- <a href="https://streampark.apache.org"; target="_blank" rel="noopener
noreferrer">
- <img width="600"
src="https://streampark.apache.org/image/logo_name.png"; alt="StreamPark logo">
- </a>
- </h1>
- <strong style="font-size: 1.5rem">Make stream processing easier!!!</strong>
-</div>
+# Apache StreamPark Web UI
-<br/>
-
-<p align="center">
- <img src="https://tokei.rs/b1/github/apache/streampark";>
- <img src="https://img.shields.io/github/v/release/apache/streampark.svg";>
- <img src="https://img.shields.io/github/stars/apache/streampark";>
- <img src="https://img.shields.io/github/forks/apache/streampark";>
- <img src="https://img.shields.io/github/issues/apache/streampark";>
- <img
src="https://img.shields.io/github/downloads/apache/streampark/total.svg";>
- <img src="https://img.shields.io/github/languages/count/apache/streampark";>
- <a href="https://www.apache.org/licenses/LICENSE-2.0.html";><img
src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg";></a>
-</p>
-
-<div align="center">
-
-**[Official Website](https://streampark.apache.org)**
-
-</div>
-
-#### English | [中文](README.zh-CN.md)
-
-# Apache StreamPark (Incubating)
-
-Make stream processing easier
-
-> A magical framework that make stream processing easier!
-
-
-
-### Use Gitpod
-
-Open the project in Gitpod (free online dev environment for GitHub) and start
coding immediately.
-
-[](https://gitpod.io/#https://github.com/apache/incubator-streampark)
-
-## Local development
-
-### Prerequisite
-
-- [Node.js 16.0+](https://nodejs.org/en/download/)
-- [pnpm](https://pnpm.io/installation)
-
-### Build and run
-
-1. Install dependencies:
-
-```bash
-pnpm install
-```
-
-2. Start a dev server:
-
-```bash
-pnpm serve
-```
-
-3. Build for production:
-
-```bash
-pnpm build
-```
-
-## Browser support
-
-The `Chrome 80+` browser is recommended for local development
-
-Support modern browsers, not IE
-
-| [<img
src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png";
alt=" Edge" width="24px" height="24px"
/>](http://godban.github.io/browsers-support-badges/)</br>IE | [<img
src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png";
alt=" Edge" width="24px" height="24px"
/>](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img
src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefo
[...]
-| :-: | :-: | :-: | :-: | :-: |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2
versions |
+> [!NOTE]
+>
+> This StreamPark WebUI is a fork to [Vue vben
admin](https://github.com/vbenjs/vue-vben-admin). Check [LICENSE](/LICENSE) and
[license-vue-vben-admin.txt](/dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt)
for more details.
diff --git a/streampark-console/streampark-console-webapp/README.zh-CN.md
b/streampark-console/streampark-console-webapp/README.zh-CN.md
deleted file mode 100644
index 9226588c4..000000000
--- a/streampark-console/streampark-console-webapp/README.zh-CN.md
+++ /dev/null
@@ -1,96 +0,0 @@
-<div align="center">
- <br/>
- <h1>
- <a href="https://streampark.apache.org"; target="_blank" rel="noopener
noreferrer">
- <img width="600"
src="https://streampark.apache.org/image/logo_name.png"; alt="StreamPark logo">
- </a>
- </h1>
- <strong style="font-size: 1.5rem">Make stream processing easier!!!</strong>
-</div>
-
-<br/>
-
-<p align="center">
- <img src="https://tokei.rs/b1/github/apache/streampark";>
- <img src="https://img.shields.io/github/v/release/apache/streampark.svg";>
- <img src="https://img.shields.io/github/stars/apache/streampark";>
- <img src="https://img.shields.io/github/forks/apache/streampark";>
- <img src="https://img.shields.io/github/issues/apache/streampark";>
- <img
src="https://img.shields.io/github/downloads/apache/streampark/total.svg";>
- <img src="https://img.shields.io/github/languages/count/apache/streampark";>
- <a href="https://www.apache.org/licenses/LICENSE-2.0.html";><img
src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg";></a>
-</p>
-
-<div align="center">
-
-**[官网](https://streampark.apache.org)**
-
-</div>
-
-#### [English](README.md) | 中文
-
-# Apache StreamPark (Incubating)
-
-Make stream processing easier
-
-> 一个神奇的框架，让流处理更简单。
-
-
-
-### 使用 Gitpod
-
-在 Gitpod（适用于 GitHub 的免费在线开发环境）中打开项目，并立即开始编码.
-
-[](https://github.com/apache/incubator-streampark)
-
-## 本地开发
-
-### 前提条件
-
-- [Node.js 16.0+](https://nodejs.org/en/download/)
-- [pnpm](https://pnpm.io/installation)
-
-> **Note**
->
-> 如果你遇到依赖下载缓慢需要配置 npm 镜像源,方法为在用户文件夹下找到 .npmrc 将以下内容写入：
->
-> ```bash
-> strict-peer-dependencies=false
-> save-workspace-protocol = rolling
-> registry = 'http://registry.npm.taobao.org'
-> sass_binary_site='http://npm.taobao.org/mirrors/node-sass/'
-> phantomjs_cdnurl='http://npm.taobao.org/mirrors/phantomjs'
-> CHROMEDRIVER_CDNURL='http://npm.taobao.org/mirrors/chromedriver'
-> electron_mirror='http://npm.taobao.org/mirrors/electron/'
-> fsevents_binary_host_mirror='http://npm.taobao.org/mirrors/fsevents/'
-> ```
-
-### 构建并运行
-
-1. 安装依赖：
-
-```bash
-pnpm install
-```
-
-2. 运行：
-
-```bash
-pnpm serve
-```
-
-3. 打包
-
-```bash
-pnpm build
-```
-
-## 浏览器支持
-
-本地开发推荐使用`Chrome 80+` 浏览器
-
-支持现代浏览器, 不支持 IE
-
-| [<img
src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png";
alt=" Edge" width="24px" height="24px"
/>](http://godban.github.io/browsers-support-badges/)</br>IE | [<img
src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png";
alt=" Edge" width="24px" height="24px"
/>](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img
src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefo
[...]
-| :-: | :-: | :-: | :-: | :-: |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2
versions |
![https://streampark.apache.org/image/logo_name.png"](https://streampark.apache.org/image/logo_name.png"){kind=link}
![https://img.shields.io/github/v/release/apache/streampark.svg"](https://img.shields.io/github/v/release/apache/streampark.svg"){kind=link}
![https://img.shields.io/github/downloads/apache/streampark/total.svg"](https://img.shields.io/github/downloads/apache/streampark/total.svg"){kind=link}
![https://img.shields.io/badge/license-Apache%202-4EB1BA.svg"](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg"){kind=link}
![https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png"](https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png"){kind=link}