Merge pull request #1669 from metamx/upgrade-dependencies

Upgrade dependencies
2015-08-25 21:30:22 -07:00 · 2015-08-25 21:30:22 -07:00 · fdb6a6651b
parent 5c19ffa98c c4d0e8d29b
commit fdb6a6651b
25 changed files with 50 additions and 108 deletions
--- a/extensions/namespace-lookup/pom.xml
+++ b/extensions/namespace-lookup/pom.xml
@ -74,32 +74,4 @@
      <scope>test</scope>
    </dependency>
  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
--- a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java
@ -30,7 +30,6 @@ import io.druid.timeline.partition.NoneShardSpec;
 import io.druid.timeline.partition.ShardSpec;
 import org.joda.time.Interval;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;

 import java.io.IOException;
@ -40,7 +39,7 @@ import java.util.Map;

 public class HadoopConverterTaskSerDeTest
 {
-  private static ObjectMapper objectMapper;
+  private static ObjectMapper objectMapper = new DefaultObjectMapper();
  private static final String TASK_ID = "task id";
  private static final String DATA_SOURCE = "datasource";
  private static final Interval INTERVAL = Interval.parse("2010/2011");
@ -69,17 +68,6 @@ public class HadoopConverterTaskSerDeTest
  private static final String OUTPUT_PATH = "/dev/null";
  private static final String CLASSPATH_PREFIX = "something:where:I:need:stuff";

-  @BeforeClass
-  public static void setUpStatic()
-  {
-    objectMapper = new DefaultObjectMapper();
-    objectMapper.registerSubtypes(
-        HadoopConverterTask.class,
-        HadoopConverterTask.ConverterSubTask.class,
-        ShardSpec.class
-    );
-  }
-
  @Test
  public void testSimpleConverterTaskSerDe() throws IOException
  {
--- a/pom.xml
+++ b/pom.xml
@ -65,14 +65,14 @@
    </scm>

    <properties>
-        <metamx.java-util.version>0.27.0</metamx.java-util.version>
+        <metamx.java-util.version>0.27.2</metamx.java-util.version>
        <apache.curator.version>2.8.0</apache.curator.version>
-        <jetty.version>9.2.5.v20141112</jetty.version>
+        <jetty.version>9.2.13.v20150730</jetty.version>
        <jersey.version>1.19</jersey.version>
-        <druid.api.version>0.3.9</druid.api.version>
-        <jackson.version>2.4.4</jackson.version>
-        <log4j.version>2.2</log4j.version>
-        <slf4j.version>1.7.10</slf4j.version>
+        <druid.api.version>0.3.11</druid.api.version>
+        <jackson.version>2.6.1</jackson.version>
+        <log4j.version>2.3</log4j.version>
+        <slf4j.version>1.7.12</slf4j.version>
        <hadoop.compile.version>2.3.0</hadoop.compile.version>
    </properties>

@ -170,7 +170,7 @@
            <dependency>
                <groupId>com.amazonaws</groupId>
                <artifactId>aws-java-sdk</artifactId>
-                <version>1.8.11</version>
+                <version>1.10.12</version>
                <exclusions>
                    <exclusion>
                        <groupId>javax.mail</groupId>
@ -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>
@ -326,15 +326,10 @@
                <artifactId>javax.el</artifactId>
                <version>3.0.0</version>
            </dependency>
-            <dependency>
-                <groupId>com.jamesmurty.utils</groupId>
-                <artifactId>java-xmlbuilder</artifactId>
-                <version>0.4</version>
-            </dependency>
            <dependency>
                <groupId>org.jdbi</groupId>
                <artifactId>jdbi</artifactId>
-                <version>2.32</version>
+                <version>2.63.1</version>
            </dependency>
            <dependency>
                <groupId>com.sun.jersey</groupId>
@ -384,7 +379,7 @@
            <dependency>
                <groupId>joda-time</groupId>
                <artifactId>joda-time</artifactId>
-                <version>2.6</version>
+                <version>2.8.2</version>
            </dependency>
            <dependency>
                <groupId>com.google.code.findbugs</groupId>
@ -483,14 +478,7 @@
            <dependency>
                <groupId>net.java.dev.jets3t</groupId>
                <artifactId>jets3t</artifactId>
-                <version>0.9.3</version>
-                <exclusions>
-                    <exclusion>
-                        <!-- exclude artifact not available in maven central -->
-                        <groupId>com.centerkey.utils</groupId>
-                        <artifactId>barebonesbrowserlaunch</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>0.9.4</version>
            </dependency>
            <dependency>
                <groupId>org.apache.httpcomponents</groupId>
@ -511,7 +499,7 @@
            <dependency>
                <groupId>org.mapdb</groupId>
                <artifactId>mapdb</artifactId>
-                <version>1.0.7</version>
+                <version>1.0.8</version>
            </dependency>
            <dependency>
                <groupId>org.apache.derby</groupId>
@ -571,7 +559,7 @@
            <dependency>
                <groupId>com.ircclouds.irc</groupId>
                <artifactId>irc-api</artifactId>
-                <version>1.0-0011</version>
+                <version>1.0-0014</version>
            </dependency>
            <dependency>
                <groupId>com.maxmind.geoip2</groupId>
@ -611,7 +599,7 @@
            <plugin>
                <groupId>org.eluder.coveralls</groupId>
                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.0</version>
            </plugin>
        </plugins>
        <pluginManagement>
--- a/processing/src/main/java/io/druid/jackson/JodaStuff.java
+++ b/processing/src/main/java/io/druid/jackson/JodaStuff.java
@ -21,6 +21,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.KeyDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@ -39,6 +40,7 @@ import java.io.IOException;
 */
 class JodaStuff
 {
+  @SuppressWarnings("unchecked")
  static SimpleModule register(SimpleModule module)
  {
    module.addKeyDeserializer(DateTime.class, new DateTimeKeyDeserializer());
@ -46,7 +48,8 @@ class JodaStuff
    module.addSerializer(DateTime.class, ToStringSerializer.instance);
    module.addDeserializer(Interval.class, new JodaStuff.IntervalDeserializer());
    module.addSerializer(Interval.class, ToStringSerializer.instance);
-    module.addDeserializer(Period.class, new PeriodDeserializer());
+    JsonDeserializer<?> periodDeserializer = new PeriodDeserializer(true);
+    module.addDeserializer(Period.class, (JsonDeserializer<Period>) periodDeserializer);
    module.addSerializer(Period.class, ToStringSerializer.instance);
    module.addDeserializer(Duration.class, new DurationDeserializer());
    module.addSerializer(Duration.class, ToStringSerializer.instance);
--- a/processing/src/test/java/io/druid/query/extraction/extraction/LookupExtractionFnTest.java
+++ b/processing/src/test/java/io/druid/query/extraction/extraction/LookupExtractionFnTest.java
@ -33,7 +33,6 @@ import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.extraction.LookupExtractionFn;
 import io.druid.query.extraction.MapLookupExtractor;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@ -81,12 +80,6 @@ public class LookupExtractionFnTest
    this.injective = injective;
  }

-  @BeforeClass
-  public static void setUpStatic()
-  {
-    OBJECT_MAPPER.registerSubtypes(LookupExtractionFn.class);
-  }
-
  @Test
  public void testSimpleSerDe() throws IOException
  {
--- a/services/src/main/java/io/druid/cli/CliBridge.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliBroker.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliCoordinator.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliHadoopIndexer.java
+++ b/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.command.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Arguments;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
 import io.druid.guice.ExtensionsConfig;
 import io.druid.initialization.Initialization;
 import io.tesla.aether.internal.DefaultTeslaAether;
--- a/services/src/main/java/io/druid/cli/CliHistorical.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java
+++ b/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.command.Command;
+import io.airlift.airline.Arguments;
+import io.airlift.airline.Command;
 import io.druid.guice.LazySingleton;
 import io.druid.indexer.HadoopDruidDetermineConfigurationJob;
 import io.druid.indexer.HadoopDruidIndexerConfig;
--- a/services/src/main/java/io/druid/cli/CliMiddleManager.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliOverlord.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliPeon.java
+++ b/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.command.Command;
-import io.airlift.command.Option;
+import io.airlift.airline.Arguments;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
 import io.druid.guice.Binders;
 import io.druid.guice.IndexingServiceFirehoseModule;
 import io.druid.guice.Jerseys;
--- a/services/src/main/java/io/druid/cli/CliRealtime.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliRealtimeExample.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CliRouter.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/CreateTables.java
+++ b/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.command.Option;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
 import io.druid.metadata.MetadataStorageConnector;
 import io.druid.metadata.MetadataStorageConnectorConfig;
 import io.druid.metadata.MetadataStorageTablesConfig;
--- a/services/src/main/java/io/druid/cli/Main.java
+++ b/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.command.Help;
-import io.airlift.command.ParseException;
+import io.airlift.airline.Cli;
+import io.airlift.airline.Help;
+import io.airlift.airline.ParseException;
 import io.druid.cli.convert.ConvertProperties;
 import io.druid.cli.validate.DruidJsonValidator;
 import io.druid.guice.ExtensionsConfig;
--- a/services/src/main/java/io/druid/cli/PullDependencies.java
+++ b/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.command.Option;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
 import io.druid.guice.ExtensionsConfig;
 import io.druid.indexing.common.config.TaskConfig;
 import io.druid.initialization.Initialization;
--- a/services/src/main/java/io/druid/cli/Version.java
+++ b/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;
--- a/services/src/main/java/io/druid/cli/convert/ConvertProperties.java
+++ b/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.command.Option;
+import io.airlift.airline.Command;
+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;
--- a/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java
+++ b/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.command.Option;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
 import io.druid.indexer.HadoopDruidIndexerConfig;
 import io.druid.indexing.common.task.Task;
 import io.druid.jackson.DefaultObjectMapper;
--- a/services/src/test/java/io/druid/cli/convert/ConvertPropertiesTest.java
+++ b/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;

--- a/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java
+++ b/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;