Skip to content

Upgrade to 1.20.1 #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Upgrade to 1.20.1 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8307788
[FLINK-XXXXX] Upgrade to Flink 1.17.1
MartijnVisser Nov 27, 2023
66d08b8
[FLINK-XXXXX] Update to Reload4J
MartijnVisser Nov 27, 2023
ecbf18b
[FLINK-XXXXX] Update Testcontainers
MartijnVisser Nov 27, 2023
791499e
[FLINK-XXXXX] Update Auto Annotation service
MartijnVisser Nov 27, 2023
fc71a13
Upgrade to Flink 1.20.1
gvauvert Mar 16, 2025
90faa99
Fix Dependency convergence error for org.apache.commons:commons-compr…
gvauvert Mar 16, 2025
5ba63cc
Fix Dependency convergence error for org.apache.commons:commons-lang3…
gvauvert Mar 16, 2025
4dc75ec
Revert update of flink-shaded-netty.version
gvauvert Mar 16, 2025
dd1f9e2
Fix flink-connector-kafka version
gvauvert Mar 16, 2025
680e81f
Fix FakeRuntimeContext & FakeOutput
gvauvert Mar 16, 2025
894c16a
Fix Dependency convergence error for org.apache.commons:commons-lang3…
gvauvert Mar 16, 2025
7abdcfa
Fix Dependency convergence error for com.google.guava:guava:32.1.2-jre
gvauvert Mar 16, 2025
6ff3a7a
Fix Dependency convergence error for com.fasterxml.jackson.core:jacks…
gvauvert Mar 16, 2025
098b720
Fix Dependency convergence error for org.apache.commons:commons-lang3…
gvauvert Mar 16, 2025
e48e0e0
Fix Dependency convergence error for org.apache.commons:commons-lang3…
gvauvert Mar 16, 2025
bcc2738
Fix Dependency convergence error for org.apache.commons:commons-text:…
gvauvert Mar 16, 2025
f5ffc1e
Fix Dependency convergence error for org.apache.commons:commons-lang3…
gvauvert Mar 16, 2025
094d1c9
Fix Dependency convergence error for org.apache.commons:commons-lang3…
gvauvert Mar 16, 2025
edc3a9f
Fix Move org.apache.commons:commons-lang3:3.14.0 and org.apache.commo…
gvauvert Mar 16, 2025
51774e6
Fix Dependency convergence error for org.slf4j:slf4j-api:1.7.36
gvauvert Mar 16, 2025
e5eac93
Fix Dependency convergence error for flink-shaded-jackson
gvauvert Mar 16, 2025
47197d7
Fix Duplicate
gvauvert Mar 16, 2025
0ccaae5
Fix Dependency convergence error for org.xerial.snappy:snappy-java:1.…
gvauvert Mar 16, 2025
72da216
Fix wrong renaming statefun-flink-core -> flink-core
gvauvert Mar 16, 2025
8b270fd
Use non apache flink image that supports AMD64
gvauvert Mar 16, 2025
96f5686
Move testcontainers dependency to parent
gvauvert Mar 16, 2025
d652b6c
Fix slf4j-api &
gvauvert Mar 16, 2025
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
265 changes: 253 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,18 @@ under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spotless-maven-plugin.version>1.20.0</spotless-maven-plugin.version>
<auto-service.version>1.0-rc6</auto-service.version>
<auto-service.version>1.1.1</auto-service.version>
<protobuf.version>3.7.1</protobuf.version>
<unixsocket.version>2.3.2</unixsocket.version>
<protoc-jar-maven-plugin.version>3.11.1</protoc-jar-maven-plugin.version>
<flink.version>1.16.2</flink.version>
<flink.version>1.20.1</flink.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.7</scala.version>
<lz4-java.version>1.8.0</lz4-java.version>
<flink-shaded-jackson.version>2.12.4-15.0</flink-shaded-jackson.version>
<slf4j-log4j12.version>1.7.32</slf4j-log4j12.version>
<flink-shaded-jackson.version>2.18.2-20.0</flink-shaded-jackson.version>
<slf4j.version>1.7.36</slf4j.version>
<test.unit.pattern>**/*Test.*</test.unit.pattern>
<testcontainers.version>1.19.3</testcontainers.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -113,24 +114,264 @@ under the License.

<!--
Resolve dependency convergence issue:
flink-core:1.16.2 depends on kryo:2.24.0
flink-java:1.16.2 depends on kryo:2.21 (via com.twitter:chill-java:0.7.6)
flink-core:1.17.1 depends on kryo:2.24.0
flink-java:1.17.1 depends on kryo:2.21 (via com.twitter:chill-java:0.7.6)
-->
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
<version>2.24.0</version>
</dependency>

<!--
Resolve dependency convergence issue:
flink-connector-kinesis:1.16.2 depends on jackson-databind:2.13.4.2
flink-connector-kinesis:1.16.2 depends on jackson-databind:2.13.4
(via com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.4)
-->
flink-runtime:1.17.1 depends on flink-shaded-force-shading:16.1
org.apache.flink:flink-connector-kinesis:4.1.0-1.17 depends on flink-shaded-force-shading:16.0
-->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-force-shading</artifactId>
<version>16.1</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<type>test-jar</type>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime</artifactId>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
<version>2.18.2-20.0</version>
</dependency>
<!-- -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kinesis</artifactId>
<version>5.0.0-1.20</version>
<exclusions>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-base</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils-junit</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<!-- fix Dependency convergence error for org.apache.commons:commons-compress:1.26.0 -->
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
</exclusion>
<!--
This dependency leads to a version convergence error caused solely by Testcontainers.
See https://github.com/testcontainers/testcontainers-java/issues/3308.
-->
<exclusion>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.0</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-api</artifactId>
<version>3.3.3</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>${unixsocket.version}</version>
</dependency>
<!-- -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka</artifactId>
<version>3.4.0-1.20</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.4</version>
</dependency>
<!-- ??? -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.18.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion statefun-e2e-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.
<packaging>pom</packaging>

<properties>
<testcontainers.version>1.15.2</testcontainers.version>
<testcontainers.version>1.19.3</testcontainers.version>
</properties>

<modules>
Expand Down
45 changes: 18 additions & 27 deletions statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,41 +52,26 @@ under the License.
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
</exclusion>
<!--
This dependency leads to a version convergence error caused solely by Testcontainers.
See https://github.com/testcontainers/testcontainers-java/issues/3308.
-->
<exclusion>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.5.0</version>
</dependency>

<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>${unixsocket.version}</version>
</dependency>

<!-- Flink Config -->
Expand Down Expand Up @@ -120,5 +105,11 @@ under the License.
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>

<!-- -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
</project>
10 changes: 2 additions & 8 deletions statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>statefun-e2e-tests-common</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Junit -->
Expand All @@ -69,8 +63,8 @@ under the License.
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-log4j12.version}</version>
<artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand Down
Loading