Skip to content

[FLINK-23027] Move chill dependency to flink-scala #16190

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

Merged
zentol merged 2 commits into from
Jun 23, 2021
Merged

[FLINK-23027] Move chill dependency to flink-scala #16190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2424dec
[FLINK-23027] Move chill dependency to flink-scala
zentol Jun 18, 2021
c3125e0
+
zentol Jun 23, 2021
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
11 changes: 10 additions & 1 deletion flink-formats/flink-avro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,20 @@ under the License.
<!-- We need this for the patched FlinkScalaKryoInstantiator -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<!-- required for the kryo serializer snapshot -->
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions flink-libraries/flink-cep/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ under the License.
<scope>test</scope>
</dependency>

<dependency>
<!-- Provides the kryo serializer -->
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
Expand Down
23 changes: 0 additions & 23 deletions flink-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,29 +236,6 @@ under the License.
<artifactId>snappy-java</artifactId>
</dependency>

<!--
The KryoSerializer dynamically loads Kryo instances via Chill and requires that Chill
is in the classpath. Because we do not want to have transitive Scala dependencies
in Flink's API modules (such as flink-java) due to Chill, Chill is added to flink-runtime
to ensure that Chill is always present in the classpath.
-->
<dependency>
<groupId>com.twitter</groupId>
<artifactId>chill_${scala.binary.version}</artifactId>
<version>${chill.version}</version>
<!-- exclusions for dependency conversion -->
<exclusions>
<exclusion>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Lz4 compression library -->
<dependency>
<groupId>org.lz4</groupId>
Expand Down
24 changes: 15 additions & 9 deletions flink-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,25 @@ under the License.
<artifactId>flink-test-utils-junit</artifactId>
</dependency>

<!--
The KryoSerializer dynamically loads Kryo instances via Chill and requires that Chill
is in the classpath.
-->
<dependency>
<groupId>com.twitter</groupId>
<artifactId>chill_${scala.binary.version}</artifactId>
<version>${chill.version}</version>
<scope>test</scope>
</dependency>

<!-- We need this for the patched FlinkScalaKryoInstantiator -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<!-- exclusions for dependency conversion -->
<exclusions>
<exclusion>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
0 ...ime/types/FlinkChillPackageRegistrar.java → ...ime/types/FlinkChillPackageRegistrar.java
View file
Open in desktop
File renamed without changes.
0 ...me/types/FlinkScalaKryoInstantiator.scala → ...me/types/FlinkScalaKryoInstantiator.scala
View file
Open in desktop
File renamed without changes.
0 ...types/JavaIterableWrapperSerializer.scala → ...types/JavaIterableWrapperSerializer.scala
View file
Open in desktop
File renamed without changes.
0 ...untime/types/PriorityQueueSerializer.java → ...untime/types/PriorityQueueSerializer.java
View file
Open in desktop
File renamed without changes.
0 ...misc/KryoSerializerRegistrationsTest.java → ...misc/KryoSerializerRegistrationsTest.java
View file
Open in desktop
File renamed without changes.
0 ...est/resources/flink_11-kryo_registrations → ...est/resources/flink_11-kryo_registrations
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions flink-streaming-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ under the License.
<version>${project.version}</version>
</dependency>

<dependency>
<!-- Provides the kryo serializer -->
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions flink-table/flink-table-runtime-blink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ under the License.
<scope>provided</scope>
</dependency>

<dependency>
<!-- Provides the kryo serializer -->
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ under the License.
<exclude>**/src/test/resources/*-data</exclude>
<exclude>flink-tests/src/test/resources/testdata/terainput.txt</exclude>
<exclude>flink-formats/flink-avro/src/test/resources/flink_11-kryo_registrations</exclude>
<exclude>flink-runtime/src/test/resources/flink_11-kryo_registrations</exclude>
<exclude>flink-scala/src/test/resources/flink_11-kryo_registrations</exclude>
<exclude>flink-core/src/test/resources/kryo-serializer-config-snapshot-v1</exclude>
<exclude>flink-formats/flink-avro/src/test/resources/avro/*.avsc</exclude>
<exclude>out/test/flink-avro/avro/user.avsc</exclude>
Expand Down