Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/flink_cdc_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
description: "Jdk versions to test against."
required: false
type: string
default: "['8']"
default: "['11']"
flink-versions:
description: "Flink versions to test against."
required: false
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/flink_cdc_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Set JDK
uses: actions/setup-java@v4
with:
java-version: '8'
java-version: '11'
distribution: 'temurin'
cache: 'maven'
- name: Compiling jar packages
Expand All @@ -61,19 +61,19 @@ jobs:
name: Common Unit Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[8]"
java-versions: "[11]"
modules: "['core']"
pipeline-ut:
name: Pipeline Unit Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[8]"
java-versions: "[11]"
modules: "['mysql-pipeline', 'postgres-pipeline', 'oceanbase-pipeline', 'doris', 'elasticsearch', 'iceberg', 'kafka', 'maxcompute', 'paimon', 'starrocks', 'fluss']"
source-ut:
name: Source Unit Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[8]"
java-versions: "[11]"
modules: "['mysql-source', 'postgres-source', 'oracle', 'mongodb7', 'mongodb8', 'sqlserver', 'tidb', 'oceanbase-source', 'db2', 'vitess']"
pipeline_e2e:
strategy:
Expand All @@ -83,14 +83,14 @@ jobs:
name: Pipeline E2E Tests (${{ matrix.parallelism }}-Parallelism)
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[8]"
java-versions: "[11]"
flink-versions: "['1.19.3', '1.20.3']"
modules: "['pipeline_e2e']"
parallelism: ${{ matrix.parallelism }}
source_e2e:
name: Source E2E Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[8]"
java-versions: "[11]"
flink-versions: "['1.19.3', '1.20.3']"
modules: "['source_e2e']"
12 changes: 6 additions & 6 deletions .github/workflows/flink_cdc_ci_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Set JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: 'maven'
- name: Compiling jar packages
Expand All @@ -52,21 +52,21 @@ jobs:
name: Common Unit Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[11]"
java-versions: "[17]"
modules: "['core']"
pipeline-ut:
if: github.repository == 'apache/flink-cdc'
name: Pipeline Unit Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[11]"
java-versions: "[17]"
modules: "['mysql-pipeline', 'postgres-pipeline', 'oceanbase-pipeline', 'doris', 'elasticsearch', 'iceberg', 'kafka', 'maxcompute', 'paimon', 'starrocks', 'fluss']"
source-ut:
if: github.repository == 'apache/flink-cdc'
name: Source Unit Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[11]"
java-versions: "[17]"
modules: "['mysql-source', 'postgres-source', 'oracle', 'mongodb7', 'mongodb8', 'sqlserver', 'tidb', 'oceanbase-source', 'db2', 'vitess']"
pipeline_e2e:
if: github.repository == 'apache/flink-cdc'
Expand All @@ -77,7 +77,7 @@ jobs:
name: Pipeline E2E Tests (${{ matrix.parallelism }}-Parallelism)
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[11]"
java-versions: "[17]"
flink-versions: "['1.19.3', '1.20.3']"
modules: "['pipeline_e2e']"
parallelism: ${{ matrix.parallelism }}
Expand All @@ -86,6 +86,6 @@ jobs:
name: Source E2E Tests
uses: ./.github/workflows/flink_cdc_base.yml
with:
java-versions: "[11]"
java-versions: "[17]"
flink-versions: "['1.19.3', '1.20.3']"
modules: "['source_e2e']"
46 changes: 33 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,14 @@ limitations under the License.
<iceberg.version>1.6.1</iceberg.version>
<hive.version>2.3.9</hive.version>
<hadoop.version>3.3.4</hadoop.version>
<java.version>11</java.version>
<source.java.version>11</source.java.version>
<target.java.version>11</target.java.version>
<!-- Overwrite default values from parent pom.
IntelliJ IDEA is (sometimes?) using those values to choose target language level
and thus is changing back to java 1.6 on each maven re-import -->
<maven.compiler.source>${source.java.version}</maven.compiler.source>
<maven.compiler.target>${target.java.version}</maven.compiler.target>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -674,8 +682,8 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<source>${source.java.version}</source>
<target>${target.java.version}</target>
</configuration>
</plugin>

Expand All @@ -688,6 +696,29 @@ 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>

Expand Down Expand Up @@ -773,17 +804,6 @@ limitations under the License.
</plugins>
</build>
</profile>
<profile>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we're running tests against Java 17 in nightly builds, shall we create a java-17-target profile and activate it with [17,)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

<id>java-8-target</id>
<activation>
<jdk>[1.8,11)</jdk>
</activation>
<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
</profile>
<profile>
<id>java-11-target</id>
<activation>
Expand Down
Loading