[FLINK-29741][scala] Delete flink-scala and flink-streaming-scala mod…

…ules
zchovan · Sep 26, 2024 · a27070a · a27070a
1 parent 2f8b2d8
commit a27070a
Show file tree

Hide file tree

Showing 502 changed files with 32 additions and 35,964 deletions.
diff --git a/.github/workflows/docs.sh b/.github/workflows/docs.sh
@@ -59,11 +59,6 @@ mvn javadoc:aggregate -B \
     -Denforcer.skip=true \
     -Dheader="<a href=\"http://flink.apache.org/\" target=\"_top\"><h1>Back to Flink Website</h1></a> <script>var _paq=window._paq=window._paq||[];_paq.push([\"disableCookies\"]),_paq.push([\"setDomains\",[\"*.flink.apache.org\",\"*.nightlies.apache.org/flink\"]]),_paq.push([\"trackPageView\"]),_paq.push([\"enableLinkTracking\"]),function(){var u=\"//matomo.privacy.apache.org/\";_paq.push([\"setTrackerUrl\",u+\"matomo.php\"]),_paq.push([\"setSiteId\",\"1\"]);var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s)}();</script>"
 mv target/site/apidocs docs/target/api/java
-mvn -pl flink-scala scala:doc -B \
-    -Dcheckstyle.skip=true \
-    -Dspotless.skip=true \
-    -Denforcer.skip=true
-mv flink-scala/target/site/scaladocs docs/target/api/scala
 
 # build python docs
 if [ -f  ./flink-python/dev/lint-python.sh ]; then

diff --git a/...k-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java b/...k-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java
@@ -72,8 +72,8 @@
  * basic types, tuples, and POJOs.
  *
  * <p>The set of serializers registered with Kryo via {@link Kryo#register}, with their respective
- * IDs, depends on whether flink-java or flink-scala are on the classpath. This is for
- * backwards-compatibility reasons.
+ * IDs, depends on whether flink-java are on the classpath. This is for backwards-compatibility
+ * reasons.
  *
  * <p>If neither are available (which should only apply to tests in flink-core), then:
  *
@@ -82,15 +82,6 @@
  *   <li>10+ are used for user-defined registration
  * </ul>
  *
- * <p>If flink-scala is available, then:
- *
- * <ul>
- *   <li>0-9 are used for Java primitives
- *   <li>10-72 are used for Scala classes
- *   <li>73-84 are used for Java classes
- *   <li>85+ are used for user-defined registration
- * </ul>
- *
  * <p>If *only* flink-java is available, then:
  *
  * <ul>

diff --git a/flink-dist-scala/pom.xml b/flink-dist-scala/pom.xml
@@ -37,30 +37,43 @@ under the License.
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-scala_${scala.binary.version}</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-reflect</artifactId>
 			<optional>${flink.markBundledAsOptional}</optional>
-			<exclusions>
-				<exclusion>
-					<!-- transitive Flink dependencies are provided at runtime -->
-					<groupId>org.apache.flink</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
+
 		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-library</artifactId>
 			<optional>${flink.markBundledAsOptional}</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-compiler</artifactId>
+			<optional>${flink.markBundledAsOptional}</optional>
+		</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>
+			<!-- exclusions for dependency conversion -->
 			<exclusions>
 				<exclusion>
-					<!-- transitive Flink dependencies are provided at runtime -->
-					<groupId>org.apache.flink</groupId>
-					<artifactId>*</artifactId>
+					<groupId>com.esotericsoftware.kryo</groupId>
+					<artifactId>kryo</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.scala-lang</groupId>
+					<artifactId>scala-library</artifactId>
 				</exclusion>
 			</exclusions>
+			<optional>${flink.markBundledAsOptional}</optional>
 		</dependency>
 
 		<dependency>

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -487,20 +487,6 @@ under the License.
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<!-- Provided by flink-dist-scala -->
-				<groupId>org.apache.flink</groupId>
-				<artifactId>flink-scala_${scala.binary.version}</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<!-- Provided by flink-dist-scala -->
-				<groupId>org.apache.flink</groupId>
-				<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.objenesis</groupId>
 				<artifactId>objenesis</artifactId>

diff --git a/flink-java/pom.xml b/flink-java/pom.xml
@@ -78,7 +78,7 @@ under the License.
 
 	<build>
 		<plugins>
-			<!-- Because flink-scala, flink-avro and flink-hadoop-compatibility uses it in tests -->
+			<!-- Because flink-avro and flink-hadoop-compatibility uses it in tests -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>