[Feature] Support flink 2.x version

.github/workflows/build-connector.yml

@@ -41,41 +41,78 @@ jobs:
     - name: Build flink connector 1.15
       run: |
         cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink1 -am \
+          -Pflink1 \
           -Dflink.version=1.15.0 \
-          -Dflink.minor.version=1.15 \
+          -Dflink.major.version=1.15 \
           -Dflink.python.id=flink-python_2.12
 
     - name: Build flink connector 1.16
       run: |
         cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink1 -am \
+          -Pflink1 \
           -Dflink.version=1.16.0 \
-          -Dflink.minor.version=1.16 \
-          -Dflink.python.id=flink-python
+          -Dflink.major.version=1.16
 
     - name: Build flink connector 1.17
       run: |
         cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink1 -am \
+          -Pflink1 \
           -Dflink.version=1.17.0 \
-          -Dflink.minor.version=1.17 \
-          -Dflink.python.id=flink-python
+          -Dflink.major.version=1.17
 
     - name: Build flink connector 1.18
       run: |
         cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink1 -am \
+          -Pflink1 \
           -Dflink.version=1.18.0 \
-          -Dflink.minor.version=1.18 \
-          -Dflink.python.id=flink-python
+          -Dflink.major.version=1.18
 
     - name: Build flink connector 1.19
       run: |
         cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink1 -am \
+          -Pflink1 \
           -Dflink.version=1.19.0 \
-          -Dflink.minor.version=1.19 \
-          -Dflink.python.id=flink-python
+          -Dflink.major.version=1.19
 
     - name: Build flink connector 1.20
       run: |
         cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink1 -am \
+          -Pflink1 \
           -Dflink.version=1.20.0 \
-          -Dflink.minor.version=1.20 \
-          -Dflink.python.id=flink-python
+          -Dflink.major.version=1.20
+
+    - name: Setup java
+      uses: actions/setup-java@v2
+      with:
+        distribution: adopt
+        java-version: '17'
+
+    - name: Build flink connector 2.0
+      run: |
+        cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink2 -am \
+          -Pflink2 \
+          -Dflink.version=2.0.0 \
+          -Dflink.major.version=2.0
+
+    - name: Build flink connector 2.1
+      run: |
+        cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink2 -am \
+          -Pflink2 \
+          -Dflink.version=2.1.0 \
+          -Dflink.major.version=2.1
+
+    - name: Build flink connector 2.2
+      run: |
+        cd flink-doris-connector && mvn clean package \
+          -pl flink-doris-connector-flink2 -am \
+          -Pflink2 \
+          -Dflink.version=2.2.0 \
+          -Dflink.major.version=2.2

.github/workflows/checkstyle.yaml

@@ -32,12 +32,22 @@ jobs:
           persist-credentials: false
           submodules: recursive
 
-      - name: Setup java
+      - name: Setup java 8
         uses: actions/setup-java@v2
         with:
           distribution: adopt
           java-version: '8'
 
       - name: Run java checkstyle
         run:
-          cd flink-doris-connector && mvn clean compile checkstyle:checkstyle
+          cd flink-doris-connector && mvn clean checkstyle:check -Pflink1 -pl flink-doris-connector-flink1 -am
+
+      - name: Setup java 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: '17'
+
+      - name: Run java checkstyle
+        run:
+          cd flink-doris-connector && mvn clean checkstyle:check -Pflink2 -pl flink-doris-connector-flink2 -am

.github/workflows/run-e2ecase.yml → .github/workflows/run-e2ecase-flink1.yml

@@ -16,7 +16,7 @@
 # under the License.
 #
 ---
-name: Run E2ECases
+name: Run E2ECases Flink1.x
 on:
   pull_request:
   push:
@@ -38,7 +38,10 @@ jobs:
         distribution: adopt
         java-version: '8'
 
-    - name: Run E2ECases
+    - name: Run E2ECases (Flink1 module)
       run: |
-        cd flink-doris-connector && mvn test -Dtest="*E2ECase" -Dimage="apache/doris:doris-all-in-one-2.1.0"
-
+        cd flink-doris-connector && mvn test \
+          -Pflink1 -pl flink-doris-connector-it -am \
+          -DfailIfNoTests=false \
+          -Dtest="*E2ECase" \
+          -Dimage="apache/doris:doris-all-in-one-2.1.0"

.github/workflows/run-e2ecase-flink2.yml

@@ -0,0 +1,47 @@
+# 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.
+#
+---
+name: Run E2ECases Flink2.x
+on:
+  pull_request:
+  push:
+
+jobs:
+  build-extension:
+    name: "Run E2ECases"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+
+    - name: Setup java
+      uses: actions/setup-java@v2
+      with:
+        distribution: adopt
+        java-version: '17'
+
+    - name: Run E2ECases (Flink2 module)
+      run: |
+        cd flink-doris-connector && mvn test \
+          -Pflink2 -pl flink-doris-connector-it -am \
+          -DfailIfNoTests=false \
+          -Dtest="*E2ECase" \
+          -Dimage="apache/doris:doris-all-in-one-2.1.0"

.github/workflows/run-itcase.yml → .github/workflows/run-itcase-flink1.yml

@@ -16,7 +16,7 @@
 # under the License.
 #
 ---
-name: Run ITCases
+name: Run ITCases Flink1.x
 on:
   pull_request:
   push:
@@ -38,7 +38,10 @@ jobs:
         distribution: adopt
         java-version: '8'
 
-    - name: Run ITCases
+    - name: Run ITCases (Flink1 module)
       run: |
-        cd flink-doris-connector && mvn test -Dtest="*ITCase" -Dimage="apache/doris:doris-all-in-one-2.1.0"
-
+        cd flink-doris-connector && mvn test \
+        -Pflink1 -pl flink-doris-connector-it -am \
+        -DfailIfNoTests=false \
+        -Dtest="*ITCase" \
+        -Dimage="apache/doris:doris-all-in-one-2.1.0"

.github/workflows/run-itcase-flink2.yml

@@ -0,0 +1,48 @@
+# 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.
+#
+---
+name: Run ITCases Flink2.x
+on:
+  pull_request:
+  push:
+
+jobs:
+  build-extension:
+    name: "Run ITCases"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+
+    - name: Setup java
+      uses: actions/setup-java@v2
+      with:
+        distribution: adopt
+        java-version: '17'
+
+    - name: Run ITCases (Flink2 module)
+      run: |
+        cd flink-doris-connector && mvn test \
+        -Pflink2 -pl flink-doris-connector-it -am \
+        -DfailIfNoTests=false \
+        -Dtest="*ITCase" \
+        -Dimage="apache/doris:doris-all-in-one-2.1.0"
+

.licenserc.yaml

@@ -12,6 +12,6 @@ header:
     - '.github/PULL_REQUEST_TEMPLATE.md'
     - '.licenserc.yaml'
     - 'custom_env.sh.tpl'
-    - 'flink-doris-connector/src/test/resources/container/'
+    - 'flink-doris-connector/flink-doris-connector-base/src/test/resources/container/'
 
   comment: on-failure

README.md

@@ -24,7 +24,19 @@ under the License.
 
 ## Flink Doris Connector
 
-Flink Doris Connector now support flink version from 1.11 to 1.20.
+Flink Doris Connector supports the following Flink versions:
+
+| Flink Version | JDK Requirement |
+|:--------------|:----------------|
+| 1.15.x        | JDK 8           |
+| 1.16.x        | JDK 8           |
+| 1.17.x        | JDK 8           |
+| 1.18.x        | JDK 8           |
+| 1.19.x        | JDK 8           |
+| 1.20.x        | JDK 8           |
+| 2.0.x         | JDK 17          |
+| 2.1.x         | JDK 17          |
+| 2.2.x         | JDK 17          |
 
 If you wish to contribute or use a connector from flink 1.13 (and earlier), please use the [branch-for-flink-before-1.13](https://github.com/apache/doris-flink-connector/tree/branch-for-flink-before-1.13)
 
@@ -37,6 +49,9 @@ More information about compilation and usage, please visit [Flink Doris Connecto
 ## How to Build
 
 You need to copy customer_env.sh.tpl to customer_env.sh before build and you need to configure it before build.
+
+> **JDK requirement:** Use JDK 8 for Flink 1.x, and JDK 17 for Flink 2.x.
+
 ```shell
 git clone git@github.com:apache/doris-flink-connector.git
 cd doris-flink-connector/flink-doris-connector