You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/05/23 03:59:21 UTC

[incubator-doris] branch master updated: [doc] Update dev image (#9721)

This is an automated email from the ASF dual-hosted git repository.

yiguolei 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 ddda91c89d [doc] Update dev image (#9721)
ddda91c89d is described below

commit ddda91c89d028f8156ee9d156766239073487209
Author: Mingyu Chen <mo...@gmail.com>
AuthorDate: Mon May 23 11:59:15 2022 +0800

    [doc] Update dev image (#9721)
---
 dist/LICENSE-dist.txt                            | 8 ++++++++
 docs/en/install/source-install/compilation.md    | 1 +
 docs/zh-CN/install/source-install/compilation.md | 1 +
 thirdparty/CHANGELOG.md                          | 9 ++++++++-
 thirdparty/vars.sh                               | 1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dist/LICENSE-dist.txt b/dist/LICENSE-dist.txt
index 74ceaa0387..383afc4292 100644
--- a/dist/LICENSE-dist.txt
+++ b/dist/LICENSE-dist.txt
@@ -704,6 +704,9 @@ The Apache Software License, Version 2.0
     * Apache HttpCore:
         - org.apache.httpcomponents:httpcore:4.4.1 (http://hc.apache.org/httpcomponents-core-ga)
         - org.apache.httpcomponents:httpcore:4.4.15 (http://hc.apache.org/httpcomponents-core-ga)
+    * Apache Hudi:
+        - org.apache.hudi:hudi-hadoop-mr:0.10.0 (no url defined)
+        - org.apache.hudi:hudu-common:0.10.0 (no url defined)
     * Apache Iceberg:
         - org.apache.iceberg:iceberg-api:0.12.0 (https://iceberg.apache.org)
         - org.apache.iceberg:iceberg-bundled-guava:0.12.0 (https://iceberg.apache.org)
@@ -1523,11 +1526,16 @@ The Apache Software License, Version 2.0
     * aws sdk: 1.9.211
     * benchmark: 1.5.6
     * simdjson: 1.0.2
+    * libhdfs3: commit 5fccd36
 
 The MIT License -- licenses/LICENSE-MIT.txt
     * datatables: 1.10.25
     * bootstrap: 1.17.1
     * libxml2: 2.9.10
+    * krb5: 1.19
+
+LGPL -- licenes/LICENSE-LGPL.txt
+    * gsasl: 1.10.0/1.8.0
 
 Other dependencies:
     * libevent: 2.1.12 -- license/LICENSE-libevent.txt
diff --git a/docs/en/install/source-install/compilation.md b/docs/en/install/source-install/compilation.md
index d64e299d85..f732da4579 100644
--- a/docs/en/install/source-install/compilation.md
+++ b/docs/en/install/source-install/compilation.md
@@ -57,6 +57,7 @@ This document focuses on how to code Doris through source code.
 | apache/incubator-doris:build-env-1.3.1 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | 0.14.x |
 | apache/incubator-doris:build-env-for-0.15.0 | [a81f4da](https://github.com/apache/incubator-doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54) or later | 0.15.0          |
 | apache/incubator-doris:build-env-latest | before [0efef1b](https://github.com/apache/incubator-doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824) | |
+| apache/incubator-doris:build-env-for-1.0.0| | 1.0.0 |
 | apache/incubator-doris:build-env-ldb-toolchain-latest | trunk | trunk |
 
 **note**:
diff --git a/docs/zh-CN/install/source-install/compilation.md b/docs/zh-CN/install/source-install/compilation.md
index cb2ca5d977..456b938fe0 100644
--- a/docs/zh-CN/install/source-install/compilation.md
+++ b/docs/zh-CN/install/source-install/compilation.md
@@ -56,6 +56,7 @@ under the License.
 | apache/incubator-doris:build-env-1.3.1 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 0.14.x |
 | apache/incubator-doris:build-env-for-0.15.0 | [a81f4da](https://github.com/apache/incubator-doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54) or later | 0.15.0 |
 | apache/incubator-doris:build-env-latest | before [0efef1b](https://github.com/apache/incubator-doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824) | |
+| apache/incubator-doris:build-env-for-1.0.0| | 1.0.0 |
 | apache/incubator-doris:build-env-ldb-toolchain-latest | trunk | |
 
 **注意**:
diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md
index 17742e549b..ddd3dfb7f3 100644
--- a/thirdparty/CHANGELOG.md
+++ b/thirdparty/CHANGELOG.md
@@ -2,8 +2,15 @@
 
 This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/incubator-doris, and the tag is `build-env-${version}`
 
+## v20220522
+
+- Added: libgsasl 1.8.0, this version of gsasl is only used for libhdfs3 with kerberos
+- Added: krb5 1.19
+
+Now there will be 2 set of libhdfs, one is without kerberos, the other is with kerberos, saved in `thirdparty/installed/libhdfs_with_kerberos/`
+
 ## v20220321
-- Add libbacktrace, it is used by boost stacktrace to print exception stack.
+- Added: libbacktrace, it is used by boost stacktrace to print exception stack.
 
 ## v20220316
 - Modified: CRoaring 0.3.4 -> 0.4.0
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 12ece01216..b3dc39aa0a 100755
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -329,6 +329,7 @@ GSASL_NAME="libgsasl-1.10.0.tar.gz"
 GSASL_SOURCE="libgsasl-1.10.0"
 GSASL_MD5SUM="9c8fc632da4ce108fb7581b33de2a5ce"
 
+# gsasl 1.8.0 is only used for libhdfs3 with kerberos
 GSASL2_DOWNLOAD="https://ftp.gnu.org/gnu/gsasl/libgsasl-1.8.0.tar.gz"
 GSASL2_NAME="libgsasl-1.8.0.tar.gz"
 GSASL2_SOURCE="libgsasl-1.8.0"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org