Skip to content

Commit 6f13dec

Browse files
velovelo
authored
Merge pull request #21 from DataSQRL/sqrl-flink-lib
Move sqrl-flink-lib sources from sqrl project
2 parents 1e917dc + e3b5384 commit 6f13dec

File tree

154 files changed

+13212
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+13212
-65
lines changed

‎.github/workflows/uber-jar.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ jobs:
3434
- name: Set up Docker Buildx
3535
uses: docker/setup-buildx-action@v2
3636

37+
- name: Set up JDK 11
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '11'
42+
3743
- name: Generate settings.xml
3844
run: |
3945
mkdir -p ~/.m2

‎flink-jar-runner/pom.xml

Lines changed: 58 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@
2222
<parent>
2323
<groupId>com.datasqrl.flink</groupId>
2424
<artifactId>sqrl-flink-parent</artifactId>
25-
<version>1.0.0-SNAPSHOT</version>
25+
<version>0.1-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>flink-jar-runner</artifactId>
2929

3030
<inceptionYear>2024</inceptionYear>
3131

32-
<properties>
33-
<sqrl.version>0.5.10</sqrl.version>
34-
</properties>
35-
3632
<dependencies>
3733
<dependency>
3834
<groupId>org.apache.flink</groupId>
@@ -64,7 +60,6 @@
6460
<dependency>
6561
<groupId>org.slf4j</groupId>
6662
<artifactId>slf4j-api</artifactId>
67-
<version>${slf4j.version}</version>
6863
<scope>provided</scope>
6964
</dependency>
7065
<dependency>
@@ -167,39 +162,39 @@
167162
<version>${flink.version}</version>
168163
</dependency>
169164
<dependency>
170-
<groupId>com.datasqrl</groupId>
165+
<groupId>${project.groupId}</groupId>
171166
<artifactId>sqrl-lib-common</artifactId>
172-
<version>${sqrl.version}</version>
167+
<version>${project.version}</version>
173168
</dependency>
174169
<dependency>
175-
<groupId>com.datasqrl</groupId>
170+
<groupId>${project.groupId}</groupId>
176171
<artifactId>sqrl-json</artifactId>
177-
<version>${sqrl.version}</version>
172+
<version>${project.version}</version>
178173
</dependency>
179174
<dependency>
180-
<groupId>com.datasqrl</groupId>
175+
<groupId>${project.groupId}</groupId>
181176
<artifactId>sqrl-secure</artifactId>
182-
<version>${sqrl.version}</version>
177+
<version>${project.version}</version>
183178
</dependency>
184179
<dependency>
185-
<groupId>com.datasqrl</groupId>
180+
<groupId>${project.groupId}</groupId>
186181
<artifactId>sqrl-time</artifactId>
187-
<version>${sqrl.version}</version>
182+
<version>${project.version}</version>
188183
</dependency>
189184
<dependency>
190-
<groupId>com.datasqrl</groupId>
185+
<groupId>${project.groupId}</groupId>
191186
<artifactId>sqrl-text</artifactId>
192-
<version>${sqrl.version}</version>
187+
<version>${project.version}</version>
193188
</dependency>
194189
<dependency>
195-
<groupId>com.datasqrl</groupId>
190+
<groupId>${project.groupId}</groupId>
196191
<artifactId>sqrl-flexible-json</artifactId>
197-
<version>${sqrl.version}</version>
192+
<version>${project.version}</version>
198193
</dependency>
199194
<dependency>
200-
<groupId>com.datasqrl</groupId>
195+
<groupId>${project.groupId}</groupId>
201196
<artifactId>sqrl-flexible-csv</artifactId>
202-
<version>${sqrl.version}</version>
197+
<version>${project.version}</version>
203198
</dependency>
204199
<dependency>
205200
<groupId>org.apache.flink</groupId>
@@ -232,7 +227,6 @@
232227
<plugin>
233228
<groupId>org.apache.maven.plugins</groupId>
234229
<artifactId>maven-shade-plugin</artifactId>
235-
<version>3.1.1</version>
236230
<executions>
237231
<!-- Run shade goal on package phase -->
238232
<execution>
@@ -321,9 +315,10 @@
321315

322316
<dependencies>
323317
<dependency>
324-
<groupId>com.datasqrl</groupId>
318+
<groupId>${project.groupId}</groupId>
325319
<artifactId>sqrl-jdbc-1.19</artifactId>
326-
<version>${sqrl.version}</version>
320+
<!--FIXME create a new module for 2.0-->
321+
<version>${project.version}</version>
327322
</dependency>
328323
</dependencies>
329324
</profile>
@@ -338,9 +333,10 @@
338333

339334
<dependencies>
340335
<dependency>
341-
<groupId>com.datasqrl</groupId>
336+
<groupId>${project.groupId}</groupId>
342337
<artifactId>sqrl-jdbc-1.19</artifactId>
343-
<version>${sqrl.version}</version>
338+
<!--FIXME create a new module for 1.20-->
339+
<version>${project.version}</version>
344340
</dependency>
345341
</dependencies>
346342
</profile>
@@ -358,9 +354,9 @@
358354

359355
<dependencies>
360356
<dependency>
361-
<groupId>com.datasqrl</groupId>
357+
<groupId>${project.groupId}</groupId>
362358
<artifactId>sqrl-jdbc-1.19</artifactId>
363-
<version>${sqrl.version}</version>
359+
<version>${project.version}</version>
364360
</dependency>
365361
</dependencies>
366362
</profile>
@@ -375,11 +371,43 @@
375371

376372
<dependencies>
377373
<dependency>
378-
<groupId>com.datasqrl</groupId>
374+
<groupId>${project.groupId}</groupId>
379375
<artifactId>sqrl-jdbc-1.18</artifactId>
380-
<version>${sqrl.version}</version>
376+
<version>${project.version}</version>
381377
</dependency>
382378
</dependencies>
383379
</profile>
384-
</profiles>
380+
381+
<profile>
382+
<id>ci</id>
383+
384+
<build>
385+
<plugins>
386+
<plugin>
387+
<groupId>org.codehaus.mojo</groupId>
388+
<artifactId>exec-maven-plugin</artifactId>
389+
<version>3.0.0</version>
390+
<executions>
391+
<execution>
392+
<goals>
393+
<goal>exec</goal>
394+
</goals>
395+
<phase>post-integration-test</phase>
396+
<configuration>
397+
<!-- print logs from docker, helpful when troubleshooting -->
398+
<executable>docker</executable>
399+
<skip>${skipTests}</skip>
400+
<arguments>
401+
<argument>logs</argument>
402+
<argument>flink-jar-runner-jobmanager-1</argument>
403+
</arguments>
404+
</configuration>
405+
</execution>
406+
</executions>
407+
</plugin>
408+
</plugins>
409+
</build>
410+
411+
</profile>
412+
</profiles>
385413
</project>

‎pom.xml

Lines changed: 67 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,25 @@
2121

2222
<groupId>com.datasqrl.flink</groupId>
2323
<artifactId>sqrl-flink-parent</artifactId>
24-
<version>1.0.0-SNAPSHOT</version>
24+
<version>0.1-SNAPSHOT</version>
2525
<packaging>pom</packaging>
2626
<inceptionYear>2024</inceptionYear>
2727

2828
<modules>
2929
<module>flink-jar-runner</module>
30-
<!--
31-
<module>sqrl-lib-common</module>
30+
<module>sqrl-flexible-csv</module>
31+
<module>sqrl-flexible-json</module>
32+
<module>sqrl-h2-1.16</module>
33+
<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>
3237
<module>sqrl-json</module>
38+
<module>sqrl-lib-common</module>
3339
<module>sqrl-secure</module>
34-
<module>sqrl-time</module>
3540
<module>sqrl-text</module>
36-
<module>sqrl-flexible-json</module>
37-
<module>sqrl-flexible-csv</module>
38-
-->
41+
<module>sqrl-time</module>
42+
<module>sqrl-vector</module>
3943
</modules>
4044

4145
<distributionManagement>
@@ -50,6 +54,7 @@
5054

5155
<maven.compiler.source>11</maven.compiler.source>
5256
<maven.compiler.target>11</maven.compiler.target>
57+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5358

5459
<license-maven-plugin.version>4.6</license-maven-plugin.version>
5560
<git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
@@ -60,6 +65,9 @@
6065
<log4j.version>2.17.1</log4j.version>
6166
<feign.version>13.5</feign.version>
6267
<picocli.version>4.7.6</picocli.version>
68+
<flink.version>1.19.2</flink.version>
69+
<postgres.version>42.5.0</postgres.version>
70+
<testcontainers.version>1.18.0</testcontainers.version>
6371
</properties>
6472

6573
<dependencyManagement>
@@ -71,6 +79,26 @@
7179
</dependency>
7280
</dependencies>
7381
</dependencyManagement>
82+
<dependencies>
83+
<dependency>
84+
<groupId>org.projectlombok</groupId>
85+
<artifactId>lombok</artifactId>
86+
<version>1.18.30</version>
87+
<scope>compile</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.junit.jupiter</groupId>
91+
<artifactId>junit-jupiter-engine</artifactId>
92+
<version>5.8.2</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.junit.jupiter</groupId>
97+
<artifactId>junit-jupiter-params</artifactId>
98+
<version>5.8.2</version>
99+
<scope>test</scope>
100+
</dependency>
101+
</dependencies>
74102

75103
<repositories>
76104
<repository>
@@ -214,6 +242,38 @@
214242
</execution>
215243
</executions>
216244
</plugin>
245+
246+
<plugin>
247+
<groupId>io.sundr</groupId>
248+
<artifactId>sundr-maven-plugin</artifactId>
249+
<version>0.200.0</version>
250+
<inherited>false</inherited>
251+
<configuration>
252+
<boms>
253+
<bom>
254+
<artifactId>sqrl-flink-bom</artifactId>
255+
<name>DataSQRL: Flink support</name>
256+
257+
<properties>
258+
<license.skip>true</license.skip>
259+
</properties>
260+
261+
<modules>
262+
<includes>
263+
<include>${project.groupId}:*</include>
264+
</includes>
265+
</modules>
266+
</bom>
267+
</boms>
268+
</configuration>
269+
<executions>
270+
<execution>
271+
<goals>
272+
<goal>generate-bom</goal>
273+
</goals>
274+
</execution>
275+
</executions>
276+
</plugin>
217277
</plugins>
218278
</build>
219279

@@ -280,34 +340,6 @@
280340
<properties>
281341
<gcf.skip>true</gcf.skip>
282342
</properties>
283-
284-
<build>
285-
<plugins>
286-
<plugin>
287-
<groupId>org.codehaus.mojo</groupId>
288-
<artifactId>exec-maven-plugin</artifactId>
289-
<version>3.0.0</version>
290-
<executions>
291-
<execution>
292-
<goals>
293-
<goal>exec</goal>
294-
</goals>
295-
<phase>post-integration-test</phase>
296-
<configuration>
297-
<!-- print logs from cloud-compilation service, helpful when troubleshooting -->
298-
<executable>docker</executable>
299-
<arguments>
300-
<argument>logs</argument>
301-
<argument>flink-jar-runner-jobmanager-1</argument>
302-
</arguments>
303-
</configuration>
304-
</execution>
305-
</executions>
306-
</plugin>
307-
308-
</plugins>
309-
</build>
310-
311343
</profile>
312344
<profile>
313345
<!-- just compile, skip all other checks -->

0 commit comments

Comments
 (0)