From 215f03ce80492ab6dbe1ffce0c693834c7a741c7 Mon Sep 17 00:00:00 2001
From: 924060929 <924060929@qq.com>
Date: Thu, 7 Mar 2024 11:43:44 +0800
Subject: [PATCH] upgrade groovy to 4.x
---
regression-test/framework/pom.xml | 89 ++++++-------------
.../regression/suite/ScriptSource.groovy | 2 +-
.../doris/regression/util/DataUtils.groovy | 2 +-
3 files changed, 31 insertions(+), 62 deletions(-)
diff --git a/regression-test/framework/pom.xml b/regression-test/framework/pom.xml
index e16b178334d7c5e..4c22fe22f13cd26 100644
--- a/regression-test/framework/pom.xml
+++ b/regression-test/framework/pom.xml
@@ -71,9 +71,7 @@ under the License.
1.8
1.0-SNAPSHOT
github
- 3.0.7
- 3.0.7-01
- 3.7.0
+ 4.0.19
4.9.3
2.8.0
15.0.0
@@ -86,33 +84,19 @@ under the License.
1.2.5
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.9.0
-
- groovy-eclipse-compiler
- ${maven.compiler.source}
- ${maven.compiler.target}
- true
-
-
-
- org.codehaus.groovy
- groovy-eclipse-compiler
- ${groovy-eclipse-compiler.version}
-
-
- org.codehaus.groovy
- groovy-eclipse-batch
- ${groovy-eclipse-batch.version}
-
-
-
-
- org.codehaus.groovy
- groovy-eclipse-compiler
- ${groovy-eclipse-compiler.version}
- true
+ org.codehaus.gmavenplus
+ gmavenplus-plugin
+ 3.0.2
+
+
+
+ addSources
+ addTestSources
+ compile
+ compileTests
+
+
+
org.apache.maven.plugins
@@ -168,35 +152,6 @@ under the License.
-
-
-
- org.codehaus.mojo
- flatten-maven-plugin
- 1.2.5
-
- true
- bom
-
-
-
- flatten
- process-resources
-
- flatten
-
-
-
- flatten.clean
- clean
-
- clean
-
-
-
-
-
-
@@ -212,7 +167,7 @@ under the License.
2.10.1
- org.codehaus.groovy
+ org.apache.groovy
groovy-all
${groovy.version}
pom
@@ -301,11 +256,25 @@ under the License.
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
+
+
+
+ jdk.tools
+ jdk.tools
+
+
org.apache.hive
hive-jdbc
2.3.7
+
+
+
+ jdk.tools
+ jdk.tools
+
+
org.apache.arrow
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptSource.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptSource.groovy
index 4db9b7fce3808f7..d73cf6afaf6b09a 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptSource.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptSource.groovy
@@ -76,11 +76,11 @@ class SqlFileSource implements ScriptSource {
SuiteScript script = new SuiteScript() {
@Override
Object run() {
+ List sqls = getSqls(file.text)
suite(suiteName, groupName) {
String tag = suiteName
String exceptionStr = ""
boolean order = suiteName.endsWith("_order")
- List sqls = getSqls(file.text)
log.info("Try to execute group: ${groupName} suite: ${suiteName} with ${sqls.size()} stmts")
for (int i = 0; i < sqls.size(); ++i) {
String singleSql = sqls.get(i)
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/DataUtils.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/DataUtils.groovy
index ec85ca645a6eb9c..9d01acca00ab82f 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/DataUtils.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/DataUtils.groovy
@@ -24,7 +24,7 @@ class DataUtils {
// null first, order by column.toString asc
static List> sortByToString(List> originData) {
def comparator = Comparator.naturalOrder()
- originData.sort(false, { row1, row2 ->
+ originData.sort(false, { List