update airline to 0.7

pom.xml

@@ -198,7 +198,7 @@
             <dependency>
                 <groupId>io.airlift</groupId>
                 <artifactId>airline</artifactId>
-                <version>0.6</version>
+                <version>0.7</version>
             </dependency>
             <dependency>
                 <groupId>org.skife.config</groupId>

services/src/main/java/io/druid/cli/CliBridge.java

@@ -25,7 +25,7 @@ import com.google.inject.Provides;
 import com.google.inject.name.Names;
 import com.metamx.common.lifecycle.Lifecycle;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.concurrent.Execs;
 import io.druid.curator.PotentiallyGzippedCompressionProvider;
 import io.druid.curator.announcement.Announcer;

services/src/main/java/io/druid/cli/CliBroker.java

@@ -22,7 +22,7 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.client.BrokerServerView;
 import io.druid.client.CachingClusteredClient;
 import io.druid.client.TimelineServerView;

services/src/main/java/io/druid/cli/CliCoordinator.java

@@ -25,7 +25,7 @@ import com.google.inject.Provides;
 import com.google.inject.name.Names;
 import com.metamx.common.concurrent.ScheduledExecutorFactory;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.client.indexing.IndexingServiceClient;
 import io.druid.guice.ConfigProvider;
 import io.druid.guice.Jerseys;

services/src/main/java/io/druid/cli/CliHadoopIndexer.java

@@ -21,9 +21,9 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Arguments;
+import io.airlift.airline.Arguments;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Option;
 import io.druid.guice.ExtensionsConfig;
 import io.druid.initialization.Initialization;
 import io.tesla.aether.internal.DefaultTeslaAether;

services/src/main/java/io/druid/cli/CliHistorical.java

@@ -22,7 +22,7 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.client.cache.Cache;
 import io.druid.client.cache.CacheConfig;
 import io.druid.client.cache.CacheMonitor;

services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java

@@ -28,8 +28,8 @@ import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Arguments;
+import io.airlift.airline.Arguments;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.guice.LazySingleton;
 import io.druid.indexer.HadoopDruidDetermineConfigurationJob;
 import io.druid.indexer.HadoopDruidIndexerConfig;

services/src/main/java/io/druid/cli/CliMiddleManager.java

@@ -24,7 +24,7 @@ import com.google.inject.Provides;
 import com.google.inject.name.Names;
 import com.google.inject.util.Providers;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.guice.IndexingServiceFirehoseModule;
 import io.druid.guice.IndexingServiceModuleHelper;
 import io.druid.guice.IndexingServiceTaskLogsModule;

services/src/main/java/io/druid/cli/CliOverlord.java

@@ -28,7 +28,7 @@ import com.google.inject.name.Names;
 import com.google.inject.servlet.GuiceFilter;
 import com.google.inject.util.Providers;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.audit.AuditManager;
 import io.druid.client.indexing.IndexingServiceSelectorConfig;
 import io.druid.guice.IndexingServiceFirehoseModule;

services/src/main/java/io/druid/cli/CliPeon.java

@@ -27,9 +27,9 @@ import com.google.inject.multibindings.MapBinder;
 import com.google.inject.name.Names;
 import com.metamx.common.lifecycle.Lifecycle;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Arguments;
+import io.airlift.airline.Arguments;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Option;
 import io.druid.guice.Binders;
 import io.druid.guice.IndexingServiceFirehoseModule;
 import io.druid.guice.Jerseys;

services/src/main/java/io/druid/cli/CliRealtime.java

@@ -22,7 +22,7 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.guice.RealtimeModule;
 
 import java.util.List;

services/src/main/java/io/druid/cli/CliRealtimeExample.java

@@ -22,7 +22,7 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.client.DruidServer;
 import io.druid.client.InventoryView;
 import io.druid.client.ServerView;

services/src/main/java/io/druid/cli/CliRouter.java

@@ -24,7 +24,7 @@ import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.curator.discovery.DiscoveryModule;
 import io.druid.curator.discovery.ServerDiscoveryFactory;
 import io.druid.curator.discovery.ServerDiscoverySelector;

services/src/main/java/io/druid/cli/CreateTables.java

@@ -23,8 +23,8 @@ import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Option;
 import io.druid.metadata.MetadataStorageConnector;
 import io.druid.metadata.MetadataStorageConnectorConfig;
 import io.druid.metadata.MetadataStorageTablesConfig;

services/src/main/java/io/druid/cli/Main.java

@@ -18,9 +18,9 @@
 package io.druid.cli;
 
 import com.google.inject.Injector;
-import io.airlift.command.Cli;
+import io.airlift.airline.Cli;
-import io.airlift.command.Help;
+import io.airlift.airline.Help;
-import io.airlift.command.ParseException;
+import io.airlift.airline.ParseException;
 import io.druid.cli.convert.ConvertProperties;
 import io.druid.cli.validate.DruidJsonValidator;
 import io.druid.guice.ExtensionsConfig;

services/src/main/java/io/druid/cli/PullDependencies.java

@@ -20,8 +20,8 @@ package io.druid.cli;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Option;
 import io.druid.guice.ExtensionsConfig;
 import io.druid.indexing.common.config.TaskConfig;
 import io.druid.initialization.Initialization;

services/src/main/java/io/druid/cli/Version.java

@@ -17,7 +17,7 @@
 
 package io.druid.cli;
 
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
 import io.druid.initialization.DruidModule;
 import io.druid.initialization.Initialization;
 import io.druid.server.StatusResource;

services/src/main/java/io/druid/cli/convert/ConvertProperties.java

@@ -25,11 +25,10 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.metamx.common.guava.CloseQuietly;
 import com.metamx.common.logger.Logger;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Option;
 import io.druid.jackson.DefaultObjectMapper;
 
 import java.io.BufferedWriter;
@@ -41,7 +40,6 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.net.URI;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;

services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java

@@ -20,8 +20,8 @@ package io.druid.cli.validate;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
 import com.metamx.common.UOE;
-import io.airlift.command.Command;
+import io.airlift.airline.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Option;
 import io.druid.indexer.HadoopDruidIndexerConfig;
 import io.druid.indexing.common.task.Task;
 import io.druid.jackson.DefaultObjectMapper;

services/src/test/java/io/druid/cli/convert/ConvertPropertiesTest.java

@@ -25,7 +25,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.Rule;
 
-import io.airlift.command.Cli;
+import io.airlift.airline.Cli;
 
 import org.junit.rules.TemporaryFolder;
 

services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java

@@ -19,7 +19,7 @@
 
 package io.druid.cli.validate;
 
-import io.airlift.command.Cli;
+import io.airlift.airline.Cli;
 
 import org.junit.After;
 import org.junit.Assert;