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

mbalassi · Jun 23, 2021 · b952af2 · b952af2
1 parent db73b33
commit b952af2
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 34 deletions.
diff --git a/flink-formats/flink-avro/pom.xml b/flink-formats/flink-avro/pom.xml
@@ -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>

diff --git a/flink-libraries/flink-cep/pom.xml b/flink-libraries/flink-cep/pom.xml
@@ -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>

diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
@@ -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>

diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
@@ -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>

diff --git a/...ime/types/FlinkChillPackageRegistrar.java → ...ime/types/FlinkChillPackageRegistrar.java b/...ime/types/FlinkChillPackageRegistrar.java → ...ime/types/FlinkChillPackageRegistrar.java
diff --git a/...me/types/FlinkScalaKryoInstantiator.scala → ...me/types/FlinkScalaKryoInstantiator.scala b/...me/types/FlinkScalaKryoInstantiator.scala → ...me/types/FlinkScalaKryoInstantiator.scala
diff --git a/...types/JavaIterableWrapperSerializer.scala → ...types/JavaIterableWrapperSerializer.scala b/...types/JavaIterableWrapperSerializer.scala → ...types/JavaIterableWrapperSerializer.scala
diff --git a/...untime/types/PriorityQueueSerializer.java → ...untime/types/PriorityQueueSerializer.java b/...untime/types/PriorityQueueSerializer.java → ...untime/types/PriorityQueueSerializer.java
diff --git a/...misc/KryoSerializerRegistrationsTest.java → ...misc/KryoSerializerRegistrationsTest.java b/...misc/KryoSerializerRegistrationsTest.java → ...misc/KryoSerializerRegistrationsTest.java
diff --git a/...est/resources/flink_11-kryo_registrations → ...est/resources/flink_11-kryo_registrations b/...est/resources/flink_11-kryo_registrations → ...est/resources/flink_11-kryo_registrations
diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml
@@ -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>

diff --git a/flink-table/flink-table-runtime-blink/pom.xml b/flink-table/flink-table-runtime-blink/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -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>