update airline dependency to 2.x

core/pom.xml

@@ -172,7 +172,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>io.airlift</groupId>
+      <groupId>com.github.rvesse</groupId>
       <artifactId>airline</artifactId>
     </dependency>
     <dependency>

core/src/main/java/org/apache/druid/cli/CliCommandCreator.java

@@ -19,7 +19,7 @@
 
 package org.apache.druid.cli;
 
-import io.airlift.airline.Cli;
+import com.github.rvesse.airline.builder.CliBuilder;
 import org.apache.druid.guice.annotations.ExtensionPoint;
 
 /**
@@ -32,5 +32,5 @@
 @ExtensionPoint
 public interface CliCommandCreator
 {
-  void addCommands(Cli.CliBuilder builder);
+  void addCommands(CliBuilder builder);
 }

indexing-service/pom.xml

@@ -85,6 +85,10 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
@@ -105,10 +109,6 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>

integration-tests/pom.xml

@@ -62,7 +62,7 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.airlift</groupId>
+            <groupId>com.github.rvesse</groupId>
             <artifactId>airline</artifactId>
         </dependency>
         <dependency>
@@ -602,7 +602,7 @@
                                         <KAFKA_VERSION>${apache.kafka.version}</KAFKA_VERSION>
                                         <ZK_VERSION>${zookeeper.version}</ZK_VERSION>
                                         <HADOOP_VERSION>${hadoop.compile.version}</HADOOP_VERSION>
-                                        <DRUID_VERSION>${parent.version}</DRUID_VERSION>
+                                        <DRUID_VERSION>${project.parent.version}</DRUID_VERSION>
                                     </environmentVariables>
                                     <executable>${project.basedir}/build_run_cluster.sh</executable>
                                 </configuration>
@@ -619,7 +619,7 @@
                                         <DRUID_INTEGRATION_TEST_GROUP>${groups}</DRUID_INTEGRATION_TEST_GROUP>
                                         <DRUID_INTEGRATION_TEST_OVERRIDE_CONFIG_PATH>${override.config.path}</DRUID_INTEGRATION_TEST_OVERRIDE_CONFIG_PATH>
                                         <DRUID_INTEGRATION_TEST_INDEXER>${it.indexer}</DRUID_INTEGRATION_TEST_INDEXER>
-                                        <DRUID_VERSION>${parent.version}</DRUID_VERSION>
+                                        <DRUID_VERSION>${project.parent.version}</DRUID_VERSION>
                                     </environmentVariables>
                                     <executable>${project.basedir}/stop_cluster.sh</executable>
                                 </configuration>

integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java

@@ -20,6 +20,7 @@
 package org.apache.druid.cli;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.rvesse.airline.annotations.Command;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
@@ -28,7 +29,6 @@
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.google.inject.servlet.GuiceFilter;
-import io.airlift.airline.Command;
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.discovery.NodeRole;
 import org.apache.druid.guice.Jerseys;

integration-tests/src/main/java/org/apache/druid/cli/CliHistoricalForQueryErrorTest.java

@@ -19,9 +19,9 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Command;
 import com.google.inject.Binder;
 import com.google.inject.Inject;
-import io.airlift.airline.Command;
 import org.apache.druid.guice.LazySingleton;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.query.QuerySegmentWalker;

integration-tests/src/main/java/org/apache/druid/cli/CustomNodeRoleCommandCreator.java

@@ -19,12 +19,12 @@
 
 package org.apache.druid.cli;
 
-import io.airlift.airline.Cli;
+import com.github.rvesse.airline.builder.CliBuilder;
 
 public class CustomNodeRoleCommandCreator implements CliCommandCreator
 {
   @Override
-  public void addCommands(Cli.CliBuilder builder)
+  public void addCommands(CliBuilder builder)
   {
     builder.withGroup("server").withCommands(CliCustomNodeRole.class);
   }

integration-tests/src/main/java/org/apache/druid/cli/QueryRetryTestCommandCreator.java

@@ -19,7 +19,7 @@
 
 package org.apache.druid.cli;
 
-import io.airlift.airline.Cli.CliBuilder;
+import com.github.rvesse.airline.builder.CliBuilder;
 
 public class QueryRetryTestCommandCreator implements CliCommandCreator
 {

licenses.yaml

@@ -732,14 +732,18 @@ name: Airline
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 0.7
+version: 2.8.4
 libraries:
-  - io.airlift: airline
+  - com.github.rvesse: airline
+  - com.github.rvesse: airline-io
 notices:
   - airline: |
       Copyright Notices
       =================
 
+      Copyright 2013-18 Rob Vesse <[email protected]>
+      Copyright 2013 Fernando Hernandez <[email protected]>
+      Copyright 2013 Michael Grove <[email protected]>
       Copyright 2011 Dain Sundstrom <[email protected]>
       Copyright 2010 Cedric Beust <[email protected]>
 
@@ -1501,6 +1505,16 @@ libraries:
 
 ---
 
+name: Jakarta Dependency Injection
+license_category: binary
+module: java-core
+license_name: Apache License version 2.0
+version: 1.0.3
+libraries:
+  - jakarta.inject: jakarta.inject-api
+
+---
+
 name: Javax Inject
 license_category: binary
 module: java-core

pom.xml

@@ -278,16 +278,9 @@
                 <version>1.0.4</version>
             </dependency>
             <dependency>
-                <groupId>io.airlift</groupId>
+                <groupId>com.github.rvesse</groupId>
                 <artifactId>airline</artifactId>
-                <version>0.7</version>
-                <exclusions>
-                    <exclusion>
-                        <!--LGPL licenced library-->
-                        <groupId>com.google.code.findbugs</groupId>
-                        <artifactId>annotations</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>2.8.4</version>
             </dependency>
             <dependency>
                 <groupId>org.skife.config</groupId>
@@ -472,9 +465,9 @@
                 <version>1.1.0.Final</version>
             </dependency>
             <dependency>
-                <groupId>javax.inject</groupId>
-                <artifactId>javax.inject</artifactId>
-                <version>1</version>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+                <version>1.0.3</version>
             </dependency>
             <dependency>
                 <groupId>javax.el</groupId>

processing/pom.xml

@@ -145,12 +145,12 @@
             <artifactId>joda-time</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

server/pom.xml

@@ -67,8 +67,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.zookeeper</groupId>

services/pom.xml

@@ -32,7 +32,7 @@
 
     <dependencies>
         <!-- include druid-core to prevent older versions of dependencies
-        from being pulled in by airline and dependencies of druid-server -->
+        from being pulled in by dependencies of druid-server -->
         <dependency>
             <groupId>org.apache.druid</groupId>
             <artifactId>druid-core</artifactId>
@@ -70,7 +70,7 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.airlift</groupId>
+            <groupId>com.github.rvesse</groupId>
             <artifactId>airline</artifactId>
         </dependency>
         <dependency>

services/src/main/java/org/apache/druid/cli/CliBroker.java

@@ -19,13 +19,13 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Command;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
-import io.airlift.airline.Command;
 import org.apache.druid.client.BrokerInternalQueryConfig;
 import org.apache.druid.client.BrokerSegmentWatcherConfig;
 import org.apache.druid.client.BrokerServerView;

services/src/main/java/org/apache/druid/cli/CliCoordinator.java

@@ -21,6 +21,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.rvesse.airline.annotations.Command;
 import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.base.Supplier;
@@ -33,7 +34,6 @@
 import com.google.inject.Provides;
 import com.google.inject.name.Names;
 import com.google.inject.util.Providers;
-import io.airlift.airline.Command;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.druid.audit.AuditManager;
 import org.apache.druid.client.CoordinatorSegmentWatcherConfig;

services/src/main/java/org/apache/druid/cli/CliHadoopIndexer.java

@@ -19,11 +19,12 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Arguments;
+import com.github.rvesse.airline.annotations.Command;
+import com.github.rvesse.airline.annotations.Option;
+import com.github.rvesse.airline.annotations.restrictions.Required;
 import com.google.common.base.Joiner;
 import com.google.inject.Inject;
-import io.airlift.airline.Arguments;
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
 import org.apache.druid.guice.ExtensionsConfig;
 import org.apache.druid.indexing.common.config.TaskConfig;
 import org.apache.druid.initialization.Initialization;
@@ -50,16 +51,17 @@ public class CliHadoopIndexer implements Runnable
 
   private static final Logger log = new Logger(CliHadoopIndexer.class);
 
-  @Arguments(description = "A JSON object or the path to a file that contains a JSON object", required = true)
+  @Arguments(description = "A JSON object or the path to a file that contains a JSON object")
+  @Required
   private String argumentSpec;
 
   @Option(name = {"-c", "--coordinate", "hadoopDependencies"},
           description = "extra dependencies to pull down (e.g. non-default hadoop coordinates or extra hadoop jars)")
+  @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
   private List<String> coordinates;
 
   @Option(name = "--no-default-hadoop",
-          description = "don't pull down the default hadoop version",
-          required = false)
+          description = "don't pull down the default hadoop version")
   public boolean noDefaultHadoop;
 
   @Inject

services/src/main/java/org/apache/druid/cli/CliHistorical.java

@@ -19,6 +19,7 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Command;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -27,7 +28,6 @@
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
-import io.airlift.airline.Command;
 import org.apache.druid.client.cache.CacheConfig;
 import org.apache.druid.curator.ZkEnablementConfig;
 import org.apache.druid.discovery.NodeRole;

services/src/main/java/org/apache/druid/cli/CliIndexer.java

@@ -19,6 +19,7 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Command;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Binder;
@@ -27,7 +28,6 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.name.Names;
-import io.airlift.airline.Command;
 import org.apache.druid.client.DruidServer;
 import org.apache.druid.client.DruidServerConfig;
 import org.apache.druid.curator.ZkEnablementConfig;

services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java

@@ -19,15 +19,16 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Arguments;
+import com.github.rvesse.airline.annotations.Command;
+import com.github.rvesse.airline.annotations.restrictions.Required;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
-import io.airlift.airline.Arguments;
-import io.airlift.airline.Command;
 import org.apache.druid.guice.LazySingleton;
 import org.apache.druid.indexer.HadoopDruidDetermineConfigurationJob;
 import org.apache.druid.indexer.HadoopDruidIndexerConfig;
@@ -61,7 +62,8 @@ public class CliInternalHadoopIndexer extends GuiceRunnable
 {
   private static final Logger log = new Logger(CliHadoopIndexer.class);
 
-  @Arguments(description = "A JSON object or the path to a file that contains a JSON object", required = true)
+  @Arguments(description = "A JSON object or the path to a file that contains a JSON object")
+  @Required
   private String argumentSpec;
 
   private HadoopDruidIndexerConfig config;

services/src/main/java/org/apache/druid/cli/CliMiddleManager.java

@@ -19,6 +19,7 @@
 
 package org.apache.druid.cli;
 
+import com.github.rvesse.airline.annotations.Command;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Binder;
@@ -30,7 +31,6 @@
 import com.google.inject.multibindings.MapBinder;
 import com.google.inject.name.Names;
 import com.google.inject.util.Providers;
-import io.airlift.airline.Command;
 import org.apache.druid.client.indexing.HttpIndexingServiceClient;
 import org.apache.druid.client.indexing.IndexingServiceClient;
 import org.apache.druid.curator.ZkEnablementConfig;