replaced deprecated parser

Author: TomBlock

core/src/main/java/com/bc/fiduceo/db/DbMaintenanceToolMain.java

@@ -1,9 +1,6 @@
 package com.bc.fiduceo.db;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.*;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -18,7 +15,7 @@ public static void main(String[] args) throws ParseException {
             return;
         }
 
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine commandLine = parser.parse(DbMaintenanceTool.getOptions(), args);
         if (commandLine.hasOption("h") || commandLine.hasOption("--help")) {
             maintenanceTool.printUsageTo(System.out);

core/src/main/java/com/bc/fiduceo/qc/MmdQCToolMain.java

@@ -1,10 +1,7 @@
 package com.bc.fiduceo.qc;
 
 import com.bc.fiduceo.log.FiduceoLogger;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.*;
 
 public class MmdQCToolMain {
 
@@ -16,7 +13,7 @@ public static void main(String[] args) throws ParseException {
             return;
         }
 
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine commandLine = parser.parse(MmdQCTool.getOptions(), args);
         if (commandLine.hasOption("h") || commandLine.hasOption("--help")) {
             MmdQCTool.printUsageTo(System.err);

ingestion-tool/src/main/java/com/bc/fiduceo/ingest/IngestionToolMain.java

@@ -21,10 +21,7 @@
 package com.bc.fiduceo.ingest;
 
 import com.bc.fiduceo.log.FiduceoLogger;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.*;
 
 public class IngestionToolMain {
 
@@ -36,7 +33,7 @@ public static void main(String[] args) throws ParseException {
             return;
         }
 
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine commandLine = parser.parse(IngestionTool.getOptions(), args);
         if (commandLine.hasOption("h") || commandLine.hasOption("--help")) {
             ingestionTool.printUsageTo(System.out);

ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolIntegrationTest.java

@@ -34,8 +34,8 @@
 import com.bc.fiduceo.tool.ToolContext;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -117,7 +117,7 @@ public void testIngest_errorStopDateBeforeStartDate() throws ParseException, IOE
                 "-start", "2001-004",
                 "-end", "2001-001"
         };
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine commandLine = parser.parse(IngestionTool.getOptions(), args);
 
         final IngestionTool ingestionTool = new IngestionTool();

matchup-tool/src/main/java/com/bc/fiduceo/matchup/MatchupToolMain.java

@@ -21,10 +21,7 @@
 package com.bc.fiduceo.matchup;
 
 import com.bc.fiduceo.log.FiduceoLogger;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.*;
 
 public class MatchupToolMain {
 
@@ -36,7 +33,7 @@ public static void main(String[] args) throws ParseException {
             return;
         }
 
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine commandLine = parser.parse(MatchupTool.getOptions(), args);
         if (commandLine.hasOption("h") || commandLine.hasOption("--help")) {
             matchupTool.printUsageTo(System.err);

post-processing-tool/src/main/java/com/bc/fiduceo/post/PostProcessingToolMain.java

@@ -23,15 +23,12 @@
 
 import com.bc.fiduceo.log.FiduceoLogger;
 import com.bc.fiduceo.tool.ShutdownHook;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.*;
 
 public class PostProcessingToolMain {
 
     public static void main(String[] args) {
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine commandLine;
         try {
             commandLine = parser.parse(PostProcessingTool.getOptions(), args);

post-processing-tool/src/test/java/com/bc/fiduceo/post/PostProcessingTool_IOTest.java

@@ -24,8 +24,8 @@
 import com.bc.fiduceo.TestUtil;
 import com.bc.fiduceo.core.SystemConfig;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.esa.snap.core.datamodel.ProductData;
 import org.esa.snap.core.util.io.FileUtils;
 import org.jdom2.Element;
@@ -83,7 +83,7 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown()  {
+    public void tearDown() {
         if (testDir.isDirectory()) {
             FileUtils.deleteTree(testDir);
         }
@@ -92,7 +92,7 @@ public void tearDown()  {
     @Test
     public void testInitialisation() throws Exception {
         final Options options = PostProcessingTool.getOptions();
-        final PosixParser parser = new PosixParser();
+        final DefaultParser parser = new DefaultParser();
         final CommandLine commandLine = parser.parse(options, new String[]{
                 "-j", processingConfigName,
                 "-i", "/mmd_files",