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 @@ https://pinot.apache.org/ ${basedir}/../.. - 2.12 - 1.12.0 @@ -53,8 +51,7 @@ org.apache.flink - flink-streaming-java_${scala.version} - ${flink.version} + flink-streaming-java_${scala.compat.version} org.apache.pinot @@ -85,8 +82,7 @@ org.apache.flink - flink-clients_${scala.version} - ${flink.version} + flink-clients_${scala.compat.version} test diff --git a/pinot-connectors/pinot-spark-2-connector/pom.xml b/pinot-connectors/pinot-spark-2-connector/pom.xml index c92e564c7fc0..667b65fea925 100644 --- a/pinot-connectors/pinot-spark-2-connector/pom.xml +++ b/pinot-connectors/pinot-spark-2-connector/pom.xml @@ -46,10 +46,6 @@ true - - 2.12.11 - 2.12 - org.scala-lang.modules @@ -93,7 +89,6 @@ org.scala-lang scala-library - ${scala.version} provided @@ -143,55 +138,6 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 - - - eclipse-add-source - - add-source - - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile-first - process-test-resources - - testCompile - - - - attach-scaladocs - verify - - doc-jar - - - - - ${scala.version} - - -unchecked - -deprecation - -feature - - - -Xms1024m - -Xmx1024m - - - -source - ${jdk.version} - -target - ${jdk.version} - -Xlint:all,-serial,-path - - diff --git a/pinot-connectors/pinot-spark-3-connector/pom.xml b/pinot-connectors/pinot-spark-3-connector/pom.xml index 1bdb23edbdc7..5efe8a3a9a01 100644 --- a/pinot-connectors/pinot-spark-3-connector/pom.xml +++ b/pinot-connectors/pinot-spark-3-connector/pom.xml @@ -45,10 +45,6 @@ true - - 2.12.11 - 2.12 - org.apache.spark @@ -86,7 +82,6 @@ org.scala-lang scala-library - ${scala.version} provided @@ -140,55 +135,6 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 - - - eclipse-add-source - - add-source - - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile-first - process-test-resources - - testCompile - - - - attach-scaladocs - verify - - doc-jar - - - - - ${scala.version} - - -unchecked - -deprecation - -feature - - - -Xms1024m - -Xmx1024m - - - -source - ${jdk.version} - -target - ${jdk.version} - -Xlint:all,-serial,-path - - diff --git a/pinot-connectors/pinot-spark-common/pom.xml b/pinot-connectors/pinot-spark-common/pom.xml index bfbe8c3f1ee9..043307a8a943 100644 --- a/pinot-connectors/pinot-spark-common/pom.xml +++ b/pinot-connectors/pinot-spark-common/pom.xml @@ -45,10 +45,6 @@ true - - 2.12.11 - 2.12 - com.thoughtworks.paranamer @@ -105,7 +101,6 @@ org.scala-lang scala-library - ${scala.version} provided @@ -154,59 +149,6 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 - - - add-source - generate-sources - - add-source - - - src/main/java - - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile-first - process-test-resources - - testCompile - - - - attach-scaladocs - verify - - doc-jar - - - - - ${scala.version} - - -unchecked - -deprecation - -feature - - - -Xms1024m - -Xmx1024m - - - -source - ${jdk.version} - -target - ${jdk.version} - -Xlint:all,-serial,-path - - 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 @@ org.scala-lang scala-library - ${scala.version} org.apache.kafka @@ -113,28 +112,4 @@ test - - - - - scala-2.12 - - true - - - 2.12.11 - 2.12 - - - - scala-2.13 - - false - - - 2.13.3 - 2.13 - - - 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 @@ https://pinot.apache.org/ ${basedir}/.. - 2.12 3.2.1 0.16 @@ -286,7 +285,7 @@ --> org.apache.spark - spark-launcher_${scala.version} + spark-launcher_${scala.compat.version} ${spark.version} diff --git a/pom.xml b/pom.xml index b8845ecf954b..2540ea1c8a16 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,12 @@ 3.3.0 3.4.1 3.1.2 + + + 2.12.18 + 2.12 + + 1.12.0 @@ -240,6 +246,17 @@ + + + scala-2.13 + + false + + + 2.13.3 + 2.13 + + @@ -1287,6 +1304,24 @@ pom import + + + org.scala-lang + scala-library + ${scala.version} + + + + org.apache.flink + flink-clients_${scala.compat.version} + ${flink.version} + test + + + org.apache.flink + flink-streaming-java_${scala.compat.version} + ${flink.version} + @@ -1535,6 +1570,63 @@ ${project.build.sourceEncoding} + + net.alchim31.maven + scala-maven-plugin + 3.2.2 + + + add-source + generate-sources + + add-source + + + src/main/java + + + + scala-compile-first + process-resources + + compile + + + + scala-test-compile-first + process-test-resources + + testCompile + + + + attach-scaladocs + verify + + doc-jar + + + + + ${scala.version} + + -unchecked + -deprecation + -feature + + + -Xms1024m + -Xmx1024m + + + -source + ${jdk.version} + -target + ${jdk.version} + -Xlint:all,-serial,-path + + +