[CORE] Bump scalawarts version to prepare for Scala 2.13 support (apa…

…che#6154)
zhanglistar · Jun 20, 2024 · 951ecb9 · 951ecb9
1 parent 35695d1
commit 951ecb9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -635,8 +635,8 @@
             <dependencies>
               <dependency>
                 <groupId>io.github.zhztheplayer.scalawarts</groupId>
-                <artifactId>scalawarts</artifactId>
-                <version>0.1.1</version>
+                <artifactId>scalawarts_${scala.binary.version}</artifactId>
+                <version>0.1.2</version>
               </dependency>
             </dependencies>
             <recompileMode>${scala.recompile.mode}</recompileMode>

diff --git a/shims/common/pom.xml b/shims/common/pom.xml
@@ -61,6 +61,7 @@
         <configuration>
           <args>
             <arg>-Wconf:cat=deprecation:silent</arg>
+            <arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
           </args>
         </configuration>
       </plugin>

diff --git a/shims/spark32/pom.xml b/shims/spark32/pom.xml
@@ -108,6 +108,7 @@
         <configuration>
           <args>
             <arg>-Wconf:cat=deprecation:silent</arg>
+            <arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
           </args>
         </configuration>
       </plugin>

diff --git a/shims/spark33/pom.xml b/shims/spark33/pom.xml
@@ -109,6 +109,7 @@
                 <configuration>
                     <args>
                         <arg>-Wconf:cat=deprecation:silent</arg>
+                        <arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
                     </args>
                 </configuration>
             </plugin>

diff --git a/shims/spark34/pom.xml b/shims/spark34/pom.xml
@@ -109,6 +109,7 @@
                 <configuration>
                     <args>
                         <arg>-Wconf:cat=deprecation:silent</arg>
+                        <arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
                     </args>
                 </configuration>
             </plugin>

diff --git a/shims/spark35/pom.xml b/shims/spark35/pom.xml
@@ -109,6 +109,7 @@
                 <configuration>
                     <args>
                         <arg>-Wconf:cat=deprecation:silent</arg>
+                        <arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
                     </args>
                 </configuration>
             </plugin>

diff --git a/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala
@@ -60,7 +60,10 @@ abstract class Suite(
     .setWarningOnOverriding("spark.storage.blockManagerSlaveTimeoutMs", "3600000")
   sessionSwitcher
     .defaultConf()
-    .setWarningOnOverriding("spark.executor.heartbeatInterval", "1s") // for keeping metrics updated
+    .setWarningOnOverriding("spark.executor.heartbeatInterval", "10s")
+  sessionSwitcher
+    .defaultConf()
+    .setWarningOnOverriding("spark.worker.timeout", "3600")
   sessionSwitcher
     .defaultConf()
     .setWarningOnOverriding("spark.executor.metrics.pollingInterval", "0")