Skip to content

Commit 15dbe24

Browse files
velovelo
committed
Add support to flink 2.0
Signed-off-by: Marvin Froeder <marvin@datasqrl.com>
1 parent 4a88e28 commit 15dbe24

18 files changed

+1357
-37
lines changed

‎.github/workflows/delete-pr-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
FLINK_PROFILE: [flink-1.19, flink-1.20]
13+
FLINK_PROFILE: [flink-1.19, flink-1.20, flink-2.0]
1414

1515
steps:
1616
- name: Delete GHCR image via GitHub REST API

‎.github/workflows/uber-jar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
FLINK_PROFILE: [flink-1.19, flink-1.20]
23+
FLINK_PROFILE: [flink-1.19, flink-1.20, flink-2.0]
2424

2525
env:
2626
VERSION: ${{ github.event_name == 'release' && github.event.action == 'created' && github.ref_name || 'snapshot' }}

‎flink-jar-runner/pom.xml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@
150150
<artifactId>flink-connector-kafka</artifactId>
151151
<version>${kafka.version}</version>
152152
</dependency>
153-
<dependency>
154-
<groupId>org.apache.flink</groupId>
155-
<artifactId>flink-connector-jdbc</artifactId>
156-
<version>${jdbc.version}</version>
157-
</dependency>
158153
<dependency>
159154
<groupId>org.apache.flink</groupId>
160155
<artifactId>flink-avro-confluent-registry</artifactId>
@@ -320,30 +315,18 @@
320315
<profiles>
321316
<profile>
322317
<id>flink-2.0</id>
323-
<properties>
324-
<flink.version>2.0-preview1</flink.version>
325-
<jdbc.version>3.2.0-1.19</jdbc.version>
326-
<kafka.version>3.2.0-1.19</kafka.version>
327-
<flink-base-image>2.0-preview1-scala_2.12-java17</flink-base-image>
328-
</properties>
329318

330319
<dependencies>
331320
<dependency>
332321
<groupId>${project.groupId}</groupId>
333-
<artifactId>sqrl-jdbc-1.19</artifactId>
322+
<artifactId>sqrl-jdbc-2.0</artifactId>
334323
<!--FIXME create a new module for 2.0-->
335324
<version>${project.version}</version>
336325
</dependency>
337326
</dependencies>
338327
</profile>
339328
<profile>
340329
<id>flink-1.20</id>
341-
<properties>
342-
<flink.version>1.20.1</flink.version>
343-
<jdbc.version>3.2.0-1.19</jdbc.version>
344-
<kafka.version>3.2.0-1.19</kafka.version>
345-
<flink-base-image>1.20.0-scala_2.12-java17</flink-base-image>
346-
</properties>
347330

348331
<dependencies>
349332
<dependency>
@@ -359,12 +342,6 @@
359342
<activation>
360343
<activeByDefault>true</activeByDefault>
361344
</activation>
362-
<properties>
363-
<flink.version>1.19.2</flink.version>
364-
<jdbc.version>3.2.0-1.19</jdbc.version>
365-
<kafka.version>3.2.0-1.19</kafka.version>
366-
<flink-base-image>1.19.2-scala_2.12-java11</flink-base-image>
367-
</properties>
368345

369346
<dependencies>
370347
<dependency>
@@ -376,12 +353,6 @@
376353
</profile>
377354
<profile>
378355
<id>flink-1.18</id>
379-
<properties>
380-
<flink.version>1.18.1</flink.version>
381-
<jdbc.version>3.2.0-1.18</jdbc.version>
382-
<kafka.version>3.2.0-1.18</kafka.version>
383-
<flink-base-image>1.18.1-scala_2.12-java11</flink-base-image>
384-
</properties>
385356

386357
<dependencies>
387358
<dependency>

‎pom.xml

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
<module>sqrl-flexible-json</module>
3232
<module>sqrl-h2-1.16</module>
3333
<module>sqrl-jdbc-1.16</module>
34-
<module>sqrl-jdbc-1.17</module>
35-
<module>sqrl-jdbc-1.18</module>
36-
<module>sqrl-jdbc-1.19</module>
3734
<module>sqrl-json</module>
3835
<module>sqrl-lib-common</module>
3936
<module>sqrl-secure</module>
@@ -65,7 +62,6 @@
6562
<log4j.version>2.24.3</log4j.version>
6663
<feign.version>13.5</feign.version>
6764
<picocli.version>4.7.6</picocli.version>
68-
<flink.version>1.19.2</flink.version>
6965
<postgres.version>42.7.5</postgres.version>
7066
<testcontainers.version>1.20.6</testcontainers.version>
7167
</properties>
@@ -409,5 +405,60 @@
409405
<directory>${project.basedir}/m2e-target</directory>
410406
</build>
411407
</profile>
408+
<profile>
409+
<id>flink-2.0</id>
410+
411+
<modules>
412+
<module>sqrl-jdbc-2.0</module>
413+
</modules>
414+
<properties>
415+
<flink.version>2.0.0</flink.version>
416+
<jdbc.version>3.2.0-1.19</jdbc.version>
417+
<kafka.version>3.2.0-1.19</kafka.version>
418+
<flink-base-image>2.0.0-scala_2.12-java17</flink-base-image>
419+
</properties>
420+
</profile>
421+
<profile>
422+
<id>flink-1.20</id>
423+
424+
<modules>
425+
<module>sqrl-jdbc-1.19</module>
426+
</modules>
427+
<properties>
428+
<flink.version>1.20.1</flink.version>
429+
<jdbc.version>3.2.0-1.19</jdbc.version>
430+
<kafka.version>3.2.0-1.19</kafka.version>
431+
<flink-base-image>1.20.0-scala_2.12-java17</flink-base-image>
432+
</properties>
433+
</profile>
434+
<profile>
435+
<id>flink-1.19</id>
436+
<activation>
437+
<activeByDefault>true</activeByDefault>
438+
</activation>
439+
440+
<modules>
441+
<module>sqrl-jdbc-1.19</module>
442+
</modules>
443+
<properties>
444+
<flink.version>1.19.2</flink.version>
445+
<jdbc.version>3.2.0-1.19</jdbc.version>
446+
<kafka.version>3.2.0-1.19</kafka.version>
447+
<flink-base-image>1.19.2-scala_2.12-java11</flink-base-image>
448+
</properties>
449+
</profile>
450+
<profile>
451+
<id>flink-1.18</id>
452+
453+
<modules>
454+
<module>sqrl-jdbc-1.18</module>
455+
</modules>
456+
<properties>
457+
<flink.version>1.18.1</flink.version>
458+
<jdbc.version>3.2.0-1.18</jdbc.version>
459+
<kafka.version>3.2.0-1.18</kafka.version>
460+
<flink-base-image>1.18.1-scala_2.12-java11</flink-base-image>
461+
</properties>
462+
</profile>
412463
</profiles>
413464
</project>

‎sqrl-jdbc-1.19/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<groupId>org.apache.flink</groupId>
6363
<artifactId>flink-connector-jdbc</artifactId>
6464
<version>3.2.0-1.19</version>
65-
<scope>provided</scope>
6665
</dependency>
6766
<dependency>
6867
<groupId>org.postgresql</groupId>

‎sqrl-jdbc-2.0/pom.xml

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright © 2024 DataSQRL (contact@datasqrl.com)
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>com.datasqrl.flink</groupId>
24+
<artifactId>sqrl-flink-parent</artifactId>
25+
<version>0.1-SNAPSHOT</version>
26+
</parent>
27+
28+
<artifactId>sqrl-jdbc-2.0</artifactId>
29+
<description>Jdbc sink for flink 2.0</description>
30+
31+
<url>https://www.datasqrl.com/</url>
32+
<licenses>
33+
<license>
34+
<name>The Apache Software License, Version 2.0</name>
35+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
36+
<distribution>repo</distribution>
37+
</license>
38+
</licenses>
39+
<developers>
40+
<developer>
41+
<name>Daniel Henneberger</name>
42+
<email>daniel@datasqrl.com</email>
43+
<url>https://github.com/henneberger</url>
44+
</developer>
45+
</developers>
46+
<scm>
47+
<connection>scm:git:https://github.com/DataSQRL/sqrl.git</connection>
48+
<developerConnection>scm:git:https://github.com/DataSQRL/sqrl.git</developerConnection>
49+
<tag>HEAD</tag>
50+
<url>https://github.com/DataSQRL/sqrl</url>
51+
</scm>
52+
53+
<properties>
54+
<maven.compiler.source>11</maven.compiler.source>
55+
<maven.compiler.target>11</maven.compiler.target>
56+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
57+
<flink.version>2.0.0</flink.version>
58+
</properties>
59+
60+
<dependencies>
61+
<dependency>
62+
<groupId>org.apache.flink</groupId>
63+
<artifactId>flink-connector-jdbc-core</artifactId>
64+
<version>3.3-SNAPSHOT</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.apache.flink</groupId>
68+
<artifactId>flink-connector-jdbc-postgres</artifactId>
69+
<version>3.3-SNAPSHOT</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.postgresql</groupId>
73+
<artifactId>postgresql</artifactId>
74+
<version>${postgres.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.testcontainers</groupId>
78+
<artifactId>postgresql</artifactId>
79+
<version>${testcontainers.version}</version>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.apache.flink</groupId>
84+
<artifactId>flink-table-runtime</artifactId>
85+
<version>${flink.version}</version>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.flink</groupId>
90+
<artifactId>flink-table-common</artifactId>
91+
<version>${flink.version}</version>
92+
<scope>provided</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>${project.groupId}</groupId>
96+
<artifactId>sqrl-lib-common</artifactId>
97+
<version>${project.version}</version>
98+
</dependency>
99+
<dependency>
100+
<groupId>${project.groupId}</groupId>
101+
<artifactId>sqrl-flexible-json</artifactId>
102+
<version>${project.version}</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.apache.flink</groupId>
106+
<artifactId>flink-csv</artifactId>
107+
<version>${flink.version}</version>
108+
<scope>provided</scope>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.apache.flink</groupId>
112+
<artifactId>flink-json</artifactId>
113+
<version>${flink.version}</version>
114+
<scope>provided</scope>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.apache.flink</groupId>
118+
<artifactId>flink-table-planner_2.12</artifactId>
119+
<version>${flink.version}</version>
120+
<scope>test</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.apache.flink</groupId>
124+
<artifactId>flink-test-utils</artifactId>
125+
<version>${flink.version}</version>
126+
<scope>test</scope>
127+
</dependency>
128+
</dependencies>
129+
130+
</project>

0 commit comments

Comments
 (0)