From da1f815d19d147a5a4fe0841404c4d6fe42bbedb Mon Sep 17 00:00:00 2001 From: EmmyMiao87 <522274284@qq.com> Date: Mon, 2 Nov 2020 11:56:22 +0800 Subject: [PATCH] Add other license declare in NOTICE --- .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 +- .../doris/analysis/CancelLoadStmtTest.java | 17 +++++++++++++++ ui/postcss.config.js | 19 ++++++++++++++++- ui/public/fonts/Read Me.txt | 17 +++++++++++++++ ui/public/fonts/style.min.css | 19 +++++++++++++++++ .../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 3c1772f7835002..f5891ba54663d2 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 03e539e777f92b..2cb8823c16750f 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 62d18b068f8114..ea417182674684 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 89500e9d3f1b64..41e21f92277e98 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 420b49f24091fc..f2d41be35ab73b 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](dev@doris.apache.org) diff --git a/docs/en/community/verify-apache-release.md b/docs/en/community/verify-apache-release.md index 129daee4489f96..c6b6fa2c9413ad 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 f0861412498497..64afe8632b5560 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 社区](dev@doris.apache.org)发起投票 diff --git a/docs/zh-CN/community/verify-apache-release.md b/docs/zh-CN/community/verify-apache-release.md index 3dc06a73a3419b..865c133f1cc8be 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 5104b713682aed..a3b68fe0c1c314 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 689c25e08faa68..ad999873e22614 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 8491652f8809d9..888cdad0f797fa 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 d9f53195a85d14..49c232a7bc65f6 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 3e56e52cafda3c..6bff28ed327ad2 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 9bb8cd8ce66b53..07ef31d180bb90 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 9b84a5dc726ef4..5fb8feeb6e9651 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