Skip to content

Commit 69db0b5

Browse files
niladremniladrem
authored
Merge pull request #1 from getindata/flink_1.15
Flink upgrade to 1.15
2 parents 4d78586 + d98af95 commit 69db0b5

File tree

3 files changed

+49
-49
lines changed

3 files changed

+49
-49
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Connector supports only STRING types.
99
## Prerequisites
1010
* Java 11
1111
* Maven 3
12-
* Flink 14+
12+
* Flink 1.15+
1313

1414
## Implementation
1515
Implementation is based on Flink's `TableFunction` and `AsyncTableFunction` classes.
@@ -82,7 +82,7 @@ It will start HTTP server listening on `http://localhost:8080/client`
8282

8383
Steps to follow:
8484
- Run Mock HTTP server from `HttpStubApp::main` method.
85-
- Start your Flink cluster, for example as described under https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/try-flink/local_installation/
85+
- Start your Flink cluster, for example as described under https://nightlies.apache.org/flink/flink-docs-release-1.15/docs/try-flink/local_installation/
8686
- Start Flink SQL Client [4] by calling: `./bin/sql-client.sh -j flink-http-connector-1.0-SNAPSHOT.jar`
8787
- Execute SQL statements:
8888
Create Data Stream source Table:
@@ -132,9 +132,9 @@ The `msg` column shows parameters used with REST call for given JOIN record.
132132
- Check other `//TODO`'s.
133133

134134
###
135-
[1] https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/dev/table/sql/queries/joins/#lookup-join
135+
[1] https://nightlies.apache.org/flink/flink-docs-release-1.15/docs/dev/table/sql/queries/joins/#lookup-join
136136
</br>
137-
[2] https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/dev/datastream/sources/
137+
[2] https://nightlies.apache.org/flink/flink-docs-release-1.15/docs/dev/datastream/sources/
138138
</br>
139139
[3] https://support.smartbear.com/alertsite/docs/monitors/api/endpoint/jsonpath.html
140140
</br>

‎dependency-reduced-pom.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<dependency>
176176
<groupId>org.apache.flink</groupId>
177177
<artifactId>flink-java</artifactId>
178-
<version>1.14.0</version>
178+
<version>1.15.0</version>
179179
<scope>provided</scope>
180180
<exclusions>
181181
<exclusion>
@@ -190,6 +190,10 @@
190190
<artifactId>commons-math3</artifactId>
191191
<groupId>org.apache.commons</groupId>
192192
</exclusion>
193+
<exclusion>
194+
<artifactId>chill-java</artifactId>
195+
<groupId>com.twitter</groupId>
196+
</exclusion>
193197
<exclusion>
194198
<artifactId>jsr305</artifactId>
195199
<groupId>com.google.code.findbugs</groupId>
@@ -202,8 +206,8 @@
202206
</dependency>
203207
<dependency>
204208
<groupId>org.apache.flink</groupId>
205-
<artifactId>flink-clients_2.11</artifactId>
206-
<version>1.14.0</version>
209+
<artifactId>flink-clients</artifactId>
210+
<version>1.15.0</version>
207211
<scope>provided</scope>
208212
<exclusions>
209213
<exclusion>
@@ -248,14 +252,18 @@
248252
</dependency>
249253
<dependency>
250254
<groupId>org.apache.flink</groupId>
251-
<artifactId>flink-table-api-java-bridge_2.11</artifactId>
252-
<version>1.14.0</version>
255+
<artifactId>flink-table-api-java-bridge</artifactId>
256+
<version>1.15.0</version>
253257
<scope>provided</scope>
254258
<exclusions>
255259
<exclusion>
256260
<artifactId>flink-table-api-java</artifactId>
257261
<groupId>org.apache.flink</groupId>
258262
</exclusion>
263+
<exclusion>
264+
<artifactId>flink-table-api-bridge-base</artifactId>
265+
<groupId>org.apache.flink</groupId>
266+
</exclusion>
259267
<exclusion>
260268
<artifactId>jsr305</artifactId>
261269
<groupId>com.google.code.findbugs</groupId>
@@ -275,17 +283,17 @@
275283
<dependency>
276284
<groupId>org.apache.flink</groupId>
277285
<artifactId>flink-table-common</artifactId>
278-
<version>1.14.0</version>
286+
<version>1.15.0</version>
279287
<type>test-jar</type>
280288
<scope>test</scope>
281289
<exclusions>
282290
<exclusion>
283-
<artifactId>flink-connector-files</artifactId>
291+
<artifactId>flink-shaded-asm-9</artifactId>
284292
<groupId>org.apache.flink</groupId>
285293
</exclusion>
286294
<exclusion>
287-
<artifactId>flink-shaded-asm-7</artifactId>
288-
<groupId>org.apache.flink</groupId>
295+
<artifactId>icu4j</artifactId>
296+
<groupId>com.ibm.icu</groupId>
289297
</exclusion>
290298
<exclusion>
291299
<artifactId>flink-core</artifactId>
@@ -303,28 +311,24 @@
303311
</dependency>
304312
<dependency>
305313
<groupId>org.apache.flink</groupId>
306-
<artifactId>flink-table-planner_2.11</artifactId>
307-
<version>1.14.0</version>
314+
<artifactId>flink-table-planner_2.12</artifactId>
315+
<version>1.15.0</version>
308316
<scope>test</scope>
309317
<exclusions>
310318
<exclusion>
311-
<artifactId>flink-table-common</artifactId>
312-
<groupId>org.apache.flink</groupId>
319+
<artifactId>commons-compiler</artifactId>
320+
<groupId>org.codehaus.janino</groupId>
313321
</exclusion>
314322
<exclusion>
315-
<artifactId>flink-table-api-scala_2.11</artifactId>
316-
<groupId>org.apache.flink</groupId>
323+
<artifactId>janino</artifactId>
324+
<groupId>org.codehaus.janino</groupId>
317325
</exclusion>
318326
<exclusion>
319-
<artifactId>flink-table-api-scala-bridge_2.11</artifactId>
327+
<artifactId>flink-scala_2.12</artifactId>
320328
<groupId>org.apache.flink</groupId>
321329
</exclusion>
322330
<exclusion>
323-
<artifactId>flink-table-runtime_2.11</artifactId>
324-
<groupId>org.apache.flink</groupId>
325-
</exclusion>
326-
<exclusion>
327-
<artifactId>flink-table-api-java</artifactId>
331+
<artifactId>flink-table-runtime</artifactId>
328332
<groupId>org.apache.flink</groupId>
329333
</exclusion>
330334
<exclusion>
@@ -339,8 +343,8 @@
339343
</dependency>
340344
<dependency>
341345
<groupId>org.apache.flink</groupId>
342-
<artifactId>flink-test-utils_2.12</artifactId>
343-
<version>1.14.0</version>
346+
<artifactId>flink-test-utils</artifactId>
347+
<version>1.15.0</version>
344348
<scope>test</scope>
345349
<exclusions>
346350
<exclusion>
@@ -352,11 +356,11 @@
352356
<groupId>org.apache.flink</groupId>
353357
</exclusion>
354358
<exclusion>
355-
<artifactId>flink-clients_2.12</artifactId>
359+
<artifactId>flink-core</artifactId>
356360
<groupId>org.apache.flink</groupId>
357361
</exclusion>
358362
<exclusion>
359-
<artifactId>flink-streaming-java_2.12</artifactId>
363+
<artifactId>flink-rpc-akka-loader</artifactId>
360364
<groupId>org.apache.flink</groupId>
361365
</exclusion>
362366
<exclusion>
@@ -383,18 +387,14 @@
383387
</dependency>
384388
<dependency>
385389
<groupId>org.apache.flink</groupId>
386-
<artifactId>flink-streaming-java_2.11</artifactId>
387-
<version>1.14.0</version>
390+
<artifactId>flink-streaming-java</artifactId>
391+
<version>1.15.0</version>
388392
<scope>test</scope>
389393
<exclusions>
390394
<exclusion>
391395
<artifactId>flink-file-sink-common</artifactId>
392396
<groupId>org.apache.flink</groupId>
393397
</exclusion>
394-
<exclusion>
395-
<artifactId>flink-scala_2.11</artifactId>
396-
<groupId>org.apache.flink</groupId>
397-
</exclusion>
398398
<exclusion>
399399
<artifactId>flink-shaded-guava</artifactId>
400400
<groupId>org.apache.flink</groupId>
@@ -420,7 +420,7 @@
420420
<dependency>
421421
<groupId>org.apache.flink</groupId>
422422
<artifactId>flink-runtime</artifactId>
423-
<version>1.14.0</version>
423+
<version>1.15.0</version>
424424
<scope>test</scope>
425425
<exclusions>
426426
<exclusion>
@@ -495,8 +495,8 @@
495495
</dependency>
496496
<dependency>
497497
<groupId>org.apache.flink</groupId>
498-
<artifactId>flink-runtime-web_2.11</artifactId>
499-
<version>1.14.0</version>
498+
<artifactId>flink-runtime-web</artifactId>
499+
<version>1.15.0</version>
500500
<scope>test</scope>
501501
<exclusions>
502502
<exclusion>
@@ -660,14 +660,14 @@
660660
</repository>
661661
</distributionManagement>
662662
<properties>
663-
<scala.binary.version>2.11</scala.binary.version>
663+
<scala.binary.version>2.12</scala.binary.version>
664664
<json.path.version>2.6.0</json.path.version>
665665
<wiremock.version>2.27.2</wiremock.version>
666666
<jacoco.plugin.version>0.8.7</jacoco.plugin.version>
667667
<maven.compiler.source>${target.java.version}</maven.compiler.source>
668668
<mockito.version>4.0.0</mockito.version>
669669
<junit.jupiter.version>5.8.1</junit.jupiter.version>
670-
<flink.version>1.14.0</flink.version>
670+
<flink.version>1.15.0</flink.version>
671671
<maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
672672
<lombok.version>1.18.22</lombok.version>
673673
<maven.compiler.target>${target.java.version}</maven.compiler.target>

‎pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ under the License.
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<flink.version>1.14.0</flink.version>
41+
<flink.version>1.15.0</flink.version>
4242
<target.java.version>11</target.java.version>
43-
<scala.binary.version>2.11</scala.binary.version>
43+
<scala.binary.version>2.12</scala.binary.version>
4444
<maven.compiler.source>${target.java.version}</maven.compiler.source>
4545
<maven.compiler.target>${target.java.version}</maven.compiler.target>
46-
<log4j.version>2.14.1</log4j.version>
46+
<log4j.version>2.17.2</log4j.version>
4747
<lombok.version>1.18.22</lombok.version>
4848
<junit.jupiter.version>5.8.1</junit.jupiter.version>
4949
<json.path.version>2.6.0</json.path.version>
@@ -79,7 +79,7 @@ under the License.
7979
</dependency>
8080
<dependency>
8181
<groupId>org.apache.flink</groupId>
82-
<artifactId>flink-clients_${scala.binary.version}</artifactId>
82+
<artifactId>flink-clients</artifactId>
8383
<version>${flink.version}</version>
8484
<scope>provided</scope>
8585
</dependency>
@@ -107,7 +107,7 @@ under the License.
107107

108108
<dependency>
109109
<groupId>org.apache.flink</groupId>
110-
<artifactId>flink-table-api-java-bridge_2.11</artifactId>
110+
<artifactId>flink-table-api-java-bridge</artifactId>
111111
<version>${flink.version}</version>
112112
<scope>provided</scope>
113113
</dependency>
@@ -143,21 +143,21 @@ under the License.
143143

144144
<dependency>
145145
<groupId>org.apache.flink</groupId>
146-
<artifactId>flink-table-planner_2.11</artifactId>
146+
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
147147
<version>${flink.version}</version>
148148
<scope>test</scope>
149149
</dependency>
150150

151151
<dependency>
152152
<groupId>org.apache.flink</groupId>
153-
<artifactId>flink-test-utils_2.12</artifactId>
153+
<artifactId>flink-test-utils</artifactId>
154154
<version>${flink.version}</version>
155155
<scope>test</scope>
156156
</dependency>
157157

158158
<dependency>
159159
<groupId>org.apache.flink</groupId>
160-
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
160+
<artifactId>flink-streaming-java</artifactId>
161161
<version>${flink.version}</version>
162162
<scope>test</scope>
163163
</dependency>
@@ -171,7 +171,7 @@ under the License.
171171

172172
<dependency>
173173
<groupId>org.apache.flink</groupId>
174-
<artifactId>flink-runtime-web_2.11</artifactId>
174+
<artifactId>flink-runtime-web</artifactId>
175175
<version>${flink.version}</version>
176176
<scope>test</scope>
177177
</dependency>

0 commit comments

Comments
 (0)