Annotate Scala Collection Compat Dependency

apache · Sep 8, 2024 · cb853e9 · cb853e9
1 parent fd2738d
commit cb853e9
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -118,7 +118,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <scala.version>2.12.18</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
-        <scala-collection-compat.version>2.12.0</scala-collection-compat.version>
+        <!--        <scala-collection-compat.version>2.12.0</scala-collection-compat.version>-->
 
         <arrow.version>16.0.0</arrow.version>
         <!-- Please don't upgrade the version to 4.10+, it depends on JDK 11 -->
@@ -289,7 +289,8 @@
             --add-opens=java.base/sun.security.x509=ALL-UNNAMED
             --add-opens=java.base/sun.util.calendar=ALL-UNNAMED
             -Djdk.reflect.useDirectMethodHandle=false
-            -Dio.netty.tryReflectionSetAccessible=true</extraJavaTestArgs>
+            -Dio.netty.tryReflectionSetAccessible=true
+        </extraJavaTestArgs>
 
         <debugArgLine>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</debugArgLine>
     </properties>
@@ -349,11 +350,11 @@
                 <version>${scala.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
-                <version>${scala-collection-compat.version}</version>
-            </dependency>
+            <!--            <dependency>-->
+            <!--                <groupId>org.scala-lang.modules</groupId>-->
+            <!--                <artifactId>scala-collection-compat_${scala.binary.version}</artifactId>-->
+            <!--                <version>${scala-collection-compat.version}</version>-->
+            <!--            </dependency>-->
 
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
@@ -1443,11 +1444,14 @@
                             <log4j2.configurationFile>src/test/resources/log4j2-test.xml</log4j2.configurationFile>
                             <java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
                             <spark.driver.memory>1g</spark.driver.memory>
-                            <kyuubi.metrics.json.location>${project.build.directory}/metrics</kyuubi.metrics.json.location>
+                            <kyuubi.metrics.json.location>${project.build.directory}/metrics
+                            </kyuubi.metrics.json.location>
                             <kyuubi.frontend.bind.host>localhost</kyuubi.frontend.bind.host>
                             <sun.security.krb5.debug>false</sun.security.krb5.debug>
-                            <kyuubi.operation.log.dir.root>${project.build.directory}/server_operation_logs</kyuubi.operation.log.dir.root>
-                            <kyuubi.engine.operation.log.dir.root>${project.build.directory}/engine_operation_logs</kyuubi.engine.operation.log.dir.root>
+                            <kyuubi.operation.log.dir.root>${project.build.directory}/server_operation_logs
+                            </kyuubi.operation.log.dir.root>
+                            <kyuubi.engine.operation.log.dir.root>${project.build.directory}/engine_operation_logs
+                            </kyuubi.engine.operation.log.dir.root>
                         </systemProperties>
                     </configuration>
                 </plugin>
@@ -1470,11 +1474,14 @@
                             <log4j2.configurationFile>src/test/resources/log4j2-test.xml</log4j2.configurationFile>
                             <java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
                             <spark.driver.memory>1g</spark.driver.memory>
-                            <kyuubi.metrics.json.location>${project.build.directory}/metrics</kyuubi.metrics.json.location>
+                            <kyuubi.metrics.json.location>${project.build.directory}/metrics
+                            </kyuubi.metrics.json.location>
                             <kyuubi.frontend.bind.host>localhost</kyuubi.frontend.bind.host>
                             <sun.security.krb5.debug>false</sun.security.krb5.debug>
-                            <kyuubi.operation.log.dir.root>${project.build.directory}/server_operation_logs</kyuubi.operation.log.dir.root>
-                            <kyuubi.engine.operation.log.dir.root>${project.build.directory}/engine_operation_logs</kyuubi.engine.operation.log.dir.root>
+                            <kyuubi.operation.log.dir.root>${project.build.directory}/server_operation_logs
+                            </kyuubi.operation.log.dir.root>
+                            <kyuubi.engine.operation.log.dir.root>${project.build.directory}/engine_operation_logs
+                            </kyuubi.engine.operation.log.dir.root>
                         </systemProperties>
                         <tagsToExclude>${maven.plugin.scalatest.exclude.tags}</tagsToExclude>
                         <tagsToInclude>${maven.plugin.scalatest.include.tags}</tagsToInclude>
@@ -2021,7 +2028,9 @@
                 <iceberg.artifact>iceberg-spark-runtime-3.5_${scala.binary.version}</iceberg.artifact>
                 <!-- TODO: update once Paimon support Spark 4.0 -->
                 <paimon.artifact>paimon-spark-3.5</paimon.artifact>
-                <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest</maven.plugin.scalatest.exclude.tags>
+                <maven.plugin.scalatest.exclude.tags>
+                    org.scalatest.tags.Slow,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest
+                </maven.plugin.scalatest.exclude.tags>
                 <spark.archive.name>spark-${spark.version}-bin-hadoop3.tgz</spark.archive.name>
             </properties>
         </profile>
@@ -2031,7 +2040,9 @@
             <properties>
                 <spark.version>4.0.0-SNAPSHOT</spark.version>
                 <antlr4.version>4.13.1</antlr4.version>
-                <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.PySparkTest</maven.plugin.scalatest.exclude.tags>
+                <maven.plugin.scalatest.exclude.tags>
+                    org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.PySparkTest
+                </maven.plugin.scalatest.exclude.tags>
             </properties>
             <repositories>
                 <repository>
@@ -2078,7 +2089,8 @@
         <profile>
             <id>zookeeper-3.6</id>
             <properties>
-                <kyuubi-relocated-zookeeper.artifacts>kyuubi-relocated-zookeeper-36</kyuubi-relocated-zookeeper.artifacts>
+                <kyuubi-relocated-zookeeper.artifacts>kyuubi-relocated-zookeeper-36
+                </kyuubi-relocated-zookeeper.artifacts>
             </properties>
         </profile>