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
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4c6471c..eca7753 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 cddeb98..a1aef2b 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 392b908..3d092f5 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 8493982..c741d46 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 1e1f0d0..4d016bb 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -11,15 +11,6 @@
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 177eb1e..e21f32c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -219,14 +219,6 @@
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 @@
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 22b5e82..46c36a6 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
- **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 @@
| **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 bd0fa8f..c3bd4e6 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -20,7 +20,7 @@
- **丰富的底层计算存储引擎支持**。
**目前支持的计算存储引擎**：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 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 a89e09c..587285d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,23 +422,15 @@
<exclude>**/*.iml</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.json</exclude>
- <exclude>images/*</exclude>
<exclude>web/.editorconfig</exclude>
<exclude>web/.env</exclude>
<exclude>web/.eslintignore</exclude>
<exclude>web/.jshintrc</exclude>
- <exclude>web/patches/iview+3.5.4.patch</exclude>
+
<exclude>web/public/favicon.ico</exclude>
<exclude>web/dist/**</exclude>
<exclude>web/node_modules/**</exclude>
<exclude>web/apache-linkis-*-web-bin.tar.gz</exclude>
- <exclude>web/src/dss/assets/images/*.png</exclude>
- <exclude>web/src/dss/assets/images/*.jpg</exclude>
- <exclude>web/src/dss/assets/images/*.jpeg</exclude>
- <exclude>web/src/apps/linkis/assets/images/*.png</exclude>
- <!-- todo confirm-->
- <exclude>web/src/components/svgIcon/svg/*.svg</exclude>
- <exclude>web/src/dss/assets/projectIconFont/iconfont.svg</exclude>
<exclude>**/*.md</exclude>
<exclude>.git/</exclude>
diff --git a/web/src/components/svgIcon/svg/common.svg b/web/src/components/svgIcon/svg/common.svg
index e00e21b..205d616 100644
--- a/web/src/components/svgIcon/svg/common.svg
+++ b/web/src/components/svgIcon/svg/common.svg
@@ -1 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14zm-5.04-6.71l-2.75 3.54-1.96-2.36L6.5 17h11l-3.54-4.71z"/></svg>
\ No newline at end of file
+<!--
+ * 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.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
+<path d="M0 0h24v24H0z" fill="none"/><path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14zm-5.04-6.71l-2.75 3.54-1.96-2.36L6.5 17h11l-3.54-4.71z"/>
+</svg>
