Skip to content

Commit c417ef7

Browse files
authored
chore: Bump Flink version to 2.2.1 (#341)
1 parent 9896b1d commit c417ef7

5 files changed

Lines changed: 4 additions & 668 deletions

File tree

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ java -jar flink-sql-runner/target/flink-sql-runner.jar --sqlfile script.sql --ud
6262
## Technology Stack
6363

6464
- **Java 17** - Base language version
65-
- **Apache Flink 2.2.0** - Stream processing framework
65+
- **Apache Flink 2.2.1** - Stream processing framework
6666
- **Maven** - Build system
6767
- **Lombok** - Code generation
6868
- **PicoCLI** - Command line interface

flink-sql-runner/pom.xml

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,9 @@
5151
<scope>provided</scope>
5252
</dependency>
5353

54-
<!-- TODO: Switch back to planner loader when PTF loading is patched upstream. -->
55-
<!-- <dependency>-->
56-
<!-- <groupId>org.apache.flink</groupId>-->
57-
<!-- <artifactId>flink-table-planner-loader</artifactId>-->
58-
<!-- <version>${flink.version}</version>-->
59-
<!-- <scope>provided</scope>-->
60-
<!-- </dependency>-->
61-
6254
<dependency>
6355
<groupId>org.apache.flink</groupId>
64-
<artifactId>flink-table-planner_2.12</artifactId>
56+
<artifactId>flink-table-planner-loader</artifactId>
6557
<version>${flink.version}</version>
6658
<scope>provided</scope>
6759
</dependency>
@@ -521,26 +513,6 @@
521513
<groupId>org.apache.maven.plugins</groupId>
522514
<artifactId>maven-dependency-plugin</artifactId>
523515
<executions>
524-
<execution>
525-
<id>unpack-flink-table-planner-without-rex-json-deser</id>
526-
<goals>
527-
<goal>unpack</goal>
528-
</goals>
529-
<phase>prepare-package</phase>
530-
<configuration>
531-
<artifactItems>
532-
<artifactItem>
533-
<groupId>org.apache.flink</groupId>
534-
<artifactId>flink-table-planner_2.12</artifactId>
535-
<version>${flink.version}</version>
536-
<type>jar</type>
537-
<overWrite>true</overWrite>
538-
<outputDirectory>${project.build.directory}/flink-table-planner-temp</outputDirectory>
539-
<excludes>org/apache/flink/table/planner/plan/nodes/exec/serde/RexNodeJsonDeserializer**</excludes>
540-
</artifactItem>
541-
</artifactItems>
542-
</configuration>
543-
</execution>
544516
<execution>
545517
<id>unpack-iceberg-aws-bundle-without-logging</id>
546518
<goals>
@@ -675,22 +647,6 @@
675647
<groupId>org.apache.maven.plugins</groupId>
676648
<artifactId>maven-antrun-plugin</artifactId>
677649
<executions>
678-
<execution>
679-
<!-- Repackage flink-table-planner_2.12 and override RexNodeJsonDeserializer using antrun plugin -->
680-
<id>repack-flink-table-planner</id>
681-
<goals>
682-
<goal>run</goal>
683-
</goals>
684-
<phase>prepare-package</phase>
685-
<configuration>
686-
<target>
687-
<copy failonerror="true" todir="${project.build.directory}/flink-table-planner-temp/org/apache/flink/table/planner/plan/nodes/exec/serde">
688-
<fileset dir="${project.build.outputDirectory}/org/apache/flink/table/planner/plan/nodes/exec/serde" includes="RexNodeJsonDeserializer*.class"/>
689-
</copy>
690-
<jar basedir="${project.build.directory}/flink-table-planner-temp" destfile="${project.build.directory}/flink-table-planner_2.12-${flink.version}.jar"/>
691-
</target>
692-
</configuration>
693-
</execution>
694650
<execution>
695651
<!-- Repackage iceberg-aws-bundle without SLF4J using antrun plugin -->
696652
<id>repack-iceberg-aws-bundle</id>

flink-sql-runner/src/main/docker/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ RUN set -eu; \
4646
&& rm -f /tmp/async-profiler.tar.gz \
4747
&& rm -rf /var/lib/apt/lists/*
4848

49-
COPY flink-table-planner_2.12-*.jar /opt/flink/lib
5049
COPY flink-s3-fs-hadoop-*.jar /opt/flink/lib
5150
COPY hadoop-common-*.jar /opt/flink/lib
5251
COPY hadoop-hdfs-client-*.jar /opt/flink/lib
@@ -58,8 +57,7 @@ COPY flink-sql-runner.uber.jar /opt/flink/lib/sql-runner.uber.jar
5857
COPY --chmod=755 sql-runner /opt/flink/bin/sql-runner
5958
COPY --chmod=755 entrypoint.sh /entrypoint.sh
6059

61-
RUN rm -rf /opt/flink/lib/flink-table-planner-loader-*.jar \
62-
&& echo 'UEsDBBQACAgIAG2UllwAAAAAAAAAAAAAAAAUAAQATUVUQS1JTkYvTUFOSUZFU1QuTUb+ygAA803My0xLLS7RDUstKs7Mz7NSMNQz4HIuSk0sSU3Rdaq0UkjLyczL1i0uzNEtKs3LSy3i4gIAUEsHCL/cUjU2AAAANAAAAFBLAQIUABQACAgIAG2Ully/3FI1NgAAADQAAAAUAAQAAAAAAAAAAAAAAAAAAABNRVRBLUlORi9NQU5JRkVTVC5NRv7KAABQSwUGAAAAAAEAAQBGAAAAfAAAAAAA' | base64 -d > /opt/flink/noop.jar \
60+
RUN echo 'UEsDBBQACAgIAG2UllwAAAAAAAAAAAAAAAAUAAQATUVUQS1JTkYvTUFOSUZFU1QuTUb+ygAA803My0xLLS7RDUstKs7Mz7NSMNQz4HIuSk0sSU3Rdaq0UkjLyczL1i0uzNEtKs3LSy3i4gIAUEsHCL/cUjU2AAAANAAAAFBLAQIUABQACAgIAG2Ully/3FI1NgAAADQAAAAUAAQAAAAAAAAAAAAAAAAAAABNRVRBLUlORi9NQU5JRkVTVC5NRv7KAABQSwUGAAAAAAEAAQBGAAAAfAAAAAAA' | base64 -d > /opt/flink/noop.jar \
6361
&& mkdir -p /opt/flink/hadoop-conf \
6462
&& echo '<configuration><property><name>fs.s3a.aws.credentials.provider</name><value>com.amazonaws.auth.DefaultAWSCredentialsProviderChain</value></property></configuration>' > /opt/flink/hadoop-conf/core-site.xml \
6563
&& chown -R flink:flink /opt/flink

0 commit comments

Comments
 (0)