update picocli to 4.6.1 (#321)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/ImageTool.java

@@ -15,7 +15,6 @@
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
-import picocli.CommandLine.HelpCommand;
 import picocli.CommandLine.ParseResult;
 
 import static picocli.CommandLine.ExitCode;
@@ -27,12 +26,11 @@
         versionProvider = HelpVersionProvider.class,
         sortOptions = false,
         subcommands = {
-                CacheCLI.class,
-                CreateImage.class,
-                UpdateImage.class,
-                RebaseImage.class,
-                InspectImage.class,
-                HelpCommand.class
+            CacheCLI.class,
+            CreateImage.class,
+            UpdateImage.class,
+            RebaseImage.class,
+            InspectImage.class
         },
         requiredOptionMarker = '*',
         abbreviateSynopsis = true,

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheAddOperation.java

@@ -8,7 +8,7 @@
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
 import com.oracle.weblogic.imagetool.cachestore.CacheStoreException;
-import picocli.CommandLine;
+import picocli.CommandLine.Option;
 
 import static com.oracle.weblogic.imagetool.cachestore.CacheStoreFactory.cache;
 
@@ -45,14 +45,14 @@ Path absolutePath() {
 
     private Path absolutePath = null;
 
-    @CommandLine.Option(
+    @Option(
         names = {"--force"},
         description = "Overwrite existing entry, if it exists"
     )
     private boolean force = false;
 
 
-    @CommandLine.Option(
+    @Option(
         names = {"--path"},
         description = "Location on disk. For ex: /path/to/patch-or-installer.zip",
         required = true

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheCLI.java

@@ -7,7 +7,6 @@
 
 import com.oracle.weblogic.imagetool.cli.HelpVersionProvider;
 import picocli.CommandLine.Command;
-import picocli.CommandLine.HelpCommand;
 import picocli.CommandLine.Unmatched;
 
 @Command(
@@ -20,8 +19,7 @@
                 AddInstallerEntry.class,
                 AddPatchEntry.class,
                 AddEntry.class,
-                DeleteEntry.class,
-                HelpCommand.class
+                DeleteEntry.class
         },
         sortOptions = false
 )

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheOperation.java

@@ -3,7 +3,6 @@
 
 package com.oracle.weblogic.imagetool.cli.cache;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
@@ -15,7 +14,7 @@
 public abstract class CacheOperation implements Callable<CommandResponse> {
 
     @Unmatched
-    List<String> unmatchedOptions = new ArrayList<>();
+    List<String> unmatchedOptions;
 
     @Spec
     CommandSpec spec;

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/InspectImage.java

@@ -12,9 +12,10 @@
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
 import com.oracle.weblogic.imagetool.inspect.InspectOutput;
 import com.oracle.weblogic.imagetool.util.Utils;
-import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
-@CommandLine.Command(
+@Command(
     name = "inspect",
     description = "Inspect an image created by this tool",
     requiredOptionMarker = '*',
@@ -40,28 +41,28 @@ public CommandResponse call() throws Exception {
         return CommandResponse.success(null);
     }
 
-    @CommandLine.Option(
+    @Option(
         names = {"--image", "-i"},
         required = true,
         paramLabel = "IMAGE:ID",
         description = "Image ID or image name to be inspected"
     )
     private String imageName;
 
-    @CommandLine.Option(
+    @Option(
         names = {"--builder", "-b"},
         description = "Executable to inspect docker images. Default: ${DEFAULT-VALUE}"
     )
     String buildEngine = "docker";
 
-    @CommandLine.Option(
+    @Option(
         names = {"--patches"},
         description = "Include OPatch information in the output, including a list of patches applied.",
         defaultValue = "false"
     )
     private boolean listPatches;
 
-    @CommandLine.Option(
+    @Option(
         names = {"--format"},
         paramLabel = "FORMAT",
         description = "Output format. Supported values: ${COMPLETION-CANDIDATES} Default: ${DEFAULT-VALUE}",

imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/ImageToolTest.java

@@ -49,7 +49,7 @@ void testHelp() {
         // HELP argument should return usage but success code
         CommandResponse response = ImageTool.run(ImageTool.class, printStream, printStream, "help");
         assertNotNull(response);
-        assertEquals(0, response.getStatus());
+        assertEquals(2, response.getStatus());
         assertTrue(byteArrayOutputStream.toString().contains("Usage: imagetool [OPTIONS]"));
     }
 

pom.xml

@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>info.picocli</groupId>
                 <artifactId>picocli</artifactId>
-                <version>4.3.2</version>
+                <version>4.6.1</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>