Merge branch 'apache:master' into master

.github/workflows/docs.sh

@@ -22,6 +22,8 @@ mvn --version
 java -version
 javadoc -J-version
 
+# workaround for a git security patch
+git config --global --add safe.directory /root/flink
 git submodule update --init --recursive
 
 cd docs

.github/workflows/docs.yml

@@ -43,12 +43,12 @@ jobs:
 
           if [ "${currentBranch}" = "master" ]; then
             echo "flink_alias=release-1.19" >> ${GITHUB_ENV}
-          elif [ "${currentBranch}" = "release-1.17" ]; then
+          elif [ "${currentBranch}" = "release-1.18" ]; then
             echo "flink_alias=stable" >> ${GITHUB_ENV}
           fi
       - name: Build documentation
         run: |
-          docker run  --rm --volume "$PWD:/root/flink" chesnay/flink-ci:java_8_11 bash -c "cd /root/flink && ./.github/workflows/docs.sh"
+          docker run --rm --volume "$PWD:/root/flink" chesnay/flink-ci:java_8_11_17_maven_386_v2 bash -c "cd /root/flink && ./.github/workflows/docs.sh"
       - name: Upload documentation
         uses: burnett01/[email protected]
         with:

README.md

@@ -69,7 +69,7 @@ Prerequisites for building Flink:
 
 * Unix-like environment (we use Linux, Mac OS X, Cygwin, WSL)
 * Git
-* Maven (we recommend version 3.8.6 and require at least 3.1.1)
+* Maven (we require version 3.8.6)
 * Java 8 or 11 (Java 9 or 10 may work)
 
 ```
@@ -80,9 +80,6 @@ cd flink
 
 Flink is now installed in `build-target`.
 
-*NOTE: Maven 3.3.x can build Flink, but will not properly shade away certain dependencies. Maven 3.1.1 creates the libraries properly.
-To build unit tests with Java 8, use Java 8u51 or above to prevent failures in unit tests that use the PowerMock runner.*
-
 ## Developing Flink
 
 The Flink committers use IntelliJ IDEA to develop the Flink codebase.

docs/content.zh/_index.md

@@ -85,7 +85,8 @@ under the License.
 For some reason Hugo will only allow linking to the 
 release notes if there is a leading '/' and file extension.
 -->
-请参阅 [Flink 1.17]({{< ref "/release-notes/flink-1.17.md" >}})，
+请参阅 [Flink 1.18]({{< ref "/release-notes/flink-1.18.md" >}}),
+[Flink 1.17]({{< ref "/release-notes/flink-1.17.md" >}})，
 [Flink 1.16]({{< ref "/release-notes/flink-1.16.md" >}})，
 [Flink 1.15]({{< ref "/release-notes/flink-1.15.md" >}})，
 [Flink 1.14]({{< ref "/release-notes/flink-1.14.md" >}})，