From d601038271868bd78a07801be5a46da2dae60643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 15:55:26 -0700 Subject: [PATCH 01/16] update druid-api to 0.3.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d1a64afe63..e426ed77945 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 2.8.0 9.2.5.v20141112 1.19 - 0.3.9 + 0.3.11 2.4.4 2.2 1.7.10 From 9a0c15c52cad7237a295ad01cc497cb78cbd9361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 15:30:12 -0700 Subject: [PATCH 02/16] update airline to 0.7 --- pom.xml | 2 +- services/src/main/java/io/druid/cli/CliBridge.java | 2 +- services/src/main/java/io/druid/cli/CliBroker.java | 2 +- services/src/main/java/io/druid/cli/CliCoordinator.java | 2 +- services/src/main/java/io/druid/cli/CliHadoopIndexer.java | 6 +++--- services/src/main/java/io/druid/cli/CliHistorical.java | 2 +- .../main/java/io/druid/cli/CliInternalHadoopIndexer.java | 4 ++-- services/src/main/java/io/druid/cli/CliMiddleManager.java | 2 +- services/src/main/java/io/druid/cli/CliOverlord.java | 2 +- services/src/main/java/io/druid/cli/CliPeon.java | 6 +++--- services/src/main/java/io/druid/cli/CliRealtime.java | 2 +- services/src/main/java/io/druid/cli/CliRealtimeExample.java | 2 +- services/src/main/java/io/druid/cli/CliRouter.java | 2 +- services/src/main/java/io/druid/cli/CreateTables.java | 4 ++-- services/src/main/java/io/druid/cli/Main.java | 6 +++--- services/src/main/java/io/druid/cli/PullDependencies.java | 4 ++-- services/src/main/java/io/druid/cli/Version.java | 2 +- .../main/java/io/druid/cli/convert/ConvertProperties.java | 6 ++---- .../main/java/io/druid/cli/validate/DruidJsonValidator.java | 4 ++-- .../java/io/druid/cli/convert/ConvertPropertiesTest.java | 2 +- .../java/io/druid/cli/validate/DruidJsonValidatorTest.java | 2 +- 21 files changed, 32 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index e426ed77945..e77950d1705 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ io.airlift airline - 0.6 + 0.7 org.skife.config diff --git a/services/src/main/java/io/druid/cli/CliBridge.java b/services/src/main/java/io/druid/cli/CliBridge.java index 4ea4c8ebf0a..505014038be 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliBroker.java b/services/src/main/java/io/druid/cli/CliBroker.java index 048d0ac9b3e..989e8871fac 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/io/druid/cli/CliCoordinator.java index 06c6a730d2a..3911e0f9696 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliHadoopIndexer.java b/services/src/main/java/io/druid/cli/CliHadoopIndexer.java index 97aee76e566..e76a5b500bd 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliHistorical.java b/services/src/main/java/io/druid/cli/CliHistorical.java index d9fdaf76c90..86799890e51 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java index d7d35a33aac..b3fe42bcec8 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliMiddleManager.java b/services/src/main/java/io/druid/cli/CliMiddleManager.java index 443aaf00daf..b8d462fc065 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliOverlord.java b/services/src/main/java/io/druid/cli/CliOverlord.java index a788aa9bc6c..0785ed19e07 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliPeon.java b/services/src/main/java/io/druid/cli/CliPeon.java index b51d468945f..7c405390736 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliRealtime.java b/services/src/main/java/io/druid/cli/CliRealtime.java index c27ba2d8010..d95cf079a69 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliRealtimeExample.java b/services/src/main/java/io/druid/cli/CliRealtimeExample.java index 112ee3fa493..45a42b6647c 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CliRouter.java b/services/src/main/java/io/druid/cli/CliRouter.java index 59645fd4b44..ff310876bcd 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/CreateTables.java b/services/src/main/java/io/druid/cli/CreateTables.java index 0683a64fa0c..8ea58ca7ebc 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/Main.java b/services/src/main/java/io/druid/cli/Main.java index a5d89f24218..113bdf19c31 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/PullDependencies.java b/services/src/main/java/io/druid/cli/PullDependencies.java index f5631425c9e..e0cd5f56d9d 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/Version.java b/services/src/main/java/io/druid/cli/Version.java index 9a774e056cc..6258fe63724 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/convert/ConvertProperties.java b/services/src/main/java/io/druid/cli/convert/ConvertProperties.java index 5bfee723be2..7a8e5d07994 100644 --- 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; diff --git a/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java b/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java index ff385f0cdd3..3d53d43f3de 100644 --- 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; diff --git a/services/src/test/java/io/druid/cli/convert/ConvertPropertiesTest.java b/services/src/test/java/io/druid/cli/convert/ConvertPropertiesTest.java index cf7042aaa99..fca1bc62c96 100644 --- 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; diff --git a/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java b/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java index 24d599f3ee8..74d93019d18 100644 --- 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; From edaaf528abb1f8c8bf99a0babe658e249020bb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 12:48:25 -0700 Subject: [PATCH 03/16] update jets3t to 0.9.4 --- pom.xml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index e77950d1705..674fa3d8444 100644 --- a/pom.xml +++ b/pom.xml @@ -326,11 +326,6 @@ javax.el 3.0.0 - - com.jamesmurty.utils - java-xmlbuilder - 0.4 - org.jdbi jdbi @@ -483,14 +478,7 @@ net.java.dev.jets3t jets3t - 0.9.3 - - - - com.centerkey.utils - barebonesbrowserlaunch - - + 0.9.4 org.apache.httpcomponents From 8b294d4d984c93d63e6ec71fc3ad1c813e34df57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 12:51:28 -0700 Subject: [PATCH 04/16] update mapdb to 1.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 674fa3d8444..6c104cc99c8 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ org.mapdb mapdb - 1.0.7 + 1.0.8 org.apache.derby From ac4a856a17b6934e5bd6884aaf7453df7d039279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:20:08 -0700 Subject: [PATCH 05/16] update jetty to 9.2.13.v20150730 (latest Java 7 compatible version) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c104cc99c8..9cc35f52a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 0.27.0 2.8.0 - 9.2.5.v20141112 + 9.2.13.v20150730 1.19 0.3.11 2.4.4 From 51f6a9a2c9d90e77d36443ae3c25445542e1452d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:27:12 -0700 Subject: [PATCH 06/16] update jackson to 2.6.1 --- .../common/task/HadoopConverterTaskSerDeTest.java | 14 +------------- pom.xml | 2 +- .../src/main/java/io/druid/jackson/JodaStuff.java | 5 ++++- .../extraction/LookupExtractionFnTest.java | 7 ------- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git 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 index e2236f03ce6..fd917223cf1 100644 --- 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 { diff --git a/pom.xml b/pom.xml index 9cc35f52a4b..64b121bc7dd 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 9.2.13.v20150730 1.19 0.3.11 - 2.4.4 + 2.6.1 2.2 1.7.10 2.3.0 diff --git a/processing/src/main/java/io/druid/jackson/JodaStuff.java b/processing/src/main/java/io/druid/jackson/JodaStuff.java index 7dfdc8afc4d..11248b6c3b4 100644 --- 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) periodDeserializer); module.addSerializer(Period.class, ToStringSerializer.instance); module.addDeserializer(Duration.class, new DurationDeserializer()); module.addSerializer(Duration.class, ToStringSerializer.instance); diff --git a/processing/src/test/java/io/druid/query/extraction/extraction/LookupExtractionFnTest.java b/processing/src/test/java/io/druid/query/extraction/extraction/LookupExtractionFnTest.java index 3eb5ffe8c5c..f49498c1c89 100644 --- 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 { From 172a44b79458752477ecfdc0f552fc817c7368ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:27:40 -0700 Subject: [PATCH 07/16] update log4j to 2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64b121bc7dd..54b1404f194 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 1.19 0.3.11 2.6.1 - 2.2 + 2.3 1.7.10 2.3.0 From 8be5fe091f69b4493e41d74efcfefd5f04e1fcb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:27:54 -0700 Subject: [PATCH 08/16] update slf4j to 1.7.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54b1404f194..988290ce288 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 0.3.11 2.6.1 2.3 - 1.7.10 + 1.7.12 2.3.0 From f681b2022d5b7d9f3e7ac30c9c3b172645bf7e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:28:19 -0700 Subject: [PATCH 09/16] update aws-sdk to 1.10.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 988290ce288..6f3960b41e6 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ com.amazonaws aws-java-sdk - 1.8.11 + 1.10.12 javax.mail From 2fa87c4bba0f04b35c9e9e523b24af5ac90c30ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:28:30 -0700 Subject: [PATCH 10/16] update joda-time to 2.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f3960b41e6..963a44f09b5 100644 --- a/pom.xml +++ b/pom.xml @@ -379,7 +379,7 @@ joda-time joda-time - 2.6 + 2.8 com.google.code.findbugs From 3a83a0fe40022888c0ae1210f8b28cbcbb4bf22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:28:49 -0700 Subject: [PATCH 11/16] update irc library to 1.0-0014 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 963a44f09b5..9cb070ab869 100644 --- a/pom.xml +++ b/pom.xml @@ -559,7 +559,7 @@ com.ircclouds.irc irc-api - 1.0-0011 + 1.0-0014 com.maxmind.geoip2 From 123f6340d507e511a4ada463f2a17963e9ee783b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 13:30:57 -0700 Subject: [PATCH 12/16] update coveralls plugin to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9cb070ab869..262a62439c5 100644 --- a/pom.xml +++ b/pom.xml @@ -599,7 +599,7 @@ org.eluder.coveralls coveralls-maven-plugin - 3.0.1 + 3.2.0 From dc11f907c93f6dd9a35773e80578aeae87356724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 15:12:34 -0700 Subject: [PATCH 13/16] update jdbi to 2.63.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 262a62439c5..b6e8b1dfbd6 100644 --- a/pom.xml +++ b/pom.xml @@ -329,7 +329,7 @@ org.jdbi jdbi - 2.32 + 2.63.1 com.sun.jersey From 21aadb892797497f80e483adbe76243b460ba185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 15:13:48 -0700 Subject: [PATCH 14/16] update joda to 2.8.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6e8b1dfbd6..6814120da74 100644 --- a/pom.xml +++ b/pom.xml @@ -379,7 +379,7 @@ joda-time joda-time - 2.8 + 2.8.2 com.google.code.findbugs From d5143c080793ea2d94ae6c5ba43500ad4fac315f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 15:16:00 -0700 Subject: [PATCH 15/16] update java-util to 0.27.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6814120da74..20eac8191fc 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ - 0.27.0 + 0.27.2 2.8.0 9.2.13.v20150730 1.19 From c4d0e8d29b6eaf33ef33ec68a7fb708b63d4a3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 25 Aug 2015 15:12:06 -0700 Subject: [PATCH 16/16] remove unnecessary pom verbiage --- extensions/namespace-lookup/pom.xml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/extensions/namespace-lookup/pom.xml b/extensions/namespace-lookup/pom.xml index f210771b9a3..581c4207166 100644 --- a/extensions/namespace-lookup/pom.xml +++ b/extensions/namespace-lookup/pom.xml @@ -74,32 +74,4 @@ test - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - -