From 1c73d31288e7d0020c89ffeb20c12311fdabcff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Fri, 25 Aug 2023 23:25:11 +0800
Subject: [PATCH] upgrade to `2.13.11`

---
 pom.xml                                            | 14 +++++++++++++-
 test-apps/scripting/pom.xml                        |  9 ++++++++-
 .../META-INF/batch-jobs/batchletScalaInline.xml    |  3 +--
 .../main/resources/scala/SimpleBatchletScala.scala |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff54eccf1..f247fdf38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
         <version.org.apache.groovy>4.0.14</version.org.apache.groovy>
         <version.org.jruby.jruby>9.0.0.0</version.org.jruby.jruby>
         <version.org.python.jython>2.7.3</version.org.python.jython>
-        <version.org.scala-lang.scala-dist>2.11.12</version.org.scala-lang.scala-dist>
+        <version.org.scala-lang.scala-dist>2.13.11</version.org.scala-lang.scala-dist>
         <version.com.caucho.resin-quercus>3.2.1</version.com.caucho.resin-quercus>
         <version.jakarta.annotation-api>2.1.1</version.jakarta.annotation-api>
         <version.jakarta.servlet-api>5.0.0</version.jakarta.servlet-api>
@@ -697,12 +697,24 @@
                 <version>${version.org.python.jython}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>${version.org.scala-lang.scala-dist}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-compiler</artifactId>
                 <version>${version.org.scala-lang.scala-dist}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-reflect</artifactId>
+                <version>${version.org.scala-lang.scala-dist}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>com.caucho</groupId>
                 <artifactId>resin-quercus</artifactId>
diff --git a/test-apps/scripting/pom.xml b/test-apps/scripting/pom.xml
index cbfd0b0ab..96cfa5261 100644
--- a/test-apps/scripting/pom.xml
+++ b/test-apps/scripting/pom.xml
@@ -33,11 +33,18 @@
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-compiler</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-reflect</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.caucho</groupId>
             <artifactId>resin-quercus</artifactId>
diff --git a/test-apps/scripting/src/main/resources/META-INF/batch-jobs/batchletScalaInline.xml b/test-apps/scripting/src/main/resources/META-INF/batch-jobs/batchletScalaInline.xml
index fc1cd4275..5de665132 100644
--- a/test-apps/scripting/src/main/resources/META-INF/batch-jobs/batchletScalaInline.xml
+++ b/test-apps/scripting/src/main/resources/META-INF/batch-jobs/batchletScalaInline.xml
@@ -33,8 +33,7 @@
                 println("stepName: " + stepContext1.getStepName())
                 val testName : String = batchProperties1.get("testName").asInstanceOf[String]
                 jobContext1.setExitStatus(testName)
-                return testName;
-
+                testName
             </script>
         </batchlet>
     </step>
diff --git a/test-apps/scripting/src/main/resources/scala/SimpleBatchletScala.scala b/test-apps/scripting/src/main/resources/scala/SimpleBatchletScala.scala
index 198bf4a9c..a88b114e7 100644
--- a/test-apps/scripting/src/main/resources/scala/SimpleBatchletScala.scala
+++ b/test-apps/scripting/src/main/resources/scala/SimpleBatchletScala.scala
@@ -20,4 +20,4 @@ println("stepName: " + stepContext1.getStepName())
 val testName: String = batchProperties1.get("testName").asInstanceOf[String]
 jobContext1.setExitStatus(testName)
 
-return testName;
+testName