Merge pull request #259 from casionone/dev

update release-notes-1.1.1.md and how-to-verify.md

community/how-to-verify.md

@@ -66,7 +66,7 @@ Do you really want to set this key to ultimate trust? (y/N) y  #choose y
 gpg>
          
 ```
-#### 2.2.3 Use the following command to check the signature
+#### 2.2.3 Check the gpg signature
 
 ```shell
 $ for i in *.tar.gz; do echo $i; gpg --verify $i.asc $i; done

docs/release-notes-1.1.1.md

@@ -1,8 +1,15 @@
 ---
-title: Release Notes 1.1.1-RC1
+title: Release Notes 1.1.1-RC2
 sidebar_position: 0.2
 ---
 
+Based on 1.1.1-RC1, 1.1.1-RC2 fixes the following problems:
+- Removed the binary file .mvn/wrapper/maven-wrapper.jar in the source code, and adjusted the LICENSE content related to .mvn/*
+- Upgrade py4j-0.10.7-src.zip to py4j-0.10.9.5-src.zip, update the license files of py4j-*.src and adjust it location, from linkis-engineconn-plugins/engineconn-plugins/python /src/main/py4j/LICENSE-py4j-0.10.7-src.txt moved to licenses/LICENSE-py4j-0.10.9.5-src.txt for easy viewing
+- Fixed the issue of using Window's line endings format CTRL in the release source code of shell script:mvnw
+
+-------
+
 Apache Linkis(incubating) 1.1.1 includes all of [Project Linkis-1.1.1](https://github.com/apache/incubator-linkis/projects/18).
 
 

download/main.md

@@ -14,5 +14,39 @@ Use the links below to download the Apache Linkis Releases, the latest release i
 | 1.0.2(<font color='red'>Non-ASF</font>) | 2021-09-02 | [[Source](https://github.com/apache/incubator-linkis/archive/refs/tags/1.0.2.tar.gz)]| [[Binary](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Linkis/1.0.2/wedatasphere-linkis-1.0.2-combined-package-dist.tar.gz)]| |[Release-Notes](release-notes-1.0.2.md)|
 
 ## Release Integrity
-   You must [verify](https://www.apache.org/info/verification.html) the integrity of the downloaded files. We provide OpenPGP signatures for every release file. 
-   This signature should be matched against the [KEYS](https://downloads.apache.org/incubator/linkis/KEYS) file which contains the OpenPGP keys of Linkis's Release Managers. We also provide <code>SHA-512</code> checksums for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours.
+You must [verify](https://www.apache.org/info/verification.html) the integrity of the downloaded files. We provide OpenPGP signatures for every release file. 
+This signature should be matched against the [KEYS](https://downloads.apache.org/incubator/linkis/KEYS) file which contains the OpenPGP keys of Linkis's Release Managers. We also provide <code>SHA-512</code> checksums for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours.
+
+validation example:
+```shell script
+#download public key
+$ curl https://downloads.apache.org/incubator/linkis/KEYS > KEYS
+
+#Import public key
+$ gpg -i KEYS
+
+# Check gpg signature
+$ gpg --verify apache-linkis-xxxxx.tar.gz.asc apache-linkis-xxxxx.tar.gz
+
+# check sha512 hash
+$ sha512sum --check apache-linkis-xxxxx-src.tar.gz.sha512
+````
+
+
+## Source Code Compilation
+
+If it is the downloaded version of the Source code package, you can compile it according to the following simple steps
+ 
+```shell script
+$ tar -xvf apache-linkis-xxxxx-incubating-src.tar.gz
+
+$ cd apache-linkis-xxxxx-incubating-src
+
+#If this source code package is compiled for the first time, you need to execute this command, which is usually completed within 3 minutes
+$ ./mvnw -N install
+
+#If the performance of the machine where the compilation is located is relatively poor, this process will be time-consuming, usually about 30min
+$ ./mvnw clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+
+````
+For detailed guidelines, please refer to: [Compilation and Packaging Guidelines](/docs/latest/development/linkis_compile_and_package)

i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md

@@ -65,7 +65,7 @@ Do you really want to set this key to ultimate trust? (y/N) y #选择y
 gpg> 
      
 ```
-#### 2.2.3 使用如下命令检查签名
+#### 2.2.3 检查签名
 
 ```shell
 $ for i in *.tar.gz; do echo $i; gpg --verify $i.asc $i ; done

i18n/zh-CN/docusaurus-plugin-content-docs-download/current/main.md

@@ -13,4 +13,40 @@ sidebar_position: 0
 | 1.0.2(<font color='red'>Non-ASF</font>) | 2021-09-02 | [[Source](https://github.com/apache/incubator-linkis/archive/refs/tags/1.0.2.tar.gz)]| [[Binary](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Linkis/1.0.2/wedatasphere-linkis-1.0.2-combined-package-dist.tar.gz)]| |[Release-Notes](release-notes-1.0.2.md)|
 
 ## 完整性校验
+
 您必须[验证](https://www.apache.org/info/verification.html) 下载文件的完整性。 我们为每个发布文件提供 OpenPGP 签名。 此签名应与包含 Linkis 发布经理的 OpenPGP 密钥的 [KEYS](https://downloads.apache.org/incubator/linkis/KEYS) 文件匹配。 我们还为每个发布文件提供 <code>SHA-512</code> 校验和。 下载文件后，您应该计算下载的校验和，并确保它与我们的相同。
+
+验证示例：
+```shell script
+#下载公钥
+$ curl  https://downloads.apache.org/incubator/linkis/KEYS > KEYS
+
+#导入公钥
+$ gpg -i KEYS
+
+# 检查 gpg 签名
+$ gpg --verify apache-linkis-xxxxx.tar.gz.asc  apache-linkis-xxxxx.tar.gz
+
+#  检查sha512哈希
+$ sha512sum --check  apache-linkis-xxxxx-src.tar.gz.sha512
+``` 
+
+
+## 源码的编译
+
+如果是下载版本的Source源码包，可以按下面简易步骤，进行编译
+
+```shell script
+$ tar -xvf apache-linkis-xxxxx-incubating-src.tar.gz
+
+$ cd apache-linkis-xxxxx-incubating-src
+
+#如果本源码包是首次编译，需要执行本命令，一般执行在3分钟内完成
+$ ./mvnw -N install 
+
+#如果编译所在的机器性能比较差，则此过程会比较耗时，一般耗时30min左右
+$ ./mvnw clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+
+```
+详细指引可以参考：[编译打包指引](/docs/latest/development/linkis_compile_and_package)
+

i18n/zh-CN/docusaurus-plugin-content-docs/current/release-notes-1.1.1.md

@@ -1,8 +1,15 @@
 ---
-title: Release Notes 1.1.1-RC1
+title: Release Notes 1.1.1-RC2
 sidebar_position: 0.2
 --- 
 
+在1.1.1-RC1基础上，1.1.1-RC2修复如下问题:
+- 移除了源码中的二进制文件.mvn/wrapper/maven-wrapper.jar，调整.mvn/*相关的LICENSE说明
+- 升级 py4j-0.10.7-src.zip 至 py4j-0.10.9.5-src.zip，更新py4j-*.src的license文件并调整其位置，从linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt 移动至 licenses/LICENSE-py4j-0.10.9.5-src.txt，方便查看 
+- 修复发布源码中，shell脚本:mvnw，使用Window的换行符CTRL问题
+
+-------
+
 Apache Linkis(incubating) 1.1.1 包括所有 [Project Linkis-1.1.1](https://github.com/apache/incubator-linkis/projects/18)。