Skip to content

Commit 7025642

Browse files
authored
[hotfix] Update flink-connector-parent to 1.1.0, add support Flink 1.20-SNAPSHOT
1 parent ffd2bdf commit 7025642

File tree

3 files changed

+35
-3
lines changed

3 files changed

+35
-3
lines changed

.github/workflows/push_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
compile_and_test:
2626
strategy:
2727
matrix:
28+
flink: [ 1.19-SNAPSHOT, 1.20-SNAPSHOT ]
29+
jdk: [ '8, 11, 17, 21' ]
2830
include:
2931
- flink: 1.18-SNAPSHOT
3032
jdk: '8, 11, 17'
31-
- flink: 1.19-SNAPSHOT
32-
jdk: '8, 11, 17, 21'
3333

3434
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
3535
with:

.github/workflows/weekly.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ jobs:
3434
flink: 1.19-SNAPSHOT,
3535
jdk: '8, 11, 17, 21',
3636
branch: main
37+
}, {
38+
flink: 1.20-SNAPSHOT,
39+
jdk: '8, 11, 17, 21',
40+
branch: main
3741
}, {
3842
flink: 1.18.0,
3943
jdk: '8, 11, 17',

pom.xml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.apache.flink</groupId>
2424
<artifactId>flink-connector-parent</artifactId>
25-
<version>1.0.0</version>
25+
<version>1.1.0</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>
@@ -66,6 +66,7 @@ under the License.
6666
<!-- These 2 properties should be removed together with upgrade of flink-connector-parent to 1.1.x -->
6767
<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config}</flink.surefire.baseArgLine>
6868
<surefire.module.config/>
69+
<spotless.skip>false</spotless.skip>
6970
</properties>
7071

7172
<dependencies>
@@ -426,5 +427,32 @@ under the License.
426427
<artifactId>directory-maven-plugin</artifactId>
427428
</plugin>
428429
</plugins>
430+
431+
<pluginManagement>
432+
<plugins>
433+
<plugin>
434+
<groupId>com.diffplug.spotless</groupId>
435+
<artifactId>spotless-maven-plugin</artifactId>
436+
<configuration>
437+
<skip>${spotless.skip}</skip>
438+
</configuration>
439+
</plugin>
440+
</plugins>
441+
</pluginManagement>
429442
</build>
443+
444+
<profiles>
445+
<profile>
446+
<id>java21</id>
447+
<activation>
448+
<jdk>[21,)</jdk>
449+
</activation>
450+
<properties>
451+
<!-- Current google format does not run on Java 21.
452+
Don't upgrade it in this profile because it formats code differently.
453+
Re-evaluate once support for Java 8 is dropped. -->
454+
<spotless.skip>true</spotless.skip>
455+
</properties>
456+
</profile>
457+
</profiles>
430458
</project>

0 commit comments

Comments
 (0)