KNOX-3278: Update JLine to 3.30.6

gateway-provider-security-jwt/pom.xml

@@ -78,11 +78,6 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jline</groupId>
-            <artifactId>jline</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>

gateway-shell-release/home/bin/knoxshell.sh

@@ -81,7 +81,7 @@ function main {
 
    checkJava
    buildAppJavaOpts
-   $JAVA "${APP_JAVA_OPTS[@]}" -Dlog4j.configurationFile=conf/knoxshell-log4j2.xml -javaagent:"$APP_BIN_DIR"/../lib/aspectjweaver.jar -cp "$APP_JAR":lib/* org.apache.knox.gateway.shell.Shell "$@" || exit 1
+   $JAVA "${APP_JAVA_OPTS[@]}" -Dlog4j.configurationFile=conf/knoxshell-log4j2.xml -javaagent:"$APP_BIN_DIR"/../lib/aspectjweaver.jar -cp "$APP_JAR":lib/* -cp "$APP_JAR":lib/* org.apache.knox.gateway.launcher.Launcher "$@" || exit 1
 
    return 0
 }

gateway-shell-release/home/conf/knoxshell-log4j2.xml

@@ -15,10 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<?xml version="1.0" encoding="utf-8"?>
 <Configuration>
     <Properties>
-        <Property name="app.log.dir">logs</Property>
+        <Property name="app.log.dir">${sys:launcher.dir}/../logs</Property>
         <Property name="app.log.file">${sys:launcher.name}.log</Property>
     </Properties>
     <Appenders>

gateway-shell-release/pom.xml

@@ -43,8 +43,15 @@
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.apache.knox.gateway.launcher.Launcher</mainClass>
+                                    <manifestEntries>
+                                        <Multi-Release>true</Multi-Release>
+                                    </manifestEntries>
                                 </transformer>
                             </transformers>
                             <filters>
@@ -54,6 +61,7 @@
                                     <excludes>
                                         <exclude>schema/**</exclude>
                                         <exclude>**/*.ldif</exclude>
+                                        <exclude>META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat</exclude>
                                     </excludes>
                                 </filter>
                                 <filter>

gateway-shell/pom.xml

@@ -53,12 +53,6 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-groovysh</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>jline</groupId>
-                    <artifactId>jline</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
@@ -69,20 +63,32 @@
             <artifactId>groovy-json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.fusesource.jansi</groupId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jansi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jline</groupId>
-            <artifactId>jline</artifactId>
+            <artifactId>jline-builtins</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-console</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-reader</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-terminal</artifactId>
         </dependency>
         <dependency>
             <groupId>net.minidev</groupId>

gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractCredentialCollector.java

@@ -63,4 +63,4 @@ public String name() {
     return name;
   }
 
-}
+}

gateway-shell/src/main/java/org/apache/knox/gateway/shell/AbstractJavaConsoleCredentialCollector.java

@@ -59,4 +59,4 @@ public boolean validate() {
     }
     return rc;
   }
-}
+}

gateway-shell/src/main/java/org/apache/knox/gateway/shell/HttpDelete.java

@@ -39,4 +39,4 @@ public HttpDelete(URI uri) {
   public String getMethod() {
     return org.apache.http.client.methods.HttpDelete.METHOD_NAME;
   }
-}
+}

gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxShellCommandRegistry.java

@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.knox.gateway.shell;
+import org.jline.console.CommandRegistry;
+import org.jline.console.CommandMethods;
+import org.jline.console.CommandInput;
+import org.jline.console.CmdDesc;
+import org.jline.reader.Completer;
+import org.jline.reader.impl.completer.NullCompleter;
+import org.jline.reader.impl.completer.SystemCompleter;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class KnoxShellCommandRegistry implements CommandRegistry {
+
+    private final Map<String, CommandMethods> commands;
+    private final Map<String, String> aliases;
+
+    public KnoxShellCommandRegistry(Map<String, CommandMethods> commands, Map<String, String> aliases) {
+        this.commands = commands;
+        this.aliases = aliases != null ? aliases : Collections.emptyMap();
+    }
+
+    @Override
+    public String name() {
+        return "";
+    }
+
+    @Override
+    public boolean hasCommand(String command) {
+        return commands.containsKey(command) || aliases.containsKey(command);
+    }
+
+    @Override
+    public Set<String> commandNames() {
+        return commands.keySet();
+    }
+
+    @Override
+    public Map<String, String> commandAliases() {
+        return aliases;
+    }
+
+    @Override
+    public List<String> commandInfo(String command) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public CmdDesc commandDescription(List<String> args) {
+        return new CmdDesc(false); // Disables floating tooltip widgets for these commands
+    }
+
+    @Override
+    public SystemCompleter compileCompleters() {
+        SystemCompleter out = new SystemCompleter();
+
+        // Add all our main commands to the JLine completion engine
+        for (String cmd : commands.keySet()) {
+            out.add(cmd, getCompletersForCommand(cmd));
+        }
+
+        // Tell JLine to wire up all shortcuts to the exact same completion logic
+        out.addAliases(aliases);
+        return out;
+    }
+
+    @Override
+    public Object invoke(CommandSession session, String command, Object... args) throws Exception {
+        // Resolve shortcut to full command, or keep as-is
+        String actualCommand = aliases.getOrDefault(command, command);
+        CommandMethods methods = commands.get(actualCommand);
+
+        if (methods != null && methods.execute() != null) {
+            CommandInput input = new CommandInput(command, args, session);
+            return methods.execute().apply(input);
+        }
+        return null;
+    }
+
+    private List<Completer> getCompletersForCommand(String command) {
+        String actualCommand = aliases.getOrDefault(command, command);
+        CommandMethods methods = commands.get(actualCommand);
+
+        if (methods != null && methods.compileCompleter() != null) {
+            return methods.compileCompleter().apply(actualCommand);
+        }
+        return Collections.singletonList(NullCompleter.INSTANCE);
+    }
+}

gateway-shell/src/main/java/org/apache/knox/gateway/shell/SafeCompleter.java

@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.knox.gateway.shell;
+
+import org.jline.reader.Candidate;
+import org.jline.reader.Completer;
+import org.jline.reader.LineReader;
+import org.jline.reader.ParsedLine;
+
+import java.util.List;
+
+/**
+ * A wrapper to protect JLine from crashing when underlying completers
+ * (like Groovy's reflection completer) throw unexpected JVM exceptions.
+ */
+public class SafeCompleter implements Completer {
+    private final Completer delegate;
+
+    public SafeCompleter(Completer delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
+        if (delegate == null) {
+            return;
+        }
+        try {
+            delegate.complete(reader, line, candidates);
+        } catch (Throwable t) {
+            // ignore
+        }
+    }
+}