This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 0496f4835 KNOX-2957 - Update groovy version to 4.0.29 (#1117)
0496f4835 is described below
commit 0496f4835e56a189b8c2828aea33e3b4d9f337a2
Author: Sandor Molnar <[email protected]>
AuthorDate: Mon Dec 8 16:01:47 2025 +0100
KNOX-2957 - Update groovy version to 4.0.29 (#1117)
---
gateway-shell/pom.xml | 8 ++++----
.../main/java/org/apache/knox/gateway/shell/Shell.java | 4 ++--
.../shell/commands/AbstractKnoxShellCommand.java | 4 ++--
.../shell/commands/AbstractSQLCommandSupport.java | 2 +-
.../apache/knox/gateway/shell/commands/CSVCommand.java | 2 +-
.../knox/gateway/shell/commands/DataSourceCommand.java | 2 +-
.../knox/gateway/shell/commands/LoginCommand.java | 4 ++--
.../knox/gateway/shell/commands/SelectCommand.java | 2 +-
.../knox/gateway/shell/commands/WebHDFSCommand.java | 2 +-
gateway-test-release/webhdfs-kerb-test/pom.xml | 8 ++++----
gateway-test-release/webhdfs-test/pom.xml | 2 +-
gateway-test/pom.xml | 12 ++++++------
pom.xml | 18 ++++++++++++------
13 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/gateway-shell/pom.xml b/gateway-shell/pom.xml
index dca30f802..ac24cba33 100644
--- a/gateway-shell/pom.xml
+++ b/gateway-shell/pom.xml
@@ -47,11 +47,11 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
<exclusions>
<exclusion>
@@ -61,11 +61,11 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
</dependency>
<dependency>
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Shell.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Shell.java
index 782d91032..2cd2192fc 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Shell.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Shell.java
@@ -31,8 +31,8 @@ import org.apache.knox.gateway.shell.manager.Manager;
import org.apache.knox.gateway.shell.table.KnoxShellTable;
import org.apache.knox.gateway.shell.workflow.Workflow;
import org.apache.knox.gateway.shell.yarn.Yarn;
-import org.codehaus.groovy.tools.shell.AnsiDetector;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.AnsiDetector;
+import org.apache.groovy.groovysh.Groovysh;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractKnoxShellCommand.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractKnoxShellCommand.java
index e67003586..f2bca4295 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractKnoxShellCommand.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractKnoxShellCommand.java
@@ -21,8 +21,8 @@ import java.util.List;
import org.apache.knox.gateway.shell.CredentialCollectionException;
import org.apache.knox.gateway.shell.CredentialCollector;
-import org.codehaus.groovy.tools.shell.CommandSupport;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.CommandSupport;
+import org.apache.groovy.groovysh.Groovysh;
public abstract class AbstractKnoxShellCommand extends CommandSupport {
static final String KNOXSQLHISTORY = "__knoxsqlhistory";
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractSQLCommandSupport.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractSQLCommandSupport.java
index 47bed8ae9..50eaf3abc 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractSQLCommandSupport.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/AbstractSQLCommandSupport.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.knox.gateway.shell.KnoxDataSource;
import org.apache.knox.gateway.shell.KnoxSession;
import org.apache.knox.gateway.shell.jdbc.JDBCUtils;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.Groovysh;
public abstract class AbstractSQLCommandSupport extends
AbstractKnoxShellCommand {
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/CSVCommand.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/CSVCommand.java
index 162d4407a..3c1bf73df 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/CSVCommand.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/CSVCommand.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.knox.gateway.shell.table.KnoxShellTable;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.Groovysh;
public class CSVCommand extends AbstractKnoxShellCommand {
private static final String USAGE = ":csv [withHeaders]
file-url||$variable-name [assign resulting-variable-name]";
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/DataSourceCommand.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/DataSourceCommand.java
index d063ac44b..bd01ae9cc 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/DataSourceCommand.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/DataSourceCommand.java
@@ -27,7 +27,7 @@ import
org.apache.knox.gateway.shell.CredentialCollectionException;
import org.apache.knox.gateway.shell.CredentialCollector;
import org.apache.knox.gateway.shell.KnoxDataSource;
import org.apache.knox.gateway.shell.table.KnoxShellTable;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.Groovysh;
public class DataSourceCommand extends AbstractSQLCommandSupport {
private static final String USAGE = ":ds (add|remove|select) [ds-name,
connection-str, driver classname, authntype(none|basic)]";
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/LoginCommand.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/LoginCommand.java
index e532948dc..e82e72d68 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/LoginCommand.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/LoginCommand.java
@@ -23,8 +23,8 @@ import java.util.List;
import org.apache.knox.gateway.shell.CredentialCollectionException;
import org.apache.knox.gateway.shell.KnoxSession;
-import org.codehaus.groovy.tools.shell.CommandSupport;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.CommandSupport;
+import org.apache.groovy.groovysh.Groovysh;
public class LoginCommand extends CommandSupport {
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/SelectCommand.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/SelectCommand.java
index 6128e0692..da654e84a 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/SelectCommand.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/SelectCommand.java
@@ -35,7 +35,7 @@ import javax.swing.JTextArea;
import org.apache.knox.gateway.shell.CredentialCollector;
import org.apache.knox.gateway.shell.KnoxDataSource;
import org.apache.knox.gateway.shell.table.KnoxShellTable;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.Groovysh;
public class SelectCommand extends AbstractSQLCommandSupport implements
KeyListener {
private static final String USAGE = ":sql [assign resulting-variable-name]";
diff --git
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/WebHDFSCommand.java
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/WebHDFSCommand.java
index f9f1731b0..4dc6d8888 100644
---
a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/WebHDFSCommand.java
+++
b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/commands/WebHDFSCommand.java
@@ -38,7 +38,7 @@ import org.apache.knox.gateway.shell.hdfs.Hdfs;
import org.apache.knox.gateway.shell.hdfs.Status.Response;
import org.apache.knox.gateway.shell.table.KnoxShellTable;
import org.apache.knox.gateway.util.JsonUtils;
-import org.codehaus.groovy.tools.shell.Groovysh;
+import org.apache.groovy.groovysh.Groovysh;
public class WebHDFSCommand extends AbstractKnoxShellCommand {
private static final String DESC = "POSIX style commands for Hadoop
Filesystems";
diff --git a/gateway-test-release/webhdfs-kerb-test/pom.xml
b/gateway-test-release/webhdfs-kerb-test/pom.xml
index 6cecfd751..f5b6c1641 100644
--- a/gateway-test-release/webhdfs-kerb-test/pom.xml
+++ b/gateway-test-release/webhdfs-kerb-test/pom.xml
@@ -99,22 +99,22 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-swing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/gateway-test-release/webhdfs-test/pom.xml
b/gateway-test-release/webhdfs-test/pom.xml
index 36ce9863c..aad1a6380 100644
--- a/gateway-test-release/webhdfs-test/pom.xml
+++ b/gateway-test-release/webhdfs-test/pom.xml
@@ -89,7 +89,7 @@
<!-- End Hadoop dependencies -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index e4fd1cc47..9fc7b6ef4 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -187,15 +187,15 @@
<artifactId>groovy-xml</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
</exclusion>
</exclusions>
@@ -214,15 +214,15 @@
<artifactId>groovy-xml</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
</exclusion>
</exclusions>
diff --git a/pom.xml b/pom.xml
index 9f3bae94f..a6c45fd68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
<glassfish-jaxb.version>4.0.5</glassfish-jaxb.version>
<gson.version>2.10.1</gson.version>
<gsonfire.version>1.9.0</gsonfire.version>
- <groovy.version>3.0.21</groovy.version>
+ <groovy.version>4.0.29</groovy.version>
<guava.version>32.1.3-jre</guava.version>
<hadoop.version>3.4.1</hadoop.version>
<hamcrest.version>2.2</hamcrest.version>
@@ -1620,27 +1620,33 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
<version>${groovy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-swing</artifactId>
<version>${groovy.version}</version>
</dependency>
