Merge branch 'flink-1.11' into branch-2.5.8

# Conflicts:
#	.github/workflows/release.yaml
#	managed-ledger-shaded/pom.xml
#	pom.xml
#	pulsar-flink-connector-shade-2.11/pom.xml
#	pulsar-flink-connector-shade-2.12/pom.xml
#	pulsar-flink-connector/pom.xml

.editorconfig

@@ -0,0 +1,43 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.java]
+continuation_indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.json]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+[*.sql]
+indent_size = 2
+
+[*.kt]
+indent_size = 2
+
+[*.sh]
+indent_size = 2
+
+[*.cmd]
+end_of_line = crlf
+
+[pom.xml]
+indent_size = 2

.github/workflows/pr.yaml

@@ -33,33 +33,3 @@ jobs:
       - name: Run check and test
         run: |
           ./tools/retry.sh mvn -B -ntp clean install
-
-  unit-tests-local:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      - name: install Pulsar Service
-        run: |
-          apt update && apt install -y wget
-          cd /tmp
-          wget -O 'apache-pulsar-2.7.0-bin.tar.gz' 'https://archive.apache.org/dist/pulsar/pulsar-2.7.0/apache-pulsar-2.7.0-bin.tar.gz'
-          tar -xvzf apache-pulsar-2.7.0-bin.tar.gz
-          cd apache-pulsar-2.7.0
-          chmod +x ./bin/*
-          nohup ./bin/pulsar standalone --no-stream-storage -nfw &
-      - name: run batch test
-        run: |
-          export PULSAR_ADMIN_URL=http://127.0.0.1:8080
-          export PULSAR_SERVICE_URL=pulsar://127.0.0.1:6650
-          export PULSAR_ZK_URL=127.0.0.1:2181
-          mvn -ntp install -DskipTests
-          mvn -ntp test -pl pulsar-flink-connector -Dtest=org.apache.flink.batch.connectors.pulsar.PulsarInputFormatITest

.github/workflows/release.yaml

@@ -29,16 +29,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - name: Import GPG key
-        id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v3
+      - name: Release Maven package
+        uses: samuelmeuli/action-maven-publish@v1
         with:
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.PASSPHRASE }}
-      - name: Release
-        env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-        run: |
-          MAVEN_SETTINGS_FILE=tools/maven/settings.xml
-          mvn --settings ${MAVEN_SETTINGS_FILE} javadoc:jar source:jar deploy -DskipTests -Prelease
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg_passphrase: ${{ secrets.PASSPHRASE }}
+          nexus_username: ${{ secrets.SONATYPE_USERNAME }}
+          nexus_password: ${{ secrets.SONATYPE_PASSWORD }}
+          server_id: ossrh
+          maven_profiles: release
+          maven_goals_phases: clean deploy
+          maven_args: -DskipTests

README.md

@@ -506,8 +506,3 @@ If you want to build a Pulsar Flink connector reading data from Pulsar and writi
     $ mvn clean install
     ```
 Once the installation is finished, there is a fat jar generated under both local maven repo and `target` directory.
-
-> Note: If you are using intellij IDEA to debug this project, you may encounter the `org.apache.pulsar.shade.org.apache
-.bookkeeper.ledger` error, solution: run `mvn clean install' first.
- -DskipTests` install jar to local repository, then disable `managed-ledger-shaded'.
-module, the project refresh error will disappear.

build.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,15 +13,15 @@
 # limitations under the License.
 #
 
-#!/usr/bin/env bash
-
 set -e
 
-readonly PROJECT_DIR=`cd $(dirname "$0"); pwd`
+readonly PROJECT_DIR=$(
+  cd $(dirname "$0")
+  pwd
+)
 readonly TARGET_DIR=${PROJECT_DIR}/target
 readonly PROFILE=${1}
 
 cd ${PROJECT_DIR}
 
 mvn -B -ntp -q clean license:check install checkstyle:check spotbugs:check -P${PROFILE}
-

get-version.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,10 +13,8 @@
 # limitations under the License.
 #
 
-#!/usr/bin/env bash
-
 mvn -q \
-    -Dexec.executable=echo \
-    -Dexec.args='${project.version}' \
-    --non-recursive \
-    exec:exec
+  -Dexec.executable=echo \
+  -Dexec.args='${project.version}' \
+  --non-recursive \
+  exec:exec