This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1d89e06 [License] Add other license declare in NOTICE (#4831)
1d89e06 is described below
commit 1d89e0670a4d0d98774a4818a891f6568875d4f3
Author: EmmyMiao87 <[email protected]>
AuthorDate: Thu Nov 5 20:30:49 2020 +0800
[License] Add other license declare in NOTICE (#4831)
---
.rat-excludes | 14 +++++++++++++-
NOTICE.txt | 15 +++++++++++++++
be/src/util/utf8_check.h | 1 -
conf/odbcinst.ini | 17 +++++++++++++++++
docs/en/community/release-process.md | 6 +++---
docs/en/community/verify-apache-release.md | 2 +-
docs/zh-CN/community/release-process.md | 6 +++---
docs/zh-CN/community/verify-apache-release.md | 2 +-
.../apache/doris/analysis/CancelLoadStmtTest.java | 17 +++++++++++++++++
ui/postcss.config.js | 19 ++++++++++++++++++-
ui/public/fonts/Read Me.txt | 17 +++++++++++++++++
ui/public/fonts/style.min.css | 19 +++++++++++++++++++
.../components/codemirror-with-fullscreen/doris.css | 21 ++++++++++++++++++++-
ui/src/pages/layout/index.css | 18 ++++++++++++++++++
ui/webpack.config.js | 17 +++++++++++++++++
15 files changed, 179 insertions(+), 12 deletions(-)
diff --git a/.rat-excludes b/.rat-excludes
index 3c1772f..f5891ba 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -13,9 +13,21 @@ NOTICE
gutil/*
manifest
patches/*
+data/*
test_data/*
test.zip
test.zip.md5
webroot/*
net_snmp_normal
-spark_laucher_monitor.log
+spark_launcher_monitor.log
+jmockit/*
+status.*
+env*
+lru*
+skiplist.h
+string_search.hpp
+coding.*
+condition_variable.*
+murmur_hash3.*
+utf8_check.cpp
+.markdownlintignore
diff --git a/NOTICE.txt b/NOTICE.txt
index 03e539e..2cb8823 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -6,3 +6,18 @@ The Apache Software Foundation (http://www.apache.org/).
Based on source code originally developed by
Baidu (http://www.baidu.com/).
+
+This product includes software developed by the LevelDB.
+Copyright (c) 2011 The LevelDB Authors. All rights reserved.
+
+This product includes software developed by CPython for searching string
function.
+(https://github.com/python/cpython)
+
+This product includes software developed by Chromium.
+Copyright (c) 2011 The Chromium Authors. All rights reserved.
+
+This product includes software developed by Austin Appleby for MurmurHash3.
+The author hereby disclaims copyright to this source code.
+
+This product includes software developed by cyb70289 for validating utf8
string.
+Copyright (c) cyb70289(https://github.com/cyb70289). All rights reserved.
diff --git a/be/src/util/utf8_check.h b/be/src/util/utf8_check.h
index 62d18b0..ea41718 100644
--- a/be/src/util/utf8_check.h
+++ b/be/src/util/utf8_check.h
@@ -1,4 +1,3 @@
-
// 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
diff --git a/conf/odbcinst.ini b/conf/odbcinst.ini
index 89500e9..41e21f9 100644
--- a/conf/odbcinst.ini
+++ b/conf/odbcinst.ini
@@ -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.
+
# Example driver definitions, you should not use the example odbc driver
# before you prepare env in your server
diff --git a/docs/en/community/release-process.md
b/docs/en/community/release-process.md
index 420b49f..f2d41be 100644
--- a/docs/en/community/release-process.md
+++ b/docs/en/community/release-process.md
@@ -37,9 +37,9 @@ The general process of publication is as follows:
3. clean up issues
4. merging necessary patch to release branch
3. Verify branch
- 1. QA stability test
- 2. Verify the correctness of the compiled image
- 3. Prepare Release Nodes
+ 1. QA stability test
+ 2. Verify the correctness of the compiled image
+ 3. Prepare Release Nodes
4. Running the voting process for a release
1. singing a tag and upload it to [Apache dev svn
repo](https://dist.apache.org/repos/dist/dev/incubator/doris)
2. calling votes from [Doris community]([email protected])
diff --git a/docs/en/community/verify-apache-release.md
b/docs/en/community/verify-apache-release.md
index 129daee..c6b6fa2 100644
--- a/docs/en/community/verify-apache-release.md
+++ b/docs/en/community/verify-apache-release.md
@@ -74,7 +74,7 @@ Given your source dir is apache-doris-a.b.c-incubating-src,
you can check with f
It will output a file list which don't include ASF license header, and these
files used other licenses.
``` shell
-/usr/java/jdk/bin/java -jar apache-rat-0.13/apache-rat-0.13.jar -a -d
apache-doris-a.b.c-incubating-src -E
apache-doris-a.b.c-incubating-src/.rat-excudes
+/usr/java/jdk/bin/java -jar apache-rat-0.13/apache-rat-0.13.jar -a -d
apache-doris-a.b.c-incubating-src -E
apache-doris-a.b.c-incubating-src/.rat-excludes
```
## 4. Verify building
diff --git a/docs/zh-CN/community/release-process.md
b/docs/zh-CN/community/release-process.md
index f086141..64afe86 100644
--- a/docs/zh-CN/community/release-process.md
+++ b/docs/zh-CN/community/release-process.md
@@ -37,9 +37,9 @@ Apache 的发布必须至少是 IPMC 成员，拥有 apache 邮箱的committer
3. 清理 issue
4. 将必要的 Patch 合并到发布的分支
3. 验证分支
- 1. QA 稳定性测试
- 2. 验证编译镜像正确性
- 3. 准备 Release Nodes
+ 1. QA 稳定性测试
+ 2. 验证编译镜像正确性
+ 3. 准备 Release Nodes
4. 社区发布投票流程
1. 将 tag 打包，签名并上传到[Apache Dev svn
仓库](https://dist.apache.org/repos/dist/dev/incubator/doris)
2. 在 [Doris 社区]([email protected])发起投票
diff --git a/docs/zh-CN/community/verify-apache-release.md
b/docs/zh-CN/community/verify-apache-release.md
index 3dc06a7..865c133 100644
--- a/docs/zh-CN/community/verify-apache-release.md
+++ b/docs/zh-CN/community/verify-apache-release.md
@@ -79,7 +79,7 @@ tar zxvf apache -rat -0.13 -bin.tar.gz
这个命令会产生一个文件，其中列举了所有非 ASF 协议的文件。
``` shell
-/usr/java/jdk/bin/java -jar apache-rat-0.13/apache-rat-0.13.jar -a -d
apache-doris-a.b.c-incubating-src -E
apache-doris-a.b.c-incubating-src/.rat-excudes
+/usr/java/jdk/bin/java -jar apache-rat-0.13/apache-rat-0.13.jar -a -d
apache-doris-a.b.c-incubating-src -E
apache-doris-a.b.c-incubating-src/.rat-excludes
```
## 4. 验证编译
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
index 5104b71..a3b68fe 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
@@ -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.
+
package org.apache.doris.analysis;
import mockit.Expectations;
diff --git a/ui/postcss.config.js b/ui/postcss.config.js
index 689c25e..ad99987 100644
--- a/ui/postcss.config.js
+++ b/ui/postcss.config.js
@@ -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.
+
/**
* @file test cron
* @author lpx
@@ -15,4 +32,4 @@ module.exports = {
grid: true
}
}
-};
\ No newline at end of file
+};
diff --git a/ui/public/fonts/Read Me.txt b/ui/public/fonts/Read Me.txt
index 8491652..888cdad 100644
--- a/ui/public/fonts/Read Me.txt
+++ b/ui/public/fonts/Read Me.txt
@@ -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.
+
Open *demo.html* to see a list of all the glyphs in your font along with their
codes/ligatures.
To use the generated font in desktop programs, you can install the TTF font.
In order to copy the character associated with each icon, refer to the text box
at the bottom right corner of each glyph in demo.html. The character inside
this text box may be invisible; but it can still be copied. See this guide for
more info: https://icomoon.io/#docs/local-fonts
diff --git a/ui/public/fonts/style.min.css b/ui/public/fonts/style.min.css
index d9f5319..49c232a 100644
--- a/ui/public/fonts/style.min.css
+++ b/ui/public/fonts/style.min.css
@@ -1,3 +1,22 @@
+/**
+ * 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.
+ */
+
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?9lzn0r');
diff --git a/ui/src/components/codemirror-with-fullscreen/doris.css
b/ui/src/components/codemirror-with-fullscreen/doris.css
index 3e56e52..6bff28e 100644
--- a/ui/src/components/codemirror-with-fullscreen/doris.css
+++ b/ui/src/components/codemirror-with-fullscreen/doris.css
@@ -1,3 +1,22 @@
+/**
+ * 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.
+ */
+
/* neo theme for codemirror */
/* Color scheme */
@@ -62,4 +81,4 @@
background: rgba(155, 157, 162, 0.37);
z-index: 1;
}
-
\ No newline at end of file
+
diff --git a/ui/src/pages/layout/index.css b/ui/src/pages/layout/index.css
index 9bb8cd8..07ef31d 100644
--- a/ui/src/pages/layout/index.css
+++ b/ui/src/pages/layout/index.css
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
/* .ant-layout-header .logo {
width: 120px;
diff --git a/ui/webpack.config.js b/ui/webpack.config.js
index 9b84a5d..5fb8fee 100644
--- a/ui/webpack.config.js
+++ b/ui/webpack.config.js
@@ -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.
+
/**
* @file test cron
* @author lpx
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
