This is an automated email from the ASF dual-hosted git repository.
yuxiqian pushed a commit to branch release-3.7
in repository https://gitbox.apache.org/repos/asf/flink-cdc.git
The following commit(s) were added to refs/heads/release-3.7 by this push:
new b93b6b57f [BP-3.7][hotfix][ci] Pin all runner images at Ubuntu 24.04
(#4594) (#4596)
b93b6b57f is described below
commit b93b6b57f082de819a47cd9b81d33409c0bcce37
Author: yuxiqian <[email protected]>
AuthorDate: Fri Oct 23 22:52:17 2026 +0800
[BP-3.7][hotfix][ci] Pin all runner images at Ubuntu 24.04 (#4594) (#4596)
* [hotfix][ci] Pin all runner images at Ubuntu 24.04 (#4594)
(cherry picked from commit c430d391d0a301b814e46e852d3381215fed363f)
* [hotfix][build] Remove duplicate Maven declarations
Backport the Maven declaration cleanup from
25e98629835360465b6cab220ef4d86c008af9f5 (#4571) for Maven 3.10 compatibility.
* Update MySqlOnLineSchemaMigrationITCase.java
* Update MySqlOscITCase.java
* Update MySqlOnLineSchemaMigrationSourceITCase.java
* Update MySqlOnLineSchemaMigrationTableITCase.java
---
.github/workflows/approve_label.yml | 2 +-
.github/workflows/approve_label_trigger.yml | 2 +-
.github/workflows/build_docs.yml | 4 +--
.github/workflows/close_stale.yml | 2 +-
.github/workflows/flink_cdc_ci.yml | 2 +-
.github/workflows/flink_cdc_ci_nightly.yml | 2 +-
.github/workflows/label.yml | 2 +-
.github/workflows/label_trigger.yml | 2 +-
.../source/MySqlOnLineSchemaMigrationITCase.java | 2 +-
.../connectors/mysql/source/MySqlOscITCase.java | 2 +-
.../MySqlOnLineSchemaMigrationSourceITCase.java | 2 +-
.../MySqlOnLineSchemaMigrationTableITCase.java | 2 +-
.../flink-connector-postgres-cdc/pom.xml | 8 -----
pom.xml | 40 +++++++++-------------
14 files changed, 30 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/approve_label.yml
b/.github/workflows/approve_label.yml
index 2f58d5f25..d238cff4e 100644
--- a/.github/workflows/approve_label.yml
+++ b/.github/workflows/approve_label.yml
@@ -29,7 +29,7 @@ permissions:
jobs:
label-when-approved:
name: "Label when approved"
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
outputs:
isApprovedByCommiters: ${{
steps.label-when-approved-by-commiters.outputs.isApproved }}
isApprovedByAnyone: ${{
steps.label-when-approved-by-anyone.outputs.isApproved }}
diff --git a/.github/workflows/approve_label_trigger.yml
b/.github/workflows/approve_label_trigger.yml
index 9597bc4cd..8d734990f 100644
--- a/.github/workflows/approve_label_trigger.yml
+++ b/.github/workflows/approve_label_trigger.yml
@@ -22,7 +22,7 @@ jobs:
label-when-reviewed:
name: "Label PRs when reviewed"
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- name: "Do nothing. Only trigger corresponding workflow_run event"
run: echo
\ No newline at end of file
diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
index 350b6922a..a7fae9dc5 100644
--- a/.github/workflows/build_docs.yml
+++ b/.github/workflows/build_docs.yml
@@ -35,7 +35,7 @@ concurrency:
jobs:
check-doc:
if: github.repository == 'apache/flink-cdc'
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v6
- name: Build doc
@@ -45,7 +45,7 @@ jobs:
build-documentation:
if: github.event_name != 'pull_request' && github.repository ==
'apache/flink-cdc'
name: "Check and build doc"
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
strategy:
fail-fast: false
max-parallel: 1
diff --git a/.github/workflows/close_stale.yml
b/.github/workflows/close_stale.yml
index af89eec50..a5379ff76 100644
--- a/.github/workflows/close_stale.yml
+++ b/.github/workflows/close_stale.yml
@@ -25,7 +25,7 @@ permissions:
issues: write
jobs:
stale:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- uses: actions/stale@v10
with:
diff --git a/.github/workflows/flink_cdc_ci.yml
b/.github/workflows/flink_cdc_ci.yml
index 97a682c08..f5cb561d5 100644
--- a/.github/workflows/flink_cdc_ci.yml
+++ b/.github/workflows/flink_cdc_ci.yml
@@ -37,7 +37,7 @@ concurrency:
jobs:
license_check:
name: License Check
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v6
diff --git a/.github/workflows/flink_cdc_ci_nightly.yml
b/.github/workflows/flink_cdc_ci_nightly.yml
index 22f1ff502..f78d91713 100644
--- a/.github/workflows/flink_cdc_ci_nightly.yml
+++ b/.github/workflows/flink_cdc_ci_nightly.yml
@@ -27,7 +27,7 @@ jobs:
license_check:
if: github.repository == 'apache/flink-cdc'
name: License Check
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v6
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index d53a389a6..ca1754b58 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -34,7 +34,7 @@ permissions:
jobs:
label:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v6
diff --git a/.github/workflows/label_trigger.yml
b/.github/workflows/label_trigger.yml
index fb6a8822e..8bfa26a06 100644
--- a/.github/workflows/label_trigger.yml
+++ b/.github/workflows/label_trigger.yml
@@ -22,7 +22,7 @@ on:
jobs:
label:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
steps:
- name: "Do nothing. Just triggers corresponding workflow."
run: echo
\ No newline at end of file
diff --git
a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationITCase.java
b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationITCase.java
index 9b1cd77cc..862a9f735 100644
---
a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationITCase.java
+++
b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationITCase.java
@@ -82,7 +82,7 @@ class MySqlOnLineSchemaMigrationITCase extends
MySqlSourceTestBase {
private static final MySqlContainer MYSQL8_CONTAINER =
createMySqlContainer(MySqlVersion.V8_0,
"docker/server-gtids/expire-seconds/my.cnf");
- private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1";
+ private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1-4";
protected static final GenericContainer<?> PERCONA_TOOLKIT_CONTAINER =
createPerconaToolkitContainer();
diff --git
a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOscITCase.java
b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOscITCase.java
index ccf86e4d5..152e2713d 100644
---
a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOscITCase.java
+++
b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOscITCase.java
@@ -64,7 +64,7 @@ import static
org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtil
class MySqlOscITCase extends MySqlSourceTestBase {
private static final MySqlContainer MYSQL8_CONTAINER =
createMySqlContainer(MySqlVersion.V8_0);
- private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1";
+ private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1-4";
protected static final GenericContainer<?> PERCONA_TOOLKIT_CONTAINER =
createPerconaToolkitContainer();
diff --git
a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationSourceITCase.java
b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationSourceITCase.java
index 145bf4c0e..be11dfcb9 100644
---
a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationSourceITCase.java
+++
b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlOnLineSchemaMigrationSourceITCase.java
@@ -77,7 +77,7 @@ class MySqlOnLineSchemaMigrationSourceITCase extends
MySqlSourceTestBase {
private static final String TEST_USER = "mysqluser";
private static final String TEST_PASSWORD = "mysqlpw";
- private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1";
+ private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1-4";
protected static final GenericContainer<?> PERCONA_TOOLKIT_CONTAINER =
createPerconaToolkitContainer();
diff --git
a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlOnLineSchemaMigrationTableITCase.java
b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlOnLineSchemaMigrationTableITCase.java
index 752b54f24..4b31181b0 100644
---
a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlOnLineSchemaMigrationTableITCase.java
+++
b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlOnLineSchemaMigrationTableITCase.java
@@ -78,7 +78,7 @@ class MySqlOnLineSchemaMigrationTableITCase extends
MySqlSourceTestBase {
private static final String TEST_USER = "mysqluser";
private static final String TEST_PASSWORD = "mysqlpw";
- private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1";
+ private static final String PERCONA_TOOLKIT =
"perconalab/percona-toolkit:3.7.1-4";
protected static final GenericContainer<?> PERCONA_TOOLKIT_CONTAINER =
createPerconaToolkitContainer();
diff --git
a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/pom.xml
b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/pom.xml
index ec73c783a..7a0cd2714 100644
---
a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/pom.xml
+++
b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/pom.xml
@@ -184,14 +184,6 @@ limitations under the License.
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-test-util</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
-
<!-- tests will have log4j as the default logging framework available
-->
</dependencies>
diff --git a/pom.xml b/pom.xml
index 2745728b5..c3ecb2eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -661,6 +661,23 @@ limitations under the License.
</rules>
</configuration>
</execution>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <!-- enforce at least mvn version 3.1.1
(see FLINK-12447) -->
+ <version>[3.1.1,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>${source.java.version}</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -722,29 +739,6 @@ limitations under the License.
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <!-- enforce at least mvn version 3.1.1
(see FLINK-12447) -->
- <version>[3.1.1,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>${source.java.version}</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
