From bba1d944f47d78480025a8bcbe50939698ea854e Mon Sep 17 00:00:00 2001
From: Gonzalo Ortiz <gortiz@users.noreply.github.com>
Date: Fri, 22 Sep 2023 12:51:17 +0200
Subject: [PATCH 1/2] Move scala dependencies to root pom

---
 .../pinot-flink-connector/pom.xml             |  8 +-
 .../pinot-spark-2-connector/pom.xml           | 54 ----------
 .../pinot-spark-3-connector/pom.xml           | 54 ----------
 pinot-connectors/pinot-spark-common/pom.xml   | 58 -----------
 .../pinot-kafka-2.0/pom.xml                   | 25 -----
 pinot-tools/pom.xml                           |  3 +-
 pom.xml                                       | 98 +++++++++++++++++++
 7 files changed, 101 insertions(+), 199 deletions(-)

diff --git a/pinot-connectors/pinot-flink-connector/pom.xml b/pinot-connectors/pinot-flink-connector/pom.xml
index cbb3d941e4e0..3b6f3198b7db 100644
--- a/pinot-connectors/pinot-flink-connector/pom.xml
+++ b/pinot-connectors/pinot-flink-connector/pom.xml
@@ -34,8 +34,6 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
-    <scala.version>2.12</scala.version>
-    <flink.version>1.12.0</flink.version>
   </properties>
 
   <dependencies>
@@ -53,8 +51,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-streaming-java_${scala.version}</artifactId>
-      <version>${flink.version}</version>
+      <artifactId>flink-streaming-java_${scala.compat.version}</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.pinot</groupId>
@@ -85,8 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-clients_${scala.version}</artifactId>
-      <version>${flink.version}</version>
+      <artifactId>flink-clients_${scala.compat.version}</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pinot-connectors/pinot-spark-2-connector/pom.xml b/pinot-connectors/pinot-spark-2-connector/pom.xml
index eaae57887c25..32b324385d20 100644
--- a/pinot-connectors/pinot-spark-2-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-2-connector/pom.xml
@@ -46,10 +46,6 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-      <properties>
-        <scala.version>2.12.11</scala.version>
-        <scala.compat.version>2.12</scala.compat.version>
-      </properties>
       <dependencies>
         <dependency>
           <groupId>org.scala-lang.modules</groupId>
@@ -93,7 +89,6 @@
         <dependency>
           <groupId>org.scala-lang</groupId>
           <artifactId>scala-library</artifactId>
-          <version>${scala.version}</version>
           <scope>provided</scope>
         </dependency>
         <!-- tests -->
@@ -143,55 +138,6 @@
           <plugin>
             <groupId>net.alchim31.maven</groupId>
             <artifactId>scala-maven-plugin</artifactId>
-            <version>3.2.2</version>
-            <executions>
-              <execution>
-                <id>eclipse-add-source</id>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>scala-compile-first</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>compile</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>scala-test-compile-first</id>
-                <phase>process-test-resources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>attach-scaladocs</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>doc-jar</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <scalaVersion>${scala.version}</scalaVersion>
-              <args>
-                <arg>-unchecked</arg>
-                <arg>-deprecation</arg>
-                <arg>-feature</arg>
-              </args>
-              <jvmArgs>
-                <jvmArg>-Xms1024m</jvmArg>
-                <jvmArg>-Xmx1024m</jvmArg>
-              </jvmArgs>
-              <javacArgs>
-                <javacArg>-source</javacArg>
-                <javacArg>${jdk.version}</javacArg>
-                <javacArg>-target</javacArg>
-                <javacArg>${jdk.version}</javacArg>
-                <javacArg>-Xlint:all,-serial,-path</javacArg>
-              </javacArgs>
-            </configuration>
           </plugin>
         </plugins>
       </build>
diff --git a/pinot-connectors/pinot-spark-3-connector/pom.xml b/pinot-connectors/pinot-spark-3-connector/pom.xml
index fe5515ab4ad5..136e050888f1 100644
--- a/pinot-connectors/pinot-spark-3-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-3-connector/pom.xml
@@ -45,10 +45,6 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-      <properties>
-        <scala.version>2.12.11</scala.version>
-        <scala.compat.version>2.12</scala.compat.version>
-      </properties>
       <dependencies>
         <dependency>
           <groupId>org.apache.spark</groupId>
@@ -86,7 +82,6 @@
         <dependency>
           <groupId>org.scala-lang</groupId>
           <artifactId>scala-library</artifactId>
-          <version>${scala.version}</version>
           <scope>provided</scope>
         </dependency>
         <!-- tests -->
@@ -140,55 +135,6 @@
           <plugin>
             <groupId>net.alchim31.maven</groupId>
             <artifactId>scala-maven-plugin</artifactId>
-            <version>3.2.2</version>
-            <executions>
-              <execution>
-                <id>eclipse-add-source</id>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>scala-compile-first</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>compile</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>scala-test-compile-first</id>
-                <phase>process-test-resources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>attach-scaladocs</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>doc-jar</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <scalaVersion>${scala.version}</scalaVersion>
-              <args>
-                <arg>-unchecked</arg>
-                <arg>-deprecation</arg>
-                <arg>-feature</arg>
-              </args>
-              <jvmArgs>
-                <jvmArg>-Xms1024m</jvmArg>
-                <jvmArg>-Xmx1024m</jvmArg>
-              </jvmArgs>
-              <javacArgs>
-                <javacArg>-source</javacArg>
-                <javacArg>${jdk.version}</javacArg>
-                <javacArg>-target</javacArg>
-                <javacArg>${jdk.version}</javacArg>
-                <javacArg>-Xlint:all,-serial,-path</javacArg>
-              </javacArgs>
-            </configuration>
           </plugin>
         </plugins>
       </build>
diff --git a/pinot-connectors/pinot-spark-common/pom.xml b/pinot-connectors/pinot-spark-common/pom.xml
index 427e23d9240f..c96e369643a9 100644
--- a/pinot-connectors/pinot-spark-common/pom.xml
+++ b/pinot-connectors/pinot-spark-common/pom.xml
@@ -45,10 +45,6 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-      <properties>
-        <scala.version>2.12.11</scala.version>
-        <scala.compat.version>2.12</scala.compat.version>
-      </properties>
       <dependencies>
         <dependency>
           <groupId>com.thoughtworks.paranamer</groupId>
@@ -105,7 +101,6 @@
         <dependency>
           <groupId>org.scala-lang</groupId>
           <artifactId>scala-library</artifactId>
-          <version>${scala.version}</version>
           <scope>provided</scope>
         </dependency>
         <!-- tests -->
@@ -154,59 +149,6 @@
           <plugin>
             <groupId>net.alchim31.maven</groupId>
             <artifactId>scala-maven-plugin</artifactId>
-            <version>3.2.2</version>
-            <executions>
-              <execution>
-                <id>add-source</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sourceDir>src/main/java</sourceDir>
-                </configuration>
-              </execution>
-              <execution>
-                <id>scala-compile-first</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>compile</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>scala-test-compile-first</id>
-                <phase>process-test-resources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>attach-scaladocs</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>doc-jar</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <scalaVersion>${scala.version}</scalaVersion>
-              <args>
-                <arg>-unchecked</arg>
-                <arg>-deprecation</arg>
-                <arg>-feature</arg>
-              </args>
-              <jvmArgs>
-                <jvmArg>-Xms1024m</jvmArg>
-                <jvmArg>-Xmx1024m</jvmArg>
-              </jvmArgs>
-              <javacArgs>
-                <javacArg>-source</javacArg>
-                <javacArg>${jdk.version}</javacArg>
-                <javacArg>-target</javacArg>
-                <javacArg>${jdk.version}</javacArg>
-                <javacArg>-Xlint:all,-serial,-path</javacArg>
-              </javacArgs>
-            </configuration>
           </plugin>
         </plugins>
       </build>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
index 6d0cfe5b1bb7..bd2ac3c5e04f 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
@@ -72,7 +72,6 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
@@ -113,28 +112,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-
-  <profiles>
-    <profile>
-      <id>scala-2.12</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <scala.version>2.12.11</scala.version>
-        <scala.compat.version>2.12</scala.compat.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>scala-2.13</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <scala.version>2.13.3</scala.version>
-        <scala.compat.version>2.13</scala.compat.version>
-      </properties>
-    </profile>
-  </profiles>
 </project>
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 726850bb4162..48f876bd1c75 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -33,7 +33,6 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <scala.version>2.12</scala.version>
     <spark.version>3.2.1</spark.version>
     <airlift.version>0.16</airlift.version>
   </properties>
@@ -286,7 +285,7 @@
     -->
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-launcher_${scala.version}</artifactId>
+      <artifactId>spark-launcher_${scala.compat.version}</artifactId>
       <version>${spark.version}</version>
       <exclusions>
         <exclusion>
diff --git a/pom.xml b/pom.xml
index 9220d562bd92..35cd3e466ecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,6 +177,8 @@
     <surefire.version>3.0.0-M5</surefire.version>
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
     <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+
+    <flink.version>1.12.0</flink.version>
   </properties>
 
   <profiles>
@@ -224,6 +226,27 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>scala-2.12</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <scala.version>2.12.18</scala.version>
+        <scala.compat.version>2.12</scala.compat.version>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>scala-2.13</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <scala.version>2.13.3</scala.version>
+        <scala.compat.version>2.13</scala.compat.version>
+      </properties>
+    </profile>
   </profiles>
   <dependencyManagement>
     <dependencies>
@@ -1293,6 +1316,24 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>${scala.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-clients_${scala.compat.version}</artifactId>
+        <version>${flink.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-streaming-java_${scala.compat.version}</artifactId>
+        <version>${flink.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -1516,6 +1557,63 @@
             <encoding>${project.build.sourceEncoding}</encoding>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>net.alchim31.maven</groupId>
+          <artifactId>scala-maven-plugin</artifactId>
+          <version>3.2.2</version>
+          <executions>
+            <execution>
+              <id>add-source</id>
+              <phase>generate-sources</phase>
+              <goals>
+                <goal>add-source</goal>
+              </goals>
+              <configuration>
+                <sourceDir>src/main/java</sourceDir>
+              </configuration>
+            </execution>
+            <execution>
+              <id>scala-compile-first</id>
+              <phase>process-resources</phase>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>scala-test-compile-first</id>
+              <phase>process-test-resources</phase>
+              <goals>
+                <goal>testCompile</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>attach-scaladocs</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>doc-jar</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <scalaVersion>${scala.version}</scalaVersion>
+            <args>
+              <arg>-unchecked</arg>
+              <arg>-deprecation</arg>
+              <arg>-feature</arg>
+            </args>
+            <jvmArgs>
+              <jvmArg>-Xms1024m</jvmArg>
+              <jvmArg>-Xmx1024m</jvmArg>
+            </jvmArgs>
+            <javacArgs>
+              <javacArg>-source</javacArg>
+              <javacArg>${jdk.version}</javacArg>
+              <javacArg>-target</javacArg>
+              <javacArg>${jdk.version}</javacArg>
+              <javacArg>-Xlint:all,-serial,-path</javacArg>
+            </javacArgs>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>

From 200a5702c283edfcfd35746dbacdfab251e25d98 Mon Sep 17 00:00:00 2001
From: Gonzalo Ortiz <gortiz@users.noreply.github.com>
Date: Mon, 25 Sep 2023 10:47:30 +0200
Subject: [PATCH 2/2] Move scala.version and scala.compat.version to default
 properties

---
 pom.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35cd3e466ecb..33fd423b019c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,6 +178,10 @@
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
     <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
 
+    <!-- Configuration for Scala -->
+    <scala.version>2.12.18</scala.version>
+    <scala.compat.version>2.12</scala.compat.version>
+
     <flink.version>1.12.0</flink.version>
   </properties>
 
@@ -226,16 +230,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>scala-2.12</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <scala.version>2.12.18</scala.version>
-        <scala.compat.version>2.12</scala.compat.version>
-      </properties>
-    </profile>
 
     <profile>
       <id>scala-2.13</id>