From f31ac01a6003e0ba8e6ac74bb0a45b18b86ac418 Mon Sep 17 00:00:00 2001 From: Casion Date: Mon, 17 Jan 2022 16:02:57 +0800 Subject: [PATCH] Adjust rat check: remove some web resource exclude configuration (#1311) * adjust rat check excludes * add license header * modify README.md * add license header for common.svg --- .github/ISSUE_TEMPLATE/bug_report.yml | 16 ++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 17 +++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.yml | 17 +++++++++++++++++ .github/workflows/build.yml | 2 +- DISCLAIMER-WIP | 9 --------- LICENSE | 12 ------------ README.md | 4 ++-- README_CN.md | 4 ++-- pom.xml | 10 +--------- web/src/components/svgIcon/svg/common.svg | 20 +++++++++++++++++++- 10 files changed, 75 insertions(+), 36 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 4c6471c56d..eca7753bd8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# name: Bug report title: "[Bug] " description: Problems and issues with code of Linkis diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index cddeb98bb1..a1aef2b407 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# + blank_issues_enabled: fasle contact_links: - name: Ask a question or get support diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 392b9088aa..3d092f5cca 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# + name: Linkis feature request description: Suggest an idea for Linkis project title: "[Feature] " diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8493982a57..c741d46ed2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ # limitations under the License. # -name: incubator-linkis ci actions +name: Build on: push: diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP index 1e1f0d0fa3..4d016bb28b 100644 --- a/DISCLAIMER-WIP +++ b/DISCLAIMER-WIP @@ -11,15 +11,6 @@ What follows is a list of issues the project is currently aware of (this list is 1. Releases may have incomplete licensing conditions -2. Some svg/image/woff files: - web/src/components/svgIcon/svg/*.svg - web/src/dss/assets/projectIconFont/iconfont.svg - web/src/dss/assets/projectIconFont/iconfont.eot - web/src/dss/assets/projectIconFont/iconfont.woff - web/src/dss/assets/projectIconFont/iconfont.woff2 - in the web component may not licensed, We need to confirm these files one by one. For unlicensed files, - we will remove them or getting approvals from other copyright holders in subsequent versions. - If you are planning to incorporate this work into your product/project,please be aware that you will need to conduct a thorough licensing review to determine the overall implications of including this work.For the current status of this project through the Apache Incubator, diff --git a/LICENSE b/LICENSE index 177eb1e7a1..e21f32cf7c 100644 --- a/LICENSE +++ b/LICENSE @@ -218,14 +218,6 @@ BSD licenses The following components are provided under the BSD License. linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-*-src.zip(See linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt for text of this license) -======================================================================== -MIT licenses -======================================================================== - -The following file are provided under the MIT License. - web/patches/iview+3.5.4.patch - - ======================================================================== Apache 2.0 licenses ======================================================================== @@ -241,9 +233,5 @@ The following file are provided under the Apache 2.0 License. web/src/common/i18n/en.json web/src/common/i18n/zh.json web/src/config.json - web/src/dss/assets/projectIconFont/iconfont.json web/public/favicon.ico - web/src/dss/assets/images/*.png - web/src/dss/assets/images/*.jpg - web/src/apps/linkis/assets/images/*.jpeg diff --git a/README.md b/README.md index 22b5e82d0a..46c36a6bed 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Since the first release of Linkis in 2019, it has accumulated more than **700** - **Support for diverse underlying computation storage engines**. Currently supported computation/storage engines: Spark, Hive, Python, Presto, ElasticSearch, MLSQL, TiSpark, JDBC, Shell, etc; - Computation/storage engines to be supported: Flink, Impala, etc; + Computation/storage engines to be supported: Flink(Supported in version >=1.0.2), Impala, etc; Supported scripting languages: SparkSQL, HiveQL, Python, Shell, Pyspark, R, Scala and JDBC, etc. - **Powerful task/request governance capabilities**. With services such as Orchestrator, Label Manager and customized Spring Cloud Gateway, Linkis is able to provide multi-level labels based, cross-cluster/cross-IDC fine-grained routing, load balance, multi-tenancy, traffic control, resource control, and orchestration strategies like dual-active, active-standby, etc. @@ -39,7 +39,7 @@ Since the first release of Linkis in 2019, it has accumulated more than **700** | **Engine** | **Supported Version** | **Linkis 0.X version requirement**| **Linkis 1.X version requirement** | **Description** | |:---- |:---- |:---- |:---- |:---- | -|Flink |1.11.0|\>=dev-0.12.0, PR #703 not merged yet.|ongoing| Flink EngineConn. Supports FlinkSQL code, and also supports Flink Jar to Linkis Manager to start a new Yarn application.| +|Flink |1.12.2|\>=dev-0.12.0, PR #703 not merged yet.|>=1.0.2| Flink EngineConn. Supports FlinkSQL code, and also supports Flink Jar to Linkis Manager to start a new Yarn application.| |Impala|\>=3.2.0, CDH >=6.3.0"|\>=dev-0.12.0, PR #703 not merged yet.|ongoing|Impala EngineConn. Supports Impala SQL.| |Presto|\>= 0.180|\>=0.11.0|ongoing|Presto EngineConn. Supports Presto SQL.| |ElasticSearch|\>=6.0|\>=0.11.0|ongoing|ElasticSearch EngineConn. Supports SQL and DSL code.| diff --git a/README_CN.md b/README_CN.md index bd0fa8f56a..c3bd4e67a2 100644 --- a/README_CN.md +++ b/README_CN.md @@ -20,7 +20,7 @@ Linkis 自2019年开源发布以来，已累计积累了700多家试验企业和 - **丰富的底层计算存储引擎支持**。 **目前支持的计算存储引擎**：Spark、Hive、Python、Presto、ElasticSearch、MLSQL、TiSpark、JDBC和Shell等。 - **正在支持中的计算存储引擎**：Flink、Impala等。 + **正在支持中的计算存储引擎**：Flink(>=1.0.2版本已支持)、Impala等。 **支持的脚本语言**：SparkSQL, HiveQL, Python, Shell, Pyspark, R, Scala 和JDBC 等。 - **强大的计算治理能力**。基于Orchestrator、Label Manager和定制的Spring Cloud Gateway等服务，Linkis能够提供基于多级标签的跨集群/跨IDC 细粒度路由、负载均衡、多租户、流量控制、资源控制和编排策略(如双活、主备等)支持能力。 - **全栈计算存储引擎架构支持**。能够接收、执行和管理针对各种计算存储引擎的任务和请求，包括离线批量任务、交互式查询任务、实时流式任务和存储型任务； @@ -32,7 +32,7 @@ Linkis 自2019年开源发布以来，已累计积累了700多家试验企业和 | **引擎** | **引擎版本** | **Linkis 0.X 版本要求**| **Linkis 1.X 版本要求** | **说明** | |:---- |:---- |:---- |:---- |:---- | -|Flink |1.11.0|\>=dev-0.12.0, PR #703 尚未合并|ongoing| Flink EngineConn。支持FlinkSQL 代码，也支持以Flink Jar 形式启动一个新的Yarn 应用程序。| +|Flink |1.12.2|\>=dev-0.12.0, PR #703 尚未合并|>=1.0.2| Flink EngineConn。支持FlinkSQL 代码，也支持以Flink Jar 形式启动一个新的Yarn 应用程序。| |Impala|\>=3.2.0, CDH >=6.3.0"|\>=dev-0.12.0, PR #703 尚未合并|ongoing|Impala EngineConn. 支持Impala SQL 代码.| |Presto|\>= 0.180|\>=0.11.0|ongoing|Presto EngineConn. 支持Presto SQL 代码.| |ElasticSearch|\>=6.0|\>=0.11.0|ongoing|ElasticSearch EngineConn. 支持SQL 和DSL 代码.| diff --git a/pom.xml b/pom.xml index a89e09cec1..587285d4fd 100644 --- a/pom.xml +++ b/pom.xml @@ -422,23 +422,15 @@ **/*.iml **/*.txt **/*.json - images/* web/.editorconfig web/.env web/.eslintignore web/.jshintrc - web/patches/iview+3.5.4.patch + web/public/favicon.ico web/dist/** web/node_modules/** web/apache-linkis-*-web-bin.tar.gz - web/src/dss/assets/images/*.png - web/src/dss/assets/images/*.jpg - web/src/dss/assets/images/*.jpeg - web/src/apps/linkis/assets/images/*.png - - web/src/components/svgIcon/svg/*.svg - web/src/dss/assets/projectIconFont/iconfont.svg **/*.md .git/ diff --git a/web/src/components/svgIcon/svg/common.svg b/web/src/components/svgIcon/svg/common.svg index e00e21b3e2..205d6160b5 100644 --- a/web/src/components/svgIcon/svg/common.svg +++ b/web/src/components/svgIcon/svg/common.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + +