From dbf7b44d0482bee9c358587f712e982a89012245 Mon Sep 17 00:00:00 2001 From: yuxiqian <34335406+yuxiqian@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:48:15 +0800 Subject: [PATCH 1/2] [hotfix] Fix Java 11 target compatibility Signed-off-by: yuxiqian <34335406+yuxiqian@users.noreply.github.com> # Conflicts: # .github/workflows/flink_cdc_java_8.yml # .github/workflows/flink_cdc_migration_test_base.yml # pom.xml --- .github/workflows/flink_cdc_base.yml | 20 +++-- .github/workflows/flink_cdc_java_11.yml | 77 +++++++++++++++++++ .../{flink_cdc.yml => flink_cdc_java_8.yml} | 32 +++----- ....yml => flink_cdc_migration_test_base.yml} | 27 +++++-- .../pom.xml | 1 + .../pom.xml | 11 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../flink-sql-connector-db2-cdc/pom.xml | 2 +- .../flink-sql-connector-mongodb-cdc/pom.xml | 2 +- .../flink-sql-connector-mysql-cdc/pom.xml | 2 +- .../flink-sql-connector-oceanbase-cdc/pom.xml | 2 +- .../flink-sql-connector-oracle-cdc/pom.xml | 2 +- .../flink-sql-connector-postgres-cdc/pom.xml | 2 +- .../flink-sql-connector-sqlserver-cdc/pom.xml | 2 +- .../flink-sql-connector-tidb-cdc/pom.xml | 2 +- .../flink-sql-connector-vitess-cdc/pom.xml | 2 +- flink-cdc-dist/pom.xml | 1 + .../flink-cdc-migration-testcases/pom.xml | 2 - .../flink-cdc-release-3.0.0/pom.xml | 2 +- .../flink-cdc-release-3.0.1/pom.xml | 2 +- .../flink-cdc-release-3.1.0/pom.xml | 2 +- .../flink-cdc-release-3.1.1/pom.xml | 2 +- .../flink-cdc-release-snapshot/pom.xml | 2 +- flink-cdc-migration-tests/pom.xml | 2 - flink-cdc-pipeline-udf-examples/pom.xml | 16 ---- pom.xml | 39 +++++++++- .../datastream/datastream-2.4.2/pom.xml | 35 ++++++++- .../datastream/datastream-3.0.0/pom.xml | 35 ++++++++- .../datastream/datastream-3.0.1/pom.xml | 35 ++++++++- .../datastream/datastream-3.1.0/pom.xml | 35 ++++++++- .../datastream/datastream-3.1.1/pom.xml | 35 ++++++++- .../datastream-3.3-SNAPSHOT/pom.xml | 35 ++++++++- 36 files changed, 371 insertions(+), 105 deletions(-) create mode 100644 .github/workflows/flink_cdc_java_11.yml rename .github/workflows/{flink_cdc.yml => flink_cdc_java_8.yml} (77%) rename .github/workflows/{flink_cdc_migration_test.yml => flink_cdc_migration_test_base.yml} (83%) diff --git a/.github/workflows/flink_cdc_base.yml b/.github/workflows/flink_cdc_base.yml index 707282fa177..c43f26c8196 100644 --- a/.github/workflows/flink_cdc_base.yml +++ b/.github/workflows/flink_cdc_base.yml @@ -19,14 +19,15 @@ on: workflow_call: inputs: java-version: - description: "Jdk version to test against." + description: "Jdk versions to test against." required: false type: string - default: "8" + default: "['8']" flink-version: - description: "Flink version to test against." + description: "Flink versions to test against." required: false type: string + default: "['generic']" module: description: "Flink CDC module to test against." required: true @@ -99,9 +100,12 @@ jobs: compile_and_test: runs-on: ubuntu-latest timeout-minutes: 120 + strategy: + matrix: + java-version: ${{ fromJSON(inputs.java-version) }} + flink-version: ${{ fromJSON(inputs.flink-version) }} steps: - - run: echo "Running CI pipeline for JDK version ${{ inputs.java-version }}" - + - run: echo "Running CI pipeline for JDK version ${{ matrix.java-version }}" - name: Clean up disk space run: | set -euo pipefail @@ -127,7 +131,7 @@ jobs: - name: Set JDK uses: actions/setup-java@v4 with: - java-version: ${{ inputs.java-version }} + java-version: ${{ matrix.java-version }} distribution: 'temurin' cache: 'maven' @@ -200,8 +204,8 @@ jobs: build_maven_parameter="-DspecifiedMongoVersion=7.0.12" fi - if [ ! -z "${{ inputs.flink-version }}" ]; then - build_maven_parameter="${build_maven_parameter:+$build_maven_parameter }-DspecifiedFlinkVersion=${{ inputs.flink-version }}" + if [ ! -z "${{ matrix.flink-version }}" ]; then + build_maven_parameter="${build_maven_parameter:+$build_maven_parameter }-DspecifiedFlinkVersion=${{ matrix.flink-version }}" fi build_maven_parameter="${build_maven_parameter:+$build_maven_parameter }${{ inputs.custom-maven-parameter }}" diff --git a/.github/workflows/flink_cdc_java_11.yml b/.github/workflows/flink_cdc_java_11.yml new file mode 100644 index 00000000000..e23212339a2 --- /dev/null +++ b/.github/workflows/flink_cdc_java_11.yml @@ -0,0 +1,77 @@ +# 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: CI (Java 11, Experimental) +on: + schedule: + - cron: '0 0 * * *' # Deploy every day + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }} + cancel-in-progress: true + +jobs: + license_check: + name: License Check + runs-on: ubuntu-latest + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Ruby environment + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + - name: Set JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + cache: 'maven' + - name: Compiling jar packages + run: mvn --no-snapshot-updates -B package -DskipTests + - name: Run license check + run: gem install rubyzip -v 2.3.0 && ./tools/ci/license_check.rb + ut: + strategy: + matrix: + module: [ 'core', 'pipeline_connectors', 'mysql', 'postgres', 'oracle', 'mongodb6', 'mongodb7', 'sqlserver', 'tidb', 'oceanbase', 'db2', 'vitess' ] + name: Unit Tests + uses: ./.github/workflows/flink_cdc_base.yml + with: + java-version: "[11]" + module: ${{ matrix.module }} + pipeline_e2e: + name: Pipeline E2E Tests + uses: ./.github/workflows/flink_cdc_base.yml + with: + java-version: "[11]" + flink-version: "['1.19.1', '1.20.0']" + module: pipeline_e2e + source_e2e: + name: Source E2E Tests + uses: ./.github/workflows/flink_cdc_base.yml + with: + java-version: "[11]" + flink-version: "['1.19.1', '1.20.0']" + module: source_e2e + migration_test: + name: Migration Tests + uses: ./.github/workflows/flink_cdc_migration_test_base.yml + with: + java-version: "[11]" + flink-version: "['1.19.1', '1.20.0']" \ No newline at end of file diff --git a/.github/workflows/flink_cdc.yml b/.github/workflows/flink_cdc_java_8.yml similarity index 77% rename from .github/workflows/flink_cdc.yml rename to .github/workflows/flink_cdc_java_8.yml index 2ccb59c8638..95ff5d141a9 100644 --- a/.github/workflows/flink_cdc.yml +++ b/.github/workflows/flink_cdc_java_8.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Flink CDC CI +name: CI (Java 8) on: push: branches: @@ -60,37 +60,29 @@ jobs: ut: strategy: matrix: - java-version: [ '8' ] module: [ 'core', 'pipeline_connectors', 'mysql', 'postgres', 'oracle', 'mongodb6', 'mongodb7', 'sqlserver', 'tidb', 'oceanbase', 'db2', 'vitess' ] name: Unit Tests uses: ./.github/workflows/flink_cdc_base.yml with: - java-version: ${{ matrix.java-version }} + java-version: "[8]" module: ${{ matrix.module }} pipeline_e2e: - strategy: - matrix: - java-version: [ '8' ] - flink-version: ['1.19.1', '1.20.0'] - module: [ 'pipeline_e2e' ] name: Pipeline E2E Tests uses: ./.github/workflows/flink_cdc_base.yml with: - java-version: ${{ matrix.java-version }} - flink-version: ${{ matrix.flink-version }} - module: ${{ matrix.module }} + java-version: "[8]" + flink-version: "['1.19.1', '1.20.0']" + module: pipeline_e2e source_e2e: - strategy: - matrix: - java-version: [ '8' ] - flink-version: ['1.19.1', '1.20.0'] - module: [ 'source_e2e' ] name: Source E2E Tests uses: ./.github/workflows/flink_cdc_base.yml with: - java-version: ${{ matrix.java-version }} - flink-version: ${{ matrix.flink-version }} - module: ${{ matrix.module }} + java-version: "[8]" + flink-version: "['1.19.1', '1.20.0']" + module: source_e2e migration_test: name: Migration Tests - uses: ./.github/workflows/flink_cdc_migration_test.yml \ No newline at end of file + uses: ./.github/workflows/flink_cdc_migration_test_base.yml + with: + java-version: "[8]" + flink-version: "['1.19.1', '1.20.0']" \ No newline at end of file diff --git a/.github/workflows/flink_cdc_migration_test.yml b/.github/workflows/flink_cdc_migration_test_base.yml similarity index 83% rename from .github/workflows/flink_cdc_migration_test.yml rename to .github/workflows/flink_cdc_migration_test_base.yml index 5b4e598bcbf..56027df9599 100644 --- a/.github/workflows/flink_cdc_migration_test.yml +++ b/.github/workflows/flink_cdc_migration_test_base.yml @@ -13,14 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Migration Tests +name: Flink CDC Migration Test Base Workflow on: workflow_call: + inputs: + java-version: + description: "Jdk versions to test against, passed as a JSON array string." + required: false + type: string + default: "['8']" + flink-version: + description: "Flink versions to test against, passed as a JSON array string." + required: true + type: string jobs: migration_test_ut: runs-on: ubuntu-latest + strategy: + matrix: + java-version: ${{ fromJSON(inputs.java-version) }} + flink-version: ${{ fromJSON(inputs.flink-version) }} steps: - name: Check out repository code uses: actions/checkout@v4 @@ -28,7 +42,7 @@ jobs: submodules: true - uses: actions/setup-java@v4 with: - java-version: 8 + java-version: ${{ matrix.java-version }} distribution: temurin - name: Compile snapshot CDC version run: mvn --no-snapshot-updates -B install -DskipTests @@ -39,8 +53,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - flink-version: [ '1.19.1', '1.20.0' ] - + java-version: ${{ fromJSON(inputs.java-version) }} + flink-version: ${{ fromJSON(inputs.flink-version) }} steps: - uses: actions/checkout@v4 - name: Set up Ruby @@ -50,7 +64,7 @@ jobs: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - uses: actions/setup-java@v4 with: - java-version: 8 + java-version: ${{ matrix.java-version }} distribution: temurin cache: maven - name: Install dependencies @@ -78,6 +92,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + java-version: ${{ fromJSON(inputs.java-version) }} flink-version: [ '1.19.1', '1.20.0' ] steps: @@ -89,7 +104,7 @@ jobs: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - uses: actions/setup-java@v4 with: - java-version: 8 + java-version: ${{ matrix.java-version }} distribution: temurin cache: maven - name: Install dependencies diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml index 24974cb6ce9..0cee7828ad2 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml @@ -112,6 +112,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml index 79a5d562bfe..9512884f224 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml @@ -222,7 +222,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} package @@ -245,15 +245,6 @@ limitations under the License. - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka/pom.xml index c8d41fe5eba..32249251ce6 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka/pom.xml @@ -81,7 +81,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/pom.xml index 944175e52a0..475f3b62b62 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/pom.xml @@ -144,7 +144,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/pom.xml index 33f6edc8a63..e6b510ce6a8 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/pom.xml @@ -260,7 +260,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml index 5dfd222f071..db198c97367 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml @@ -80,7 +80,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml index c5ff45f3365..3eda26dade8 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml @@ -51,7 +51,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml index 34b5ada07fd..21549971387 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml @@ -46,7 +46,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/pom.xml index a67a0c0071f..8fce8fc24fe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/pom.xml index 47978a503f3..30eaf5287dd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/pom.xml index 9d09582c09d..56ae6d3f6df 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/pom.xml index 6a808de35f4..5fa99edbf40 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/pom.xml index f035903a860..657f59b13c3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/pom.xml index 4c2c0e958a6..349164bb768 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/pom.xml index f4e865f3f3c..a32614e7f1b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/pom.xml index 5ab396be2cc..88b8782f8ad 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/pom.xml @@ -40,7 +40,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink diff --git a/flink-cdc-dist/pom.xml b/flink-cdc-dist/pom.xml index 572302c365c..132bea2cda2 100644 --- a/flink-cdc-dist/pom.xml +++ b/flink-cdc-dist/pom.xml @@ -59,6 +59,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin + ${maven.shade.plugin.version} shade-dist diff --git a/flink-cdc-migration-tests/flink-cdc-migration-testcases/pom.xml b/flink-cdc-migration-tests/flink-cdc-migration-testcases/pom.xml index 12c468a4b47..03cfbd5aecc 100644 --- a/flink-cdc-migration-tests/flink-cdc-migration-testcases/pom.xml +++ b/flink-cdc-migration-tests/flink-cdc-migration-testcases/pom.xml @@ -29,8 +29,6 @@ limitations under the License. flink-cdc-migration-testcases - 8 - 8 UTF-8 diff --git a/flink-cdc-migration-tests/flink-cdc-release-3.0.0/pom.xml b/flink-cdc-migration-tests/flink-cdc-release-3.0.0/pom.xml index 7207e59967c..af8cbeb9426 100644 --- a/flink-cdc-migration-tests/flink-cdc-release-3.0.0/pom.xml +++ b/flink-cdc-migration-tests/flink-cdc-release-3.0.0/pom.xml @@ -51,7 +51,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink-cdc diff --git a/flink-cdc-migration-tests/flink-cdc-release-3.0.1/pom.xml b/flink-cdc-migration-tests/flink-cdc-release-3.0.1/pom.xml index bdb5ecfe949..9d9565084ea 100644 --- a/flink-cdc-migration-tests/flink-cdc-release-3.0.1/pom.xml +++ b/flink-cdc-migration-tests/flink-cdc-release-3.0.1/pom.xml @@ -51,7 +51,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink-cdc diff --git a/flink-cdc-migration-tests/flink-cdc-release-3.1.0/pom.xml b/flink-cdc-migration-tests/flink-cdc-release-3.1.0/pom.xml index 3d6cd439421..c1180d782f7 100644 --- a/flink-cdc-migration-tests/flink-cdc-release-3.1.0/pom.xml +++ b/flink-cdc-migration-tests/flink-cdc-release-3.1.0/pom.xml @@ -51,7 +51,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink-cdc diff --git a/flink-cdc-migration-tests/flink-cdc-release-3.1.1/pom.xml b/flink-cdc-migration-tests/flink-cdc-release-3.1.1/pom.xml index 751b0f9d877..50008917608 100644 --- a/flink-cdc-migration-tests/flink-cdc-release-3.1.1/pom.xml +++ b/flink-cdc-migration-tests/flink-cdc-release-3.1.1/pom.xml @@ -51,7 +51,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink-cdc diff --git a/flink-cdc-migration-tests/flink-cdc-release-snapshot/pom.xml b/flink-cdc-migration-tests/flink-cdc-release-snapshot/pom.xml index 232396ba98f..cbea929f401 100644 --- a/flink-cdc-migration-tests/flink-cdc-release-snapshot/pom.xml +++ b/flink-cdc-migration-tests/flink-cdc-release-snapshot/pom.xml @@ -54,7 +54,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} shade-flink-cdc diff --git a/flink-cdc-migration-tests/pom.xml b/flink-cdc-migration-tests/pom.xml index 3033ef712db..befa87ea092 100644 --- a/flink-cdc-migration-tests/pom.xml +++ b/flink-cdc-migration-tests/pom.xml @@ -39,8 +39,6 @@ limitations under the License. - 8 - 8 UTF-8 diff --git a/flink-cdc-pipeline-udf-examples/pom.xml b/flink-cdc-pipeline-udf-examples/pom.xml index b61a99fd282..9054f1d355b 100644 --- a/flink-cdc-pipeline-udf-examples/pom.xml +++ b/flink-cdc-pipeline-udf-examples/pom.xml @@ -28,8 +28,6 @@ limitations under the License. flink-cdc-pipeline-udf-examples - 8 - 8 UTF-8 4.8.0 UTF-8 @@ -85,20 +83,6 @@ limitations under the License. - - - org.apache.maven.plugins - maven-compiler-plugin - - - compile - - compile - - - - - diff --git a/pom.xml b/pom.xml index fdef5e72aac..a3b6b0c4b84 100644 --- a/pom.xml +++ b/pom.xml @@ -60,10 +60,7 @@ limitations under the License. 3.3-SNAPSHOT - 1.8 2.12 - ${java.version} - ${java.version} UTF-8 1 @@ -97,6 +94,8 @@ limitations under the License. 3.1.10 2.12.16 + + 3.6.0 @@ -453,6 +452,7 @@ limitations under the License. docs/site/** **/*.txt + tools/mig-test/** flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/resources/file/*.json @@ -576,7 +576,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.4.1 + ${maven.shade.plugin.version} shade-flink @@ -677,6 +677,15 @@ limitations under the License. + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + @@ -762,5 +771,27 @@ limitations under the License. + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + diff --git a/tools/mig-test/datastream/datastream-2.4.2/pom.xml b/tools/mig-test/datastream/datastream-2.4.2/pom.xml index fd3fbe0cad8..fc18c668cf7 100644 --- a/tools/mig-test/datastream/datastream-2.4.2/pom.xml +++ b/tools/mig-test/datastream/datastream-2.4.2/pom.xml @@ -32,8 +32,6 @@ limitations under the License. 1.9.7.Final 2.12 2.0.13 - 8 - 8 UTF-8 @@ -129,7 +127,14 @@ limitations under the License. - + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + maven-assembly-plugin @@ -148,4 +153,28 @@ limitations under the License. + + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + + \ No newline at end of file diff --git a/tools/mig-test/datastream/datastream-3.0.0/pom.xml b/tools/mig-test/datastream/datastream-3.0.0/pom.xml index 5d8711a814e..7e9420427ca 100644 --- a/tools/mig-test/datastream/datastream-3.0.0/pom.xml +++ b/tools/mig-test/datastream/datastream-3.0.0/pom.xml @@ -32,8 +32,6 @@ limitations under the License. 1.9.7.Final 2.12 2.0.13 - 8 - 8 UTF-8 @@ -129,7 +127,14 @@ limitations under the License. - + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + maven-assembly-plugin @@ -148,4 +153,28 @@ limitations under the License. + + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + + \ No newline at end of file diff --git a/tools/mig-test/datastream/datastream-3.0.1/pom.xml b/tools/mig-test/datastream/datastream-3.0.1/pom.xml index 4044fd661a2..41f3f67e0ea 100644 --- a/tools/mig-test/datastream/datastream-3.0.1/pom.xml +++ b/tools/mig-test/datastream/datastream-3.0.1/pom.xml @@ -32,8 +32,6 @@ limitations under the License. 1.9.7.Final 2.12 2.0.13 - 8 - 8 UTF-8 @@ -129,7 +127,14 @@ limitations under the License. - + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + maven-assembly-plugin @@ -148,4 +153,28 @@ limitations under the License. + + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + + \ No newline at end of file diff --git a/tools/mig-test/datastream/datastream-3.1.0/pom.xml b/tools/mig-test/datastream/datastream-3.1.0/pom.xml index 6c927b99944..bb8a642d21b 100644 --- a/tools/mig-test/datastream/datastream-3.1.0/pom.xml +++ b/tools/mig-test/datastream/datastream-3.1.0/pom.xml @@ -32,8 +32,6 @@ limitations under the License. 1.9.7.Final 2.12 2.0.13 - 8 - 8 UTF-8 @@ -129,7 +127,14 @@ limitations under the License. - + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + maven-assembly-plugin @@ -148,4 +153,28 @@ limitations under the License. + + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + + \ No newline at end of file diff --git a/tools/mig-test/datastream/datastream-3.1.1/pom.xml b/tools/mig-test/datastream/datastream-3.1.1/pom.xml index d8f6f88d9d1..11a72b77d90 100644 --- a/tools/mig-test/datastream/datastream-3.1.1/pom.xml +++ b/tools/mig-test/datastream/datastream-3.1.1/pom.xml @@ -32,8 +32,6 @@ limitations under the License. 1.9.7.Final 2.12 2.0.13 - 8 - 8 UTF-8 @@ -129,7 +127,14 @@ limitations under the License. - + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + maven-assembly-plugin @@ -148,4 +153,28 @@ limitations under the License. + + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + + \ No newline at end of file diff --git a/tools/mig-test/datastream/datastream-3.3-SNAPSHOT/pom.xml b/tools/mig-test/datastream/datastream-3.3-SNAPSHOT/pom.xml index 17c57d6236a..4774f4fb8a3 100644 --- a/tools/mig-test/datastream/datastream-3.3-SNAPSHOT/pom.xml +++ b/tools/mig-test/datastream/datastream-3.3-SNAPSHOT/pom.xml @@ -32,8 +32,6 @@ limitations under the License. 1.9.7.Final 2.12 2.0.13 - 8 - 8 UTF-8 @@ -129,7 +127,14 @@ limitations under the License. - + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + maven-assembly-plugin @@ -148,4 +153,28 @@ limitations under the License. + + + java-8-target + + [1.8,11) + + + 1.8 + ${java.version} + ${java.version} + + + + java-11-target + + [11,) + + + 11 + ${java.version} + ${java.version} + + + \ No newline at end of file From ebf23bc10d8317a7a05c220c1ecbdb3f0b3b2589 Mon Sep 17 00:00:00 2001 From: yuxiqian <34335406+yuxiqian@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:18:38 +0800 Subject: [PATCH 2/2] fix: clarify GiHub workflow names Signed-off-by: yuxiqian <34335406+yuxiqian@users.noreply.github.com> --- .github/workflows/flink_cdc_java_11.yml | 2 +- .github/workflows/flink_cdc_java_8.yml | 2 +- .github/workflows/flink_cdc_migration_test_base.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flink_cdc_java_11.yml b/.github/workflows/flink_cdc_java_11.yml index e23212339a2..0df6aee8a08 100644 --- a/.github/workflows/flink_cdc_java_11.yml +++ b/.github/workflows/flink_cdc_java_11.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: CI (Java 11, Experimental) +name: Flink CDC CI Nightly on: schedule: - cron: '0 0 * * *' # Deploy every day diff --git a/.github/workflows/flink_cdc_java_8.yml b/.github/workflows/flink_cdc_java_8.yml index 95ff5d141a9..0eb41e2bf34 100644 --- a/.github/workflows/flink_cdc_java_8.yml +++ b/.github/workflows/flink_cdc_java_8.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: CI (Java 8) +name: Flink CDC CI on: push: branches: diff --git a/.github/workflows/flink_cdc_migration_test_base.yml b/.github/workflows/flink_cdc_migration_test_base.yml index 56027df9599..fa8012fd3fa 100644 --- a/.github/workflows/flink_cdc_migration_test_base.yml +++ b/.github/workflows/flink_cdc_migration_test_base.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Flink CDC Migration Test Base Workflow +name: Migration Tests on: workflow_call: