Fix up merge related compile errors

airline-core/src/main/java/com/github/rvesse/airline/Cli.java

@@ -30,7 +30,7 @@
  * @deprecated Renamed to {@link CommandLineInterface} to avoid ambiguity with
  *             {@link com.github.rvesse.airline.annotations.Cli} annotation
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 public class Cli<C> extends CommandLineInterface<C> {
 
     /**
@@ -45,7 +45,7 @@ public class Cli<C> extends CommandLineInterface<C> {
      *             with {@link com.github.rvesse.airline.annotations.Cli}
      *             annotation
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static <T> CliBuilder<T> builder(String name) {
         if (name == null)
             throw new NullPointerException("name cannot be null");
@@ -62,7 +62,7 @@ public static <T> CliBuilder<T> builder(String name) {
      *             with {@link com.github.rvesse.airline.annotations.Cli}
      *             annotation
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public Cli(Class<?> cliClass) {
         this(MetadataLoader.<C> loadGlobal(cliClass));
     }
@@ -82,7 +82,7 @@ public Cli(Class<?> cliClass) {
      *             with {@link com.github.rvesse.airline.annotations.Cli}
      *             annotation
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public Cli(Class<?> cliClass, ParserMetadata<C> parserConfig) {
         this(MetadataLoader.<C> loadGlobal(cliClass, parserConfig));
     }
@@ -96,7 +96,7 @@ public Cli(Class<?> cliClass, ParserMetadata<C> parserConfig) {
      *             with {@link com.github.rvesse.airline.annotations.Cli}
      *             annotation
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public Cli(GlobalMetadata<C> metadata) {
         super(metadata);
     }

airline-core/src/test/java/com/github/rvesse/airline/tests/Git.java

@@ -17,6 +17,7 @@
 
 import java.util.List;
 
+import com.github.rvesse.airline.CommandLineInterface;
 import com.github.rvesse.airline.annotations.Arguments;
 import com.github.rvesse.airline.annotations.Command;
 import com.github.rvesse.airline.annotations.Option;

airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation.java

@@ -15,6 +15,7 @@
  */
 package com.github.rvesse.airline.tests;
 
+import com.github.rvesse.airline.CommandLineInterface;
 import com.github.rvesse.airline.tests.Git.Add;
 import com.github.rvesse.airline.tests.Git.RemoteAdd;
 import com.github.rvesse.airline.tests.Git.RemoteShow;

airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation2.java

@@ -15,6 +15,7 @@
  */
 package com.github.rvesse.airline.tests;
 
+import com.github.rvesse.airline.CommandLineInterface;
 import com.github.rvesse.airline.tests.Git.Add;
 import com.github.rvesse.airline.tests.Git.RemoteAdd;
 import com.github.rvesse.airline.tests.Git.RemoteShow;
@@ -47,7 +48,7 @@
 public class GitWithCliAnnotation2 extends Git {
 
     public static void run(String[] args) {
-        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<Runnable>(
+        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<>(
                 GitWithCliAnnotation2.class);
 
         gitParser.parse(args).run();

airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommandSuppression.java

@@ -16,6 +16,7 @@
 package com.github.rvesse.airline.tests;
 
 import com.github.rvesse.airline.Cli;
+import com.github.rvesse.airline.CommandLineInterface;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

airline-core/src/test/java/com/github/rvesse/airline/tests/TestDefaultCommand.java

@@ -19,6 +19,7 @@
 import java.util.List;
 
 import com.github.rvesse.airline.Cli;
+import com.github.rvesse.airline.CommandLineInterface;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParserByAnnotation.java

@@ -16,6 +16,7 @@
 package com.github.rvesse.airline.tests;
 
 import com.github.rvesse.airline.Cli;
+import com.github.rvesse.airline.CommandLineInterface;
 import org.testng.annotations.Test;
 
 import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.AgentAddCommand;

airline-core/src/test/java/com/github/rvesse/airline/tests/TestGitByAnnotation.java

@@ -15,6 +15,7 @@
  */
 package com.github.rvesse.airline.tests;
 
+import com.github.rvesse.airline.CommandLineInterface;
 import org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -69,7 +70,7 @@ public void testParserConfigOverride2() {
         gitOverridden(parserConfig, "remote", "sh");
 
         // This returns help because the alias definition from the base config is overridden by the provided parser config
-        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<Runnable>(
+        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<>(
                 GitWithCliAnnotation2.class, parserConfig);
         Runnable cmd = gitParser.parse("foo");
         Assert.assertEquals(cmd.getClass(), Help.class);
@@ -83,7 +84,7 @@ private void git(String... args) {
 
     private void git(ParserMetadata<Runnable> parserConfig, String... args) {
         System.out.println("$ git " + StringUtils.join(args, ' '));
-        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<Runnable>(
+        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<>(
                 GitWithCliAnnotation.class, parserConfig);
 
         gitParser.parse(args).run();
@@ -92,7 +93,7 @@ private void git(ParserMetadata<Runnable> parserConfig, String... args) {
 
     private void gitOverridden(ParserMetadata<Runnable> parserConfig, String... args) {
         System.out.println("$ git " + StringUtils.join(args, ' '));
-        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<Runnable>(
+        CommandLineInterface<Runnable> gitParser = new CommandLineInterface<>(
                 GitWithCliAnnotation2.class, parserConfig);
 
         gitParser.parse(args).run();

airline-core/src/test/java/com/github/rvesse/airline/tests/TestOptionScope.java

@@ -15,7 +15,7 @@
  */
 package com.github.rvesse.airline.tests;
 
-import com.github.rvesse.airline.Cli;
+import com.github.rvesse.airline.CommandLineInterface;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

airline-core/src/test/java/com/github/rvesse/airline/tests/TestParametersDelegate.java

@@ -16,6 +16,7 @@
 package com.github.rvesse.airline.tests;
 
 import com.github.rvesse.airline.Cli;
+import com.github.rvesse.airline.CommandLineInterface;
 import com.github.rvesse.airline.SingleCommand;
 import com.github.rvesse.airline.annotations.*;
 import com.github.rvesse.airline.builder.ParserBuilder;
@@ -64,10 +65,10 @@ public static class EmptyDelegate {
 
     @Test
     public void delegatingEmptyClassHasNoEffect() {
-        DelegatingEmptyClassHasNoEffect p = Cli.<DelegatingEmptyClassHasNoEffect>builder("foo")
-                                               .withCommand(DelegatingEmptyClassHasNoEffect.class)
-                                               .build()
-                                               .parse("command", "-a", "-b", "someValue");
+        DelegatingEmptyClassHasNoEffect p = CommandLineInterface.<DelegatingEmptyClassHasNoEffect>builder("foo")
+                                                                .withCommand(DelegatingEmptyClassHasNoEffect.class)
+                                                                .build()
+                                                                .parse("command", "-a", "-b", "someValue");
 
         assertTrue(p.isA);
         assertEquals(p.bValue, "someValue");

airline-core/src/test/java/com/github/rvesse/airline/tests/TestSubGroups.java

@@ -198,7 +198,7 @@ public void sub_groups_help_02() throws IOException {
     public void sub_groups_help_02_without_help_command() throws IOException {
         //@formatter:off
         CliBuilder<Object> builder
-            = Cli.<Object>builder("test");
+            = CommandLineInterface.builder("test");
         builder.withGroup("foo")
                .withSubGroup("bar")
                .withDefaultCommand(Help.class);

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositional.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalConflict.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalDuplicate.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalGap.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalNoExtras.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalOverride.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.rvesse.airline.tests.args.positional;
 
 import com.github.rvesse.airline.annotations.Command;

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalOverrideChild.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.rvesse.airline.tests.args.positional;
 
 import com.github.rvesse.airline.annotations.Command;

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalRequiredAfterOptional.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/ArgsPositionalRequiredAfterOptional2.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

airline-core/src/test/java/com/github/rvesse/airline/tests/args/positional/TestPositionalArgs.java

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2010-22 the original author or authors.
+/**
+ * Copyright (C) 2010-16 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.rvesse.airline.tests.args.positional;
 
 import com.github.rvesse.airline.SingleCommand;
 import com.github.rvesse.airline.help.cli.CliCommandUsageGenerator;
 import com.github.rvesse.airline.model.PositionalArgumentMetadata;
 import com.github.rvesse.airline.parser.errors.ParseArgumentsUnexpectedException;
 
-import static com.github.rvesse.airline.TestingUtil.singleCommandParser;
+import static com.github.rvesse.airline.tests.TestingUtil.singleCommandParser;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -56,7 +55,7 @@ public void positional_args_01() {
 
         ArgsPositional cmd = parser.parse("example.txt", "600", "extra");
         assertEquals(cmd.file, "example.txt");
-        assertEquals(cmd.mode, new Integer(600));
+        assertEquals(cmd.mode, Integer.valueOf(600));
         assertEquals(cmd.parameters.size(), 1);
         assertEquals(cmd.parameters.get(0), "extra");
     }
@@ -67,7 +66,7 @@ public void positional_args_02() {
         ArgsPositional cmd = parser.parse("example.txt", "600", "extra", "other", "another");
 
         assertEquals(cmd.file, "example.txt");
-        assertEquals(cmd.mode, new Integer(600));
+        assertEquals(cmd.mode, Integer.valueOf(600));
         assertEquals(cmd.parameters.size(), 3);
         assertEquals(cmd.parameters.get(0), "extra");
         assertEquals(cmd.parameters.get(1), "other");
@@ -84,7 +83,7 @@ public void positional_args_03() {
         assertEquals(cmd.file, "example.txt");
         assertEquals(cmd.otherFile, "example.txt");
         assertEquals(cmd.file, cmd.otherFile);
-        assertEquals(cmd.mode, new Integer(600));
+        assertEquals(cmd.mode, Integer.valueOf(600));
         assertEquals(cmd.parameters.size(), 1);
         assertEquals(cmd.parameters.get(0), "extra");
     }
@@ -110,7 +109,7 @@ public void positional_args_04() {
 
         ArgsPositional cmd = parser.parse("example.txt", "600", "extra");
         assertEquals(cmd.file, "example.txt");
-        assertEquals(cmd.mode, new Integer(600));
+        assertEquals(cmd.mode, Integer.valueOf(600));
         assertEquals(cmd.parameters.size(), 1);
         assertEquals(cmd.parameters.get(0), "extra");
     }
@@ -123,7 +122,7 @@ public void positional_args_05() {
 
         ArgsPositionalNoExtras cmd = parser.parse("example.txt", "600");
         assertEquals(cmd.file, "example.txt");
-        assertEquals(cmd.mode, new Integer(600));
+        assertEquals(cmd.mode, Integer.valueOf(600));
     }
 
     @Test(expectedExceptions = ParseArgumentsUnexpectedException.class)
@@ -134,7 +133,7 @@ public void positional_args_06() {
 
         ArgsPositionalNoExtras cmd = parser.parse("example.txt", "600", "extra");
         assertEquals(cmd.file, "example.txt");
-        assertEquals(cmd.mode, new Integer(600));
+        assertEquals(cmd.mode, Integer.valueOf(600));
     }
 
     @Test(expectedExceptions = IllegalStateException.class)