From 1d0bf46c31a53603348c0c9968164e2c3927da45 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Tue, 2 Oct 2018 13:04:06 -0700 Subject: [PATCH 1/2] combine druid-api, druid-common, java-util --- api/pom.xml | 157 ------- aws-common/pom.xml | 2 +- common/pom.xml | 245 ----------- core/pom.xml | 386 ++++++++++++++++++ .../org/apache/druid/math/expr/antlr/Expr.g4 | 0 .../EverythingIsNonnullByDefault.java | 0 .../annotations/SubclassesMustBePublic.java | 0 ...lassesMustBePublicAnnotationProcessor.java | 0 .../annotations/UsedByJUnitParamsRunner.java | 0 .../annotations/UsedInGeneratedCode.java | 0 .../org/apache/druid/audit/AuditEntry.java | 4 +- .../org/apache/druid/audit/AuditInfo.java | 0 .../org/apache/druid/audit/AuditManager.java | 0 .../apache/druid/cli/CliCommandCreator.java | 0 .../druid/collections/BlockingPool.java | 0 .../druid/collections/CombiningIterable.java | 0 .../druid/collections/CombiningIterator.java | 0 .../collections/DefaultBlockingPool.java | 0 .../druid/collections/DummyBlockingPool.java | 0 .../collections/DummyNonBlockingPool.java | 0 .../druid/collections/NonBlockingPool.java | 0 .../collections/OrderedMergeIterator.java | 0 .../collections/OrderedMergeSequence.java | 0 .../ReferenceCountingResourceHolder.java | 0 .../apache/druid/collections/Releaser.java | 0 .../druid/collections/ResourceHolder.java | 0 .../druid/collections/SerializablePair.java | 0 .../apache/druid/collections/StupidPool.java | 0 .../collections/StupidResourceHolder.java | 0 .../druid/common/config/ConfigManager.java | 2 +- .../common/config/ConfigManagerConfig.java | 0 .../druid/common/config/ConfigSerde.java | 0 .../common/config/JacksonConfigManager.java | 0 .../druid/common/config/Log4jShutdown.java | 0 .../druid/common/config/NullHandling.java | 0 .../config/NullValueHandlingConfig.java | 0 .../druid/common/guava/CombiningSequence.java | 0 .../apache/druid/common/guava/DSuppliers.java | 0 .../apache/druid/common/guava/GuavaUtils.java | 0 .../druid/common/guava/SettableSupplier.java | 0 .../common/guava/ThreadRenamingCallable.java | 0 .../common/guava/ThreadRenamingRunnable.java | 0 .../apache/druid/common/utils/ByteUtils.java | 0 .../druid/common/utils/IntArrayUtils.java | 0 .../apache/druid/common/utils/PropUtils.java | 0 .../druid/common/utils/SerializerUtils.java | 0 .../common/utils/ServletResourceUtils.java | 0 .../apache/druid/common/utils/SocketUtil.java | 0 .../apache/druid/common/utils/UUIDUtils.java | 0 .../apache/druid/common/utils/VMUtils.java | 0 .../ConcurrentAwaitableCounter.java | 0 .../druid/concurrent/LifecycleLock.java | 0 .../druid/concurrent/TaskThreadPriority.java | 0 .../data/SearchableVersionedDataFinder.java | 0 .../data/input/ByteBufferInputRowParser.java | 0 .../apache/druid/data/input/Committer.java | 0 .../data/input/FiniteFirehoseFactory.java | 0 .../org/apache/druid/data/input/Firehose.java | 0 .../druid/data/input/FirehoseFactory.java | 0 .../druid/data/input/FirehoseFactoryV2.java | 0 .../apache/druid/data/input/FirehoseV2.java | 0 .../org/apache/druid/data/input/InputRow.java | 0 .../apache/druid/data/input/InputSplit.java | 0 .../druid/data/input/MapBasedInputRow.java | 0 .../apache/druid/data/input/MapBasedRow.java | 0 .../java/org/apache/druid/data/input/Row.java | 0 .../org/apache/druid/data/input/Rows.java | 0 .../AbstractTextFilesFirehoseFactory.java | 0 .../druid/data/input/impl/CSVParseSpec.java | 0 .../data/input/impl/DelimitedParseSpec.java | 0 .../data/input/impl/DimensionSchema.java | 0 .../druid/data/input/impl/DimensionsSpec.java | 0 .../input/impl/DoubleDimensionSchema.java | 0 .../input/impl/FileIteratingFirehose.java | 0 .../data/input/impl/FloatDimensionSchema.java | 0 .../druid/data/input/impl/InputRowParser.java | 0 .../input/impl/JSONLowercaseParseSpec.java | 0 .../druid/data/input/impl/JSONParseSpec.java | 0 .../data/input/impl/JavaScriptParseSpec.java | 0 .../data/input/impl/LongDimensionSchema.java | 0 .../data/input/impl/MapInputRowParser.java | 0 .../input/impl/NewSpatialDimensionSchema.java | 0 .../data/input/impl/NoopInputRowParser.java | 0 .../druid/data/input/impl/ParseSpec.java | 0 .../druid/data/input/impl/RegexParseSpec.java | 0 .../input/impl/SpatialDimensionSchema.java | 0 .../druid/data/input/impl/SqlFirehose.java | 0 .../input/impl/StringDimensionSchema.java | 0 .../data/input/impl/StringInputRowParser.java | 0 .../data/input/impl/TimeAndDimsParseSpec.java | 0 .../druid/data/input/impl/TimestampSpec.java | 0 .../input/impl/prefetch/CacheManager.java | 0 .../data/input/impl/prefetch/FetchedFile.java | 0 .../data/input/impl/prefetch/Fetcher.java | 0 .../data/input/impl/prefetch/FileFetcher.java | 0 .../input/impl/prefetch/JsonIterator.java | 0 .../impl/prefetch/ObjectOpenFunction.java | 0 .../input/impl/prefetch/OpenedObject.java | 0 .../input/impl/prefetch/PrefetchConfig.java | 0 .../prefetch/PrefetchSqlFirehoseFactory.java | 0 .../PrefetchableTextFilesFirehoseFactory.java | 0 .../impl/prefetch/RetryingInputStream.java | 0 .../data/input/impl/prefetch/SqlFetcher.java | 0 .../java/org/apache/druid/guice/Binders.java | 0 .../druid/guice/ConditionalMultibind.java | 0 .../apache/druid/guice/ConfigProvider.java | 0 .../druid/guice/DruidGuiceExtensions.java | 0 .../org/apache/druid/guice/DruidScopes.java | 0 .../druid/guice/DruidSecondaryModule.java | 0 .../guice/GuiceAnnotationIntrospector.java | 0 .../druid/guice/GuiceInjectableValues.java | 0 .../guice/JacksonConfigManagerModule.java | 0 .../druid/guice/JacksonConfigProvider.java | 0 .../java/org/apache/druid/guice/Jerseys.java | 0 .../druid/guice/JsonConfigProvider.java | 0 .../apache/druid/guice/JsonConfigurator.java | 0 .../org/apache/druid/guice/KeyHolder.java | 0 .../org/apache/druid/guice/LazySingleton.java | 0 .../apache/druid/guice/LifecycleModule.java | 0 .../apache/druid/guice/LifecycleScope.java | 0 .../org/apache/druid/guice/ListProvider.java | 0 .../apache/druid/guice/ManageLifecycle.java | 0 .../druid/guice/ManageLifecycleLast.java | 0 .../java/org/apache/druid/guice/PolyBind.java | 0 .../apache/druid/guice/SupplierProvider.java | 0 .../guice/annotations/EscalatedGlobal.java | 0 .../guice/annotations/ExtensionPoint.java | 0 .../druid/guice/annotations/Global.java | 0 .../guice/annotations/JSR311Resource.java | 0 .../apache/druid/guice/annotations/Json.java | 0 .../druid/guice/annotations/PublicApi.java | 0 .../apache/druid/guice/annotations/Self.java | 0 .../apache/druid/guice/annotations/Smile.java | 0 .../apache/druid/indexer/IngestionState.java | 0 .../java/org/apache/druid/indexer/Jobby.java | 0 .../MetadataStorageUpdaterJobHandler.java | 0 .../apache/druid/indexer/RunnerTaskState.java | 0 .../org/apache/druid/indexer/TaskInfo.java | 0 .../apache/druid/indexer/TaskLocation.java | 0 .../druid/indexer/TaskMetricsGetter.java | 0 .../druid/indexer/TaskMetricsUtils.java | 0 .../org/apache/druid/indexer/TaskState.java | 0 .../org/apache/druid/indexer/TaskStatus.java | 0 .../apache/druid/indexer/TaskStatusPlus.java | 0 .../druid/initialization/DruidModule.java | 0 .../druid/io/ByteBufferInputStream.java | 0 .../java/org/apache/druid/io/Channels.java | 0 .../io/ZeroCopyByteArrayOutputStream.java | 0 .../jackson/CommaListJoinDeserializer.java | 0 .../jackson/CommaListJoinSerializer.java | 0 .../java/util/common/ByteBufferUtils.java | 0 .../druid/java/util/common/Cacheable.java | 0 .../java/util/common/CloseableIterators.java | 0 .../java/util/common/CompressionUtils.java | 0 .../druid/java/util/common/DateTimes.java | 0 .../druid/java/util/common/FileUtils.java | 0 .../apache/druid/java/util/common/IAE.java | 0 .../apache/druid/java/util/common/IOE.java | 0 .../apache/druid/java/util/common/ISE.java | 0 .../druid/java/util/common/Intervals.java | 0 .../druid/java/util/common/JodaUtils.java | 0 .../druid/java/util/common/MapUtils.java | 0 .../util/common/MappedByteBufferHandler.java | 0 .../druid/java/util/common/Numbers.java | 0 .../apache/druid/java/util/common/Pair.java | 0 .../org/apache/druid/java/util/common/RE.java | 0 .../druid/java/util/common/RetryUtils.java | 0 .../druid/java/util/common/StreamUtils.java | 0 .../druid/java/util/common/StringUtils.java | 0 .../apache/druid/java/util/common/UOE.java | 0 .../druid/java/util/common/collect/Utils.java | 0 .../concurrent/DummyExecutorService.java | 0 .../java/util/common/concurrent/Execs.java | 0 .../concurrent/ExecutorServiceConfig.java | 0 .../common/concurrent/ExecutorServices.java | 0 .../common/concurrent/ListenableFutures.java | 0 .../concurrent/ScheduledExecutorFactory.java | 0 .../common/concurrent/ScheduledExecutors.java | 0 .../druid/java/util/common/config/Config.java | 0 .../util/common/config/DurationCoercible.java | 0 .../common/granularity/AllGranularity.java | 0 .../granularity/DurationGranularity.java | 0 .../common/granularity/Granularities.java | 0 .../util/common/granularity/Granularity.java | 0 .../common/granularity/GranularityType.java | 0 .../common/granularity/NoneGranularity.java | 0 .../common/granularity/PeriodGranularity.java | 0 .../java/util/common/guava/Accumulator.java | 0 .../java/util/common/guava/Accumulators.java | 0 .../java/util/common/guava/BaseSequence.java | 0 .../java/util/common/guava/CloseQuietly.java | 0 .../java/util/common/guava/Comparators.java | 0 .../util/common/guava/ConcatSequence.java | 0 .../guava/DelegatingYieldingAccumulator.java | 0 .../util/common/guava/DroppingIterable.java | 0 .../util/common/guava/DroppingIterator.java | 0 .../common/guava/ExecuteWhenDoneYielder.java | 0 .../util/common/guava/FilteredSequence.java | 0 .../common/guava/FilteringAccumulator.java | 0 .../guava/FilteringYieldingAccumulator.java | 0 .../util/common/guava/FunctionalIterable.java | 0 .../util/common/guava/FunctionalIterator.java | 0 .../java/util/common/guava/LazySequence.java | 0 .../util/common/guava/LimitedSequence.java | 0 .../util/common/guava/MappedSequence.java | 0 .../util/common/guava/MappingAccumulator.java | 0 .../guava/MappingYieldingAccumulator.java | 0 .../java/util/common/guava/MergeIterable.java | 0 .../java/util/common/guava/MergeIterator.java | 0 .../java/util/common/guava/MergeSequence.java | 0 .../java/util/common/guava/Sequence.java | 0 .../util/common/guava/SequenceWrapper.java | 0 .../java/util/common/guava/Sequences.java | 0 .../util/common/guava/WrappingSequence.java | 0 .../util/common/guava/WrappingYielder.java | 0 .../druid/java/util/common/guava/Yielder.java | 0 .../java/util/common/guava/Yielders.java | 0 .../common/guava/YieldingAccumulator.java | 0 .../common/guava/YieldingAccumulators.java | 0 .../common/guava/YieldingSequenceBase.java | 0 .../java/util/common/guava/nary/BinaryFn.java | 0 .../guava/nary/SortedMergeIterator.java | 0 .../util/common/guava/nary/TrinaryFn.java | 0 .../guava/nary/TrinaryTransformIterable.java | 0 .../guava/nary/TrinaryTransformIterator.java | 0 .../druid/java/util/common/io/Closer.java | 0 .../druid/java/util/common/io/NativeIO.java | 0 .../util/common/io/smoosh/FileSmoosher.java | 0 .../java/util/common/io/smoosh/Metadata.java | 0 .../java/util/common/io/smoosh/Smoosh.java | 0 .../common/io/smoosh/SmooshedFileMapper.java | 0 .../util/common/io/smoosh/SmooshedWriter.java | 0 .../util/common/jackson/JacksonUtils.java | 0 .../java/util/common/lifecycle/Lifecycle.java | 0 .../util/common/lifecycle/LifecycleStart.java | 0 .../util/common/lifecycle/LifecycleStop.java | 0 .../druid/java/util/common/logger/Logger.java | 0 .../parsers/AbstractFlatTextFormatParser.java | 0 .../java/util/common/parsers/CSVParser.java | 0 .../common/parsers/CloseableIterator.java | 0 .../util/common/parsers/DelimitedParser.java | 0 .../common/parsers/JSONFlattenerMaker.java | 0 .../common/parsers/JSONPathFieldSpec.java | 0 .../common/parsers/JSONPathFieldType.java | 0 .../util/common/parsers/JSONPathParser.java | 0 .../util/common/parsers/JSONPathSpec.java | 0 .../common/parsers/JSONToLowerParser.java | 0 .../util/common/parsers/JavaScriptParser.java | 0 .../util/common/parsers/ObjectFlattener.java | 0 .../util/common/parsers/ObjectFlatteners.java | 2 +- .../util/common/parsers/ParseException.java | 0 .../java/util/common/parsers/Parser.java | 0 .../java/util/common/parsers/ParserUtils.java | 0 .../java/util/common/parsers/Parsers.java | 0 .../java/util/common/parsers/RegexParser.java | 0 .../util/common/parsers/TimestampParser.java | 0 .../java/util/emitter/EmittingLogger.java | 0 .../emitter/core/BaseHttpEmittingConfig.java | 0 .../druid/java/util/emitter/core/Batch.java | 0 .../util/emitter/core/BatchingStrategy.java | 0 .../util/emitter/core/ComposingEmitter.java | 0 .../emitter/core/ConcurrentTimeCounter.java | 0 .../util/emitter/core/ContentEncoding.java | 0 .../druid/java/util/emitter/core/Emitter.java | 0 .../java/util/emitter/core/Emitters.java | 0 .../druid/java/util/emitter/core/Event.java | 0 .../util/emitter/core/FeedUriExtractor.java | 0 .../util/emitter/core/HttpEmitterConfig.java | 0 .../util/emitter/core/HttpPostEmitter.java | 0 .../util/emitter/core/LoggingEmitter.java | 0 .../emitter/core/LoggingEmitterConfig.java | 0 .../java/util/emitter/core/NoopEmitter.java | 0 .../emitter/core/ParametrizedUriEmitter.java | 0 .../core/ParametrizedUriEmitterConfig.java | 0 .../core/ParametrizedUriExtractor.java | 0 .../java/util/emitter/core/UriExtractor.java | 0 .../core/ZeroCopyByteArrayOutputStream.java | 0 .../util/emitter/factory/EmitterFactory.java | 0 .../emitter/factory/HttpEmitterFactory.java | 0 .../factory/LoggingEmitterFactory.java | 0 .../emitter/factory/NoopEmitterFactory.java | 0 .../ParametrizedUriEmitterFactory.java | 0 .../util/emitter/service/AlertBuilder.java | 0 .../java/util/emitter/service/AlertEvent.java | 0 .../util/emitter/service/ServiceEmitter.java | 0 .../emitter/service/ServiceEventBuilder.java | 0 .../emitter/service/ServiceMetricEvent.java | 0 .../util/http/client/AbstractHttpClient.java | 0 .../http/client/CredentialedHttpClient.java | 0 .../java/util/http/client/HttpClient.java | 0 .../util/http/client/HttpClientConfig.java | 0 .../java/util/http/client/HttpClientInit.java | 0 .../util/http/client/NettyHttpClient.java | 0 .../druid/java/util/http/client/Request.java | 0 .../http/client/auth/BasicCredentials.java | 0 .../util/http/client/auth/Credentials.java | 0 .../io/AppendableByteArrayInputStream.java | 0 .../netty/HttpClientPipelineFactory.java | 0 .../client/pool/ChannelResourceFactory.java | 0 .../http/client/pool/ResourceContainer.java | 0 .../http/client/pool/ResourceFactory.java | 0 .../util/http/client/pool/ResourcePool.java | 0 .../http/client/pool/ResourcePoolConfig.java | 0 .../http/client/response/ClientResponse.java | 0 .../client/response/FullResponseHandler.java | 0 .../client/response/FullResponseHolder.java | 0 .../client/response/HttpResponseHandler.java | 0 .../response/InputStreamResponseHandler.java | 0 .../SequenceInputStreamResponseHandler.java | 0 .../response/StatusResponseHandler.java | 0 .../client/response/StatusResponseHolder.java | 0 .../java/util/metrics/AbstractMonitor.java | 0 .../util/metrics/CgroupMemoryMonitor.java | 0 .../druid/java/util/metrics/CgroupUtil.java | 0 .../java/util/metrics/CompoundMonitor.java | 0 .../util/metrics/CpuAcctDeltaMonitor.java | 0 .../util/metrics/FeedDefiningMonitor.java | 0 .../util/metrics/HttpPostEmitterMonitor.java | 0 .../java/util/metrics/JvmCpuMonitor.java | 0 .../druid/java/util/metrics/JvmMonitor.java | 0 .../java/util/metrics/JvmPidDiscoverer.java | 0 .../java/util/metrics/JvmThreadsMonitor.java | 0 .../druid/java/util/metrics/KeyedDiff.java | 0 .../druid/java/util/metrics/Monitor.java | 0 .../java/util/metrics/MonitorScheduler.java | 0 .../util/metrics/MonitorSchedulerConfig.java | 0 .../druid/java/util/metrics/MonitorUtils.java | 0 .../druid/java/util/metrics/Monitors.java | 0 .../ParametrizedUriEmitterMonitor.java | 0 .../java/util/metrics/PidDiscoverer.java | 0 .../java/util/metrics/SigarPidDiscoverer.java | 0 .../druid/java/util/metrics/SigarUtil.java | 0 .../druid/java/util/metrics/SysMonitor.java | 0 .../metrics/cgroups/CgroupDiscoverer.java | 0 .../java/util/metrics/cgroups/CpuAcct.java | 0 .../java/util/metrics/cgroups/Memory.java | 0 .../metrics/cgroups/ProcCgroupDiscoverer.java | 0 .../cgroups/ProcSelfCgroupDiscoverer.java | 0 .../org/apache/druid/js/JavaScriptConfig.java | 0 .../org/apache/druid/math/expr/Evals.java | 0 .../java/org/apache/druid/math/expr/Expr.java | 0 .../org/apache/druid/math/expr/ExprEval.java | 0 .../druid/math/expr/ExprListenerImpl.java | 0 .../druid/math/expr/ExprMacroTable.java | 0 .../org/apache/druid/math/expr/ExprType.java | 0 .../org/apache/druid/math/expr/Function.java | 0 .../org/apache/druid/math/expr/Parser.java | 0 .../metadata/DefaultPasswordProvider.java | 0 .../druid/metadata/EntryExistsException.java | 0 .../EnvironmentVariablePasswordProvider.java | 0 .../druid/metadata/MetadataCASUpdate.java | 0 .../MetadataStorageActionHandler.java | 0 .../MetadataStorageActionHandlerFactory.java | 0 .../MetadataStorageActionHandlerTypes.java | 0 .../metadata/MetadataStorageConnector.java | 0 .../MetadataStorageConnectorConfig.java | 0 .../metadata/MetadataStorageTablesConfig.java | 0 .../druid/metadata/PasswordProvider.java | 0 .../apache/druid/query/SegmentDescriptor.java | 0 .../apache/druid/segment/SegmentUtils.java | 0 .../segment/loading/DataSegmentArchiver.java | 0 .../segment/loading/DataSegmentFinder.java | 0 .../segment/loading/DataSegmentKiller.java | 0 .../segment/loading/DataSegmentMover.java | 0 .../segment/loading/DataSegmentPusher.java | 0 .../druid/segment/loading/LoadSpec.java | 0 .../loading/NoopDataSegmentPusher.java | 0 .../loading/SegmentLoadingException.java | 0 .../druid/segment/loading/URIDataPuller.java | 0 .../apache/druid/tasklogs/NoopTaskLogs.java | 0 .../apache/druid/tasklogs/TaskLogKiller.java | 0 .../apache/druid/tasklogs/TaskLogPusher.java | 0 .../druid/tasklogs/TaskLogStreamer.java | 0 .../org/apache/druid/tasklogs/TaskLogs.java | 0 .../apache/druid/timeline/DataSegment.java | 0 .../druid/timeline/DataSegmentUtils.java | 2 +- .../apache/druid/timeline/LogicalSegment.java | 0 .../apache/druid/timeline/PruneLoadSpec.java | 0 .../apache/druid/timeline/TimelineLookup.java | 0 .../druid/timeline/TimelineObjectHolder.java | 0 .../timeline/VersionedIntervalTimeline.java | 0 .../partition/ImmutablePartitionHolder.java | 0 .../partition/IntegerPartitionChunk.java | 0 .../partition/LinearPartitionChunk.java | 0 .../timeline/partition/NoneShardSpec.java | 0 .../partition/NumberedPartitionChunk.java | 0 .../timeline/partition/PartitionChunk.java | 0 .../timeline/partition/PartitionHolder.java | 0 .../druid/timeline/partition/ShardSpec.java | 0 .../timeline/partition/ShardSpecLookup.java | 0 .../SingleElementPartitionChunk.java | 0 .../partition/StringPartitionChunk.java | 0 .../apache/druid/utils/CircularBuffer.java | 0 .../apache/druid/utils/CompressionUtils.java | 0 .../org/apache/druid/utils/Runnables.java | 0 .../src/main/resources/log4j2.debug.xml | 0 .../src/main/resources/log4j2.xml | 0 .../javax.annotation.processing.Processor | 0 .../org/apache/druid/TestObjectMapper.java | 0 .../druid/collections/BlockingPoolTest.java | 0 .../CloseableDefaultBlockingPool.java | 0 .../collections/CloseableStupidPool.java | 0 .../collections/CombiningIterableTest.java | 0 .../collections/CombiningIteratorTest.java | 0 .../druid/collections/IteratorShell.java | 0 .../collections/OrderedMergeIteratorTest.java | 0 .../collections/OrderedMergeSequenceTest.java | 0 .../ReferenceCountingResourceHolderTest.java | 0 .../collections/SerializablePairTest.java | 0 .../druid/collections/StupidPoolTest.java | 0 .../collections/StupidResourceHolderTest.java | 0 .../common/guava/CombiningSequenceTest.java | 0 .../common/guava/ComplexSequenceTest.java | 0 .../druid/common/guava/GuavaUtilsTest.java | 0 .../druid/common/utils/IntArrayUtilsTest.java | 0 .../druid/common/utils/JodaUtilsTest.java | 0 .../apache/druid/common/utils/LogTest.java | 0 .../druid/common/utils/PropUtilsTest.java | 0 .../common/utils/SerializerUtilsTest.java | 0 .../utils/ServletResourceUtilsTest.java | 0 .../druid/common/utils/SocketUtilTest.java | 0 .../druid/common/utils/StringUtilsTest.java | 0 .../druid/common/utils/UUIDUtilsTest.java | 0 .../druid/common/utils/VMUtilsTest.java | 0 .../ConcurrentAwaitableCounterTest.java | 0 .../apache/druid/concurrent/ExecsTest.java | 0 .../druid/concurrent/LifecycleLockTest.java | 0 .../druid/data/input/MapBasedRowTest.java | 0 .../data/input/impl/CSVParseSpecTest.java | 0 .../input/impl/DelimitedParseSpecTest.java | 0 .../data/input/impl/DimensionSchemaTest.java | 0 .../input/impl/DimensionsSpecSerdeTest.java | 0 .../input/impl/FileIteratingFirehoseTest.java | 0 .../input/impl/InputRowParserSerdeTest.java | 0 .../impl/JSONLowercaseParseSpecTest.java | 0 .../data/input/impl/JSONParseSpecTest.java | 0 .../data/input/impl/JSONPathSpecTest.java | 0 .../input/impl/JavaScriptParseSpecTest.java | 0 .../input/impl/NoopInputRowParserTest.java | 0 .../druid/data/input/impl/ParseSpecTest.java | 0 .../data/input/impl/RegexParseSpecTest.java | 0 .../data/input/impl/SqlFirehoseTest.java | 0 .../input/impl/StringInputRowParserTest.java | 0 .../input/impl/TimeAndDimsParseSpecTest.java | 0 .../data/input/impl/TimestampSpecTest.java | 0 .../input/impl/prefetch/JsonIteratorTest.java | 0 ...fetchableTextFilesFirehoseFactoryTest.java | 0 .../prefetch/RetryingInputStreamTest.java | 0 .../druid/guice/ConditionalMultibindTest.java | 0 .../druid/guice/JsonConfiguratorTest.java | 0 .../druid/guice/LifecycleScopeTest.java | 0 .../org/apache/druid/guice/PolyBindTest.java | 0 .../druid/indexer/TaskStatusPlusTest.java | 0 .../JacksonExtremeDoubleValuesSerdeTest.java | 0 .../druid/java/util/common/BufferUtils.java | 0 .../java/util/common/ByteBufferUtilsTest.java | 0 .../util/common/CompressionUtilsTest.java | 0 .../druid/java/util/common/FileUtilsTest.java | 0 .../java/util/common/GranularityTest.java | 0 .../druid/java/util/common/NumbersTest.java | 0 .../java/util/common/RetryUtilsTest.java | 0 .../java/util/common/StreamUtilsTest.java | 0 .../java/util/common/StringUtilsTest.java | 0 .../util/common/guava/BaseSequenceTest.java | 0 .../util/common/guava/ComparatorsTest.java | 0 .../util/common/guava/ConcatSequenceTest.java | 0 .../common/guava/FilteredSequenceTest.java | 0 .../common/guava/FunctionalIterableTest.java | 0 .../common/guava/FunctionalIteratorTest.java | 0 .../common/guava/LimitedSequenceTest.java | 0 .../util/common/guava/MappedSequenceTest.java | 0 .../util/common/guava/MergeIteratorTest.java | 0 .../util/common/guava/MergeSequenceTest.java | 0 .../util/common/guava/SequenceTestHelper.java | 0 .../java/util/common/guava/TestSequence.java | 0 .../common/guava/UnsupportedSequence.java | 0 .../common/guava/WithEffectSequenceTest.java | 0 .../common/guava/WrappingSequenceTest.java | 0 .../guava/nary/SortedMergeIteratorTest.java | 0 .../java/util/common/io/NativeIOTest.java | 0 .../io/smoosh/SmooshedFileMapperTest.java | 0 .../util/common/lifecycle/LifecycleTest.java | 0 .../java/util/common/logger/LoggerTest.java | 0 .../parsers/FlatTextFormatParserTest.java | 0 .../common/parsers/JSONPathParserTest.java | 0 .../common/parsers/JavaScriptParserTest.java | 0 .../util/common/parsers/RegexParserTest.java | 0 .../common/parsers/TimestampParserTest.java | 0 .../emitter/core/ComposingEmitterTest.java | 0 .../core/CustomEmitterFactoryTest.java | 0 .../java/util/emitter/core/EmitterTest.java | 0 .../java/util/emitter/core/GoHandler.java | 0 .../java/util/emitter/core/GoHandlers.java | 0 .../emitter/core/HttpEmitterConfigTest.java | 0 .../util/emitter/core/HttpEmitterTest.java | 0 .../core/HttpPostEmitterStressTest.java | 0 .../java/util/emitter/core/IntEvent.java | 0 .../core/LoggingEmitterConfigTest.java | 0 .../util/emitter/core/MockHttpClient.java | 0 .../ParametrizedUriEmitterConfigTest.java | 0 .../core/ParametrizedUriEmitterTest.java | 0 .../util/emitter/service/AlertEventTest.java | 0 .../service/ServiceMetricEventTest.java | 0 .../java/util/emitter/service/UnitEvent.java | 0 .../util/http/client/AsyncHttpClientTest.java | 0 .../util/http/client/FriendlyServersTest.java | 0 .../util/http/client/JankyServersTest.java | 0 .../AppendableByteArrayInputStreamTest.java | 0 .../http/client/pool/ResourcePoolTest.java | 0 ...equenceInputStreamResponseHandlerTest.java | 0 .../util/metrics/CgroupMemoryMonitorTest.java | 0 .../util/metrics/CpuAcctDeltaMonitorTest.java | 0 .../druid/java/util/metrics/GcNameTest.java | 0 .../java/util/metrics/JvmMonitorTest.java | 0 .../util/metrics/JvmPidDiscovererTest.java | 0 .../java/util/metrics/MonitorUtilsTest.java | 0 .../druid/java/util/metrics/MonitorsTest.java | 0 .../java/util/metrics/SigarLoadTest.java | 0 .../util/metrics/SigarPidDiscovererTest.java | 0 .../java/util/metrics/StubServiceEmitter.java | 0 .../util/metrics/cgroups/CpuAcctTest.java | 0 .../java/util/metrics/cgroups/MemoryTest.java | 0 .../cgroups/ProcCgroupDiscovererTest.java | 0 .../java/util/metrics/cgroups/TestUtils.java | 0 .../apache/druid/js/JavaScriptConfigTest.java | 0 .../org/apache/druid/math/expr/EvalTest.java | 0 .../apache/druid/math/expr/FunctionTest.java | 0 .../apache/druid/math/expr/ParserTest.java | 0 .../metadata/DefaultPasswordProviderTest.java | 0 ...vironmentVariablePasswordProviderTest.java | 0 .../MetadataStorageConnectorConfigTest.java | 0 .../druid/segment/SegmentUtilsTest.java | 0 .../loading/NoopDataSegmentArchiver.java | 0 .../loading/NoopDataSegmentKiller.java | 0 .../segment/loading/NoopDataSegmentMover.java | 0 .../DeadlockDetectingFailOnTimeout.java | 0 .../testing/DeadlockDetectingTimeout.java | 0 .../druid/timeline/DataSegmentTest.java | 0 .../druid/timeline/DataSegmentUtilsTest.java | 0 .../VersionedIntervalTimelineTest.java | 0 .../partition/IntegerPartitionChunkTest.java | 0 .../timeline/partition/NoneShardSpecTest.java | 0 .../partition/StringPartitionChunkTest.java | 0 .../src/test/resources/cpuacct.usage_all | 0 .../src/test/resources/keystore.jks | Bin {api => core}/src/test/resources/log4j2.xml | 0 .../src/test/resources/loremipsum.txt | 0 .../src/test/resources/memory.numa_stat | 0 .../src/test/resources/memory.stat | 0 .../src/test/resources/proc.cgroups | 0 .../src/test/resources/proc.mounts | 0 .../src/test/resources/proc.pid.cgroup | 0 docs/content/design/realtime.md | 2 +- docs/content/development/modules.md | 2 +- examples/pom.xml | 2 +- extendedset/pom.xml | 2 +- .../ambari-metrics-emitter/pom.xml | 14 +- extensions-contrib/azure-extensions/pom.xml | 2 +- extensions-contrib/cassandra-storage/pom.xml | 2 +- .../cloudfiles-extensions/pom.xml | 2 +- extensions-contrib/distinctcount/pom.xml | 2 +- extensions-contrib/druid-rocketmq/pom.xml | 2 +- extensions-contrib/google-extensions/pom.xml | 2 +- extensions-contrib/graphite-emitter/pom.xml | 14 +- extensions-contrib/influx-extensions/pom.xml | 2 +- .../kafka-eight-simpleConsumer/pom.xml | 8 +- extensions-contrib/kafka-emitter/pom.xml | 14 +- extensions-contrib/opentsdb-emitter/pom.xml | 2 +- extensions-contrib/rabbitmq/pom.xml | 2 +- extensions-contrib/redis-cache/pom.xml | 2 +- .../sqlserver-metadata-storage/pom.xml | 8 +- extensions-contrib/statsd-emitter/pom.xml | 14 +- extensions-contrib/time-min-max/pom.xml | 10 +- extensions-contrib/virtual-columns/pom.xml | 8 +- extensions-core/avro-extensions/pom.xml | 2 +- extensions-core/datasketches/pom.xml | 4 +- extensions-core/hdfs-storage/pom.xml | 14 +- extensions-core/histogram/pom.xml | 2 +- extensions-core/kafka-eight/pom.xml | 2 +- .../kafka-extraction-namespace/pom.xml | 2 +- .../kafka-indexing-service/pom.xml | 2 +- extensions-core/lookups-cached-global/pom.xml | 2 +- extensions-core/lookups-cached-single/pom.xml | 2 +- .../mysql-metadata-storage/pom.xml | 8 +- .../postgresql-metadata-storage/pom.xml | 8 +- extensions-core/protobuf-extensions/pom.xml | 2 +- extensions-core/s3-extensions/pom.xml | 8 +- .../simple-client-sslcontext/pom.xml | 14 +- extensions-core/stats/pom.xml | 2 +- hll/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 11 +- integration-tests/pom.xml | 2 +- .../src/main}/resources/log4j2.xml | 2 +- java-util/pom.xml | 288 ------------- pom.xml | 4 +- processing/pom.xml | 11 +- server/pom.xml | 4 +- services/pom.xml | 4 +- sql/pom.xml | 2 +- 600 files changed, 446 insertions(+), 878 deletions(-) delete mode 100644 api/pom.xml delete mode 100644 common/pom.xml create mode 100644 core/pom.xml rename {common => core}/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 (100%) rename {common => core}/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java (100%) rename {common => core}/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java (100%) rename {common => core}/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java (100%) rename {common => core}/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java (100%) rename {common => core}/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java (100%) rename {common => core}/src/main/java/org/apache/druid/audit/AuditEntry.java (98%) rename {common => core}/src/main/java/org/apache/druid/audit/AuditInfo.java (100%) rename {common => core}/src/main/java/org/apache/druid/audit/AuditManager.java (100%) rename {api => core}/src/main/java/org/apache/druid/cli/CliCommandCreator.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/BlockingPool.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/CombiningIterable.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/CombiningIterator.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/DummyBlockingPool.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/NonBlockingPool.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/Releaser.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/ResourceHolder.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/SerializablePair.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/StupidPool.java (100%) rename {common => core}/src/main/java/org/apache/druid/collections/StupidResourceHolder.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/config/ConfigManager.java (99%) rename {common => core}/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/config/ConfigSerde.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/config/Log4jShutdown.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/common/config/NullHandling.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/guava/CombiningSequence.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/guava/DSuppliers.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/guava/GuavaUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/guava/SettableSupplier.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/ByteUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/PropUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/SerializerUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/SocketUtil.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/UUIDUtils.java (100%) rename {common => core}/src/main/java/org/apache/druid/common/utils/VMUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java (100%) rename {common => core}/src/main/java/org/apache/druid/concurrent/LifecycleLock.java (100%) rename {common => core}/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java (100%) rename {common => core}/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/Committer.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/Firehose.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/FirehoseFactory.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/FirehoseV2.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/InputRow.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/InputSplit.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/MapBasedRow.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/Row.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/Rows.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java (100%) rename {api => core}/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/Binders.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/ConditionalMultibind.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/ConfigProvider.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/DruidScopes.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/Jerseys.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/JsonConfigProvider.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/JsonConfigurator.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/KeyHolder.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/LazySingleton.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/LifecycleModule.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/LifecycleScope.java (100%) rename {common => core}/src/main/java/org/apache/druid/guice/ListProvider.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/ManageLifecycle.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/PolyBind.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/SupplierProvider.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/annotations/Global.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/annotations/Json.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/guice/annotations/PublicApi.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/annotations/Self.java (100%) rename {api => core}/src/main/java/org/apache/druid/guice/annotations/Smile.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/IngestionState.java (100%) rename {common => core}/src/main/java/org/apache/druid/indexer/Jobby.java (100%) rename {common => core}/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/RunnerTaskState.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskInfo.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskLocation.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskState.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskStatus.java (100%) rename {api => core}/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java (100%) rename {api => core}/src/main/java/org/apache/druid/initialization/DruidModule.java (100%) rename {common => core}/src/main/java/org/apache/druid/io/ByteBufferInputStream.java (100%) rename {common => core}/src/main/java/org/apache/druid/io/Channels.java (100%) rename {common => core}/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java (100%) rename {api => core}/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java (100%) rename {api => core}/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/Cacheable.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/DateTimes.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/FileUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/IAE.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/IOE.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/ISE.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/Intervals.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/JodaUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/MapUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/Numbers.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/Pair.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/RE.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/RetryUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/StreamUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/StringUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/UOE.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/collect/Utils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/config/Config.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/Closer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/logger/Logger.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java (98%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/Event.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/Request.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/Monitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/Monitors.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java (100%) rename {java-util => core}/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java (100%) rename {api => core}/src/main/java/org/apache/druid/js/JavaScriptConfig.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/Evals.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/Expr.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/ExprEval.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/ExprType.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/Function.java (100%) rename {common => core}/src/main/java/org/apache/druid/math/expr/Parser.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/EntryExistsException.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java (100%) rename {common => core}/src/main/java/org/apache/druid/metadata/PasswordProvider.java (100%) rename {api => core}/src/main/java/org/apache/druid/query/SegmentDescriptor.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/SegmentUtils.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/LoadSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java (100%) rename {api => core}/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java (100%) rename {api => core}/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java (100%) rename {api => core}/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java (100%) rename {api => core}/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java (100%) rename {api => core}/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java (100%) rename {api => core}/src/main/java/org/apache/druid/tasklogs/TaskLogs.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/DataSegment.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java (98%) rename {common => core}/src/main/java/org/apache/druid/timeline/LogicalSegment.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/TimelineLookup.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java (100%) rename {api => core}/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java (100%) rename {common => core}/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java (100%) rename {api => core}/src/main/java/org/apache/druid/utils/CircularBuffer.java (100%) rename {api => core}/src/main/java/org/apache/druid/utils/CompressionUtils.java (100%) rename {api => core}/src/main/java/org/apache/druid/utils/Runnables.java (100%) rename {common => core}/src/main/resources/log4j2.debug.xml (100%) rename {common => core}/src/main/resources/log4j2.xml (100%) rename {common => core}/src/main/resources/services/javax.annotation.processing.Processor (100%) rename {api => core}/src/test/java/org/apache/druid/TestObjectMapper.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/BlockingPoolTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/CloseableStupidPool.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/CombiningIterableTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/IteratorShell.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/SerializablePairTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/StupidPoolTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/LogTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/concurrent/ExecsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/guice/PolyBindTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/BufferUtils.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/GranularityTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/NumbersTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java (100%) rename {java-util => core}/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java (100%) rename {api => core}/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/math/expr/EvalTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/math/expr/FunctionTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/math/expr/ParserTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java (100%) rename {api => core}/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java (100%) rename {api => core}/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java (100%) rename {common => core}/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java (100%) rename {common => core}/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java (100%) rename {api => core}/src/test/java/org/apache/druid/timeline/DataSegmentTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java (100%) rename {api => core}/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java (100%) rename {common => core}/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java (100%) rename {java-util => core}/src/test/resources/cpuacct.usage_all (100%) rename {java-util => core}/src/test/resources/keystore.jks (100%) rename {api => core}/src/test/resources/log4j2.xml (100%) rename {java-util => core}/src/test/resources/loremipsum.txt (100%) rename {java-util => core}/src/test/resources/memory.numa_stat (100%) rename {java-util => core}/src/test/resources/memory.stat (100%) rename {java-util => core}/src/test/resources/proc.cgroups (100%) rename {java-util => core}/src/test/resources/proc.mounts (100%) rename {java-util => core}/src/test/resources/proc.pid.cgroup (100%) rename {java-util/src/test => integration-tests/src/main}/resources/log4j2.xml (97%) delete mode 100644 java-util/pom.xml diff --git a/api/pom.xml b/api/pom.xml deleted file mode 100644 index c603c0e3984d..000000000000 --- a/api/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - 4.0.0 - - druid-api - druid-api - Druid Extensions API - - - org.apache.druid - druid - 0.13.0-incubating-SNAPSHOT - - - - - org.apache.druid - java-util - ${project.parent.version} - - - org.slf4j - slf4j-api - - - - - com.google.inject - guice - - - com.google.inject.extensions - guice-multibindings - - - io.airlift - airline - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - - - org.hibernate - hibernate-validator - - - javax.validation - validation-api - - - commons-io - commons-io - - - com.google.code.findbugs - jsr305 - - - net.thisptr - jackson-jq - - - it.unimi.dsi - fastutil - - - - junit - junit - test - - - org.slf4j - slf4j-simple - test - true - - - org.apache.logging.log4j - log4j-api - test - - - org.apache.logging.log4j - log4j-core - test - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.apache.logging.log4j - log4j-1.2-api - test - - - org.apache.logging.log4j - log4j-jul - test - - - - - - - org.apache.maven.plugins - maven-release-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - - - diff --git a/aws-common/pom.xml b/aws-common/pom.xml index a8e2c88dc172..fd1e874f1caa 100644 --- a/aws-common/pom.xml +++ b/aws-common/pom.xml @@ -34,7 +34,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} diff --git a/common/pom.xml b/common/pom.xml deleted file mode 100644 index 8feb760bb894..000000000000 --- a/common/pom.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - 4.0.0 - - druid-common - druid-common - druid-common - - - org.apache.druid - druid - 0.13.0-incubating-SNAPSHOT - - - - - org.apache.druid - java-util - ${project.parent.version} - - - org.slf4j - slf4j-api - - - - - org.apache.druid - druid-api - ${project.parent.version} - - - - commons-codec - commons-codec - - - commons-lang - commons-lang - - - org.apache.commons - commons-dbcp2 - - - commons-pool - commons-pool - 1.6 - - - org.skife.config - config-magic - - - org.hibernate - hibernate-validator - - - javax.el - javax.el-api - - - javax.validation - validation-api - - - com.google.guava - guava - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-guava - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - - - com.google.inject - guice - - - com.google.inject.extensions - guice-multibindings - - - org.jdbi - jdbi - - - joda-time - joda-time - - - com.google.code.findbugs - jsr305 - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-jul - - - org.apache.logging.log4j - log4j-1.2-api - - - org.slf4j - jcl-over-slf4j - - - io.dropwizard.metrics - metrics-core - - - - - com.lmax - disruptor - - - - org.antlr - antlr4-runtime - - - - - junit - junit - test - - - org.easymock - easymock - test - - - org.apache.druid - java-util - ${project.parent.version} - test-jar - test - - - org.hamcrest - hamcrest-all - test - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.antlr - antlr4-maven-plugin - - - - antlr4 - - - - - - - - - - strict - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - -Xep:MissingOverride:WARN - - - - - - - - - diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 000000000000..2c468d1127d0 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,386 @@ + + + + + + 4.0.0 + + druid-core + druid-core + Odds and ends + + + druid + org.apache.druid + 0.13.0-incubating-SNAPSHOT + + + + UTF-8 + 1.6.5 + ${sigar.base.version}.132 + + + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-lang + commons-lang + + + org.apache.commons + commons-compress + + + org.apache.commons + commons-dbcp2 + + + commons-pool + commons-pool + 1.6 + + + org.skife.config + config-magic + + + org.hibernate + hibernate-validator + + + javax.el + javax.el-api + + + com.google.guava + guava + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-guava + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + + + com.google.inject + guice + + + com.google.inject.extensions + guice-multibindings + + + org.jdbi + jdbi + + + joda-time + joda-time + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-jul + + + org.apache.logging.log4j + log4j-1.2-api + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + + + io.airlift + airline + + + io.dropwizard.metrics + metrics-core + + + net.thisptr + jackson-jq + + + it.unimi.dsi + fastutil + + + + com.opencsv + opencsv + + + + org.mozilla + rhino + + + org.tukaani + xz + + + com.github.luben + zstd-jni + + + com.jayway.jsonpath + json-path + + + + org.antlr + antlr4-runtime + + + + + + + com.lmax + disruptor + + + + + + com.google.code.findbugs + jsr305 + + + net.java.dev.jna + jna + + + javax.validation + validation-api + + + org.asynchttpclient + async-http-client + + + + + org.hyperic + sigar + ${sigar.version} + + + org.hyperic + sigar-dist + ${sigar.version} + zip + + provided + + + org.gridkit.lab + jvm-attach-api + + + + + io.netty + netty + + + + + + junit + junit + test + + + org.easymock + easymock + test + + + org.hamcrest + hamcrest-all + test + + + org.slf4j + slf4j-simple + test + true + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + + + + + org.apache.maven.plugins + maven-release-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.antlr + antlr4-maven-plugin + + + + antlr4 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-sigar-lib-to-resources + generate-resources + + unpack-dependencies + + + org.hyperic + sigar-dist + **/sigar-bin/lib/* + **/sigar-bin/lib/*jar + + ${project.build.directory} + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + java.library.path + ${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib/ + + + + + + + + + + ${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib + + + + + + + + sigar + https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/ + + + + + + strict + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + -Xep:MissingOverride:WARN + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 b/core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 similarity index 100% rename from common/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 rename to core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 diff --git a/common/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java b/core/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java similarity index 100% rename from common/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java rename to core/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java diff --git a/common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java b/core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java similarity index 100% rename from common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java rename to core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java diff --git a/common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java b/core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java similarity index 100% rename from common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java rename to core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java diff --git a/common/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java b/core/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java similarity index 100% rename from common/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java rename to core/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java diff --git a/common/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java b/core/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java similarity index 100% rename from common/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java rename to core/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java diff --git a/common/src/main/java/org/apache/druid/audit/AuditEntry.java b/core/src/main/java/org/apache/druid/audit/AuditEntry.java similarity index 98% rename from common/src/main/java/org/apache/druid/audit/AuditEntry.java rename to core/src/main/java/org/apache/druid/audit/AuditEntry.java index 12cbe96a96b3..2aeb77279953 100644 --- a/common/src/main/java/org/apache/druid/audit/AuditEntry.java +++ b/core/src/main/java/org/apache/druid/audit/AuditEntry.java @@ -91,9 +91,9 @@ public DateTime getAuditTime() return auditTime; } - public static AuditEntry.Builder builder() + public static Builder builder() { - return new AuditEntry.Builder(); + return new Builder(); } @Override diff --git a/common/src/main/java/org/apache/druid/audit/AuditInfo.java b/core/src/main/java/org/apache/druid/audit/AuditInfo.java similarity index 100% rename from common/src/main/java/org/apache/druid/audit/AuditInfo.java rename to core/src/main/java/org/apache/druid/audit/AuditInfo.java diff --git a/common/src/main/java/org/apache/druid/audit/AuditManager.java b/core/src/main/java/org/apache/druid/audit/AuditManager.java similarity index 100% rename from common/src/main/java/org/apache/druid/audit/AuditManager.java rename to core/src/main/java/org/apache/druid/audit/AuditManager.java diff --git a/api/src/main/java/org/apache/druid/cli/CliCommandCreator.java b/core/src/main/java/org/apache/druid/cli/CliCommandCreator.java similarity index 100% rename from api/src/main/java/org/apache/druid/cli/CliCommandCreator.java rename to core/src/main/java/org/apache/druid/cli/CliCommandCreator.java diff --git a/common/src/main/java/org/apache/druid/collections/BlockingPool.java b/core/src/main/java/org/apache/druid/collections/BlockingPool.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/BlockingPool.java rename to core/src/main/java/org/apache/druid/collections/BlockingPool.java diff --git a/common/src/main/java/org/apache/druid/collections/CombiningIterable.java b/core/src/main/java/org/apache/druid/collections/CombiningIterable.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/CombiningIterable.java rename to core/src/main/java/org/apache/druid/collections/CombiningIterable.java diff --git a/common/src/main/java/org/apache/druid/collections/CombiningIterator.java b/core/src/main/java/org/apache/druid/collections/CombiningIterator.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/CombiningIterator.java rename to core/src/main/java/org/apache/druid/collections/CombiningIterator.java diff --git a/common/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java b/core/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java rename to core/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java diff --git a/common/src/main/java/org/apache/druid/collections/DummyBlockingPool.java b/core/src/main/java/org/apache/druid/collections/DummyBlockingPool.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/DummyBlockingPool.java rename to core/src/main/java/org/apache/druid/collections/DummyBlockingPool.java diff --git a/common/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java b/core/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java rename to core/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java diff --git a/common/src/main/java/org/apache/druid/collections/NonBlockingPool.java b/core/src/main/java/org/apache/druid/collections/NonBlockingPool.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/NonBlockingPool.java rename to core/src/main/java/org/apache/druid/collections/NonBlockingPool.java diff --git a/common/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java b/core/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java rename to core/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java diff --git a/common/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java b/core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java rename to core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java diff --git a/common/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java b/core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java rename to core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java diff --git a/common/src/main/java/org/apache/druid/collections/Releaser.java b/core/src/main/java/org/apache/druid/collections/Releaser.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/Releaser.java rename to core/src/main/java/org/apache/druid/collections/Releaser.java diff --git a/common/src/main/java/org/apache/druid/collections/ResourceHolder.java b/core/src/main/java/org/apache/druid/collections/ResourceHolder.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/ResourceHolder.java rename to core/src/main/java/org/apache/druid/collections/ResourceHolder.java diff --git a/common/src/main/java/org/apache/druid/collections/SerializablePair.java b/core/src/main/java/org/apache/druid/collections/SerializablePair.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/SerializablePair.java rename to core/src/main/java/org/apache/druid/collections/SerializablePair.java diff --git a/common/src/main/java/org/apache/druid/collections/StupidPool.java b/core/src/main/java/org/apache/druid/collections/StupidPool.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/StupidPool.java rename to core/src/main/java/org/apache/druid/collections/StupidPool.java diff --git a/common/src/main/java/org/apache/druid/collections/StupidResourceHolder.java b/core/src/main/java/org/apache/druid/collections/StupidResourceHolder.java similarity index 100% rename from common/src/main/java/org/apache/druid/collections/StupidResourceHolder.java rename to core/src/main/java/org/apache/druid/collections/StupidResourceHolder.java diff --git a/common/src/main/java/org/apache/druid/common/config/ConfigManager.java b/core/src/main/java/org/apache/druid/common/config/ConfigManager.java similarity index 99% rename from common/src/main/java/org/apache/druid/common/config/ConfigManager.java rename to core/src/main/java/org/apache/druid/common/config/ConfigManager.java index 1e88213262b0..f21742609b4c 100644 --- a/common/src/main/java/org/apache/druid/common/config/ConfigManager.java +++ b/core/src/main/java/org/apache/druid/common/config/ConfigManager.java @@ -56,7 +56,7 @@ public class ConfigManager private final ConcurrentMap watchedConfigs; private final String configTable; - private volatile ConfigManager.PollingCallable poller; + private volatile PollingCallable poller; @Inject public ConfigManager(MetadataStorageConnector dbConnector, Supplier dbTables, Supplier config) diff --git a/common/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java b/core/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java rename to core/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java diff --git a/common/src/main/java/org/apache/druid/common/config/ConfigSerde.java b/core/src/main/java/org/apache/druid/common/config/ConfigSerde.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/config/ConfigSerde.java rename to core/src/main/java/org/apache/druid/common/config/ConfigSerde.java diff --git a/common/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java b/core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java rename to core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java diff --git a/common/src/main/java/org/apache/druid/common/config/Log4jShutdown.java b/core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/config/Log4jShutdown.java rename to core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java diff --git a/java-util/src/main/java/org/apache/druid/common/config/NullHandling.java b/core/src/main/java/org/apache/druid/common/config/NullHandling.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/common/config/NullHandling.java rename to core/src/main/java/org/apache/druid/common/config/NullHandling.java diff --git a/java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java b/core/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java rename to core/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java diff --git a/common/src/main/java/org/apache/druid/common/guava/CombiningSequence.java b/core/src/main/java/org/apache/druid/common/guava/CombiningSequence.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/guava/CombiningSequence.java rename to core/src/main/java/org/apache/druid/common/guava/CombiningSequence.java diff --git a/common/src/main/java/org/apache/druid/common/guava/DSuppliers.java b/core/src/main/java/org/apache/druid/common/guava/DSuppliers.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/guava/DSuppliers.java rename to core/src/main/java/org/apache/druid/common/guava/DSuppliers.java diff --git a/common/src/main/java/org/apache/druid/common/guava/GuavaUtils.java b/core/src/main/java/org/apache/druid/common/guava/GuavaUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/guava/GuavaUtils.java rename to core/src/main/java/org/apache/druid/common/guava/GuavaUtils.java diff --git a/common/src/main/java/org/apache/druid/common/guava/SettableSupplier.java b/core/src/main/java/org/apache/druid/common/guava/SettableSupplier.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/guava/SettableSupplier.java rename to core/src/main/java/org/apache/druid/common/guava/SettableSupplier.java diff --git a/common/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java b/core/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java rename to core/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java diff --git a/common/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java b/core/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java rename to core/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java diff --git a/common/src/main/java/org/apache/druid/common/utils/ByteUtils.java b/core/src/main/java/org/apache/druid/common/utils/ByteUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/ByteUtils.java rename to core/src/main/java/org/apache/druid/common/utils/ByteUtils.java diff --git a/common/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java b/core/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java rename to core/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java diff --git a/common/src/main/java/org/apache/druid/common/utils/PropUtils.java b/core/src/main/java/org/apache/druid/common/utils/PropUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/PropUtils.java rename to core/src/main/java/org/apache/druid/common/utils/PropUtils.java diff --git a/common/src/main/java/org/apache/druid/common/utils/SerializerUtils.java b/core/src/main/java/org/apache/druid/common/utils/SerializerUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/SerializerUtils.java rename to core/src/main/java/org/apache/druid/common/utils/SerializerUtils.java diff --git a/common/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java b/core/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java rename to core/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java diff --git a/common/src/main/java/org/apache/druid/common/utils/SocketUtil.java b/core/src/main/java/org/apache/druid/common/utils/SocketUtil.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/SocketUtil.java rename to core/src/main/java/org/apache/druid/common/utils/SocketUtil.java diff --git a/common/src/main/java/org/apache/druid/common/utils/UUIDUtils.java b/core/src/main/java/org/apache/druid/common/utils/UUIDUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/UUIDUtils.java rename to core/src/main/java/org/apache/druid/common/utils/UUIDUtils.java diff --git a/common/src/main/java/org/apache/druid/common/utils/VMUtils.java b/core/src/main/java/org/apache/druid/common/utils/VMUtils.java similarity index 100% rename from common/src/main/java/org/apache/druid/common/utils/VMUtils.java rename to core/src/main/java/org/apache/druid/common/utils/VMUtils.java diff --git a/java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java b/core/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java rename to core/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java diff --git a/common/src/main/java/org/apache/druid/concurrent/LifecycleLock.java b/core/src/main/java/org/apache/druid/concurrent/LifecycleLock.java similarity index 100% rename from common/src/main/java/org/apache/druid/concurrent/LifecycleLock.java rename to core/src/main/java/org/apache/druid/concurrent/LifecycleLock.java diff --git a/common/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java b/core/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java similarity index 100% rename from common/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java rename to core/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java diff --git a/common/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java b/core/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java similarity index 100% rename from common/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java rename to core/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java diff --git a/api/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java rename to core/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java diff --git a/api/src/main/java/org/apache/druid/data/input/Committer.java b/core/src/main/java/org/apache/druid/data/input/Committer.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/Committer.java rename to core/src/main/java/org/apache/druid/data/input/Committer.java diff --git a/api/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java rename to core/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java diff --git a/api/src/main/java/org/apache/druid/data/input/Firehose.java b/core/src/main/java/org/apache/druid/data/input/Firehose.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/Firehose.java rename to core/src/main/java/org/apache/druid/data/input/Firehose.java diff --git a/api/src/main/java/org/apache/druid/data/input/FirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/FirehoseFactory.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/FirehoseFactory.java rename to core/src/main/java/org/apache/druid/data/input/FirehoseFactory.java diff --git a/api/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java b/core/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java rename to core/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java diff --git a/api/src/main/java/org/apache/druid/data/input/FirehoseV2.java b/core/src/main/java/org/apache/druid/data/input/FirehoseV2.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/FirehoseV2.java rename to core/src/main/java/org/apache/druid/data/input/FirehoseV2.java diff --git a/api/src/main/java/org/apache/druid/data/input/InputRow.java b/core/src/main/java/org/apache/druid/data/input/InputRow.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/InputRow.java rename to core/src/main/java/org/apache/druid/data/input/InputRow.java diff --git a/api/src/main/java/org/apache/druid/data/input/InputSplit.java b/core/src/main/java/org/apache/druid/data/input/InputSplit.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/InputSplit.java rename to core/src/main/java/org/apache/druid/data/input/InputSplit.java diff --git a/api/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java b/core/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java rename to core/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java diff --git a/api/src/main/java/org/apache/druid/data/input/MapBasedRow.java b/core/src/main/java/org/apache/druid/data/input/MapBasedRow.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/MapBasedRow.java rename to core/src/main/java/org/apache/druid/data/input/MapBasedRow.java diff --git a/api/src/main/java/org/apache/druid/data/input/Row.java b/core/src/main/java/org/apache/druid/data/input/Row.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/Row.java rename to core/src/main/java/org/apache/druid/data/input/Row.java diff --git a/api/src/main/java/org/apache/druid/data/input/Rows.java b/core/src/main/java/org/apache/druid/data/input/Rows.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/Rows.java rename to core/src/main/java/org/apache/druid/data/input/Rows.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java rename to core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java b/core/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java rename to core/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java rename to core/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java rename to core/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java rename to core/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java b/core/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java rename to core/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java rename to core/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java rename to core/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java rename to core/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java similarity index 100% rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java diff --git a/api/src/main/java/org/apache/druid/guice/Binders.java b/core/src/main/java/org/apache/druid/guice/Binders.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/Binders.java rename to core/src/main/java/org/apache/druid/guice/Binders.java diff --git a/api/src/main/java/org/apache/druid/guice/ConditionalMultibind.java b/core/src/main/java/org/apache/druid/guice/ConditionalMultibind.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/ConditionalMultibind.java rename to core/src/main/java/org/apache/druid/guice/ConditionalMultibind.java diff --git a/common/src/main/java/org/apache/druid/guice/ConfigProvider.java b/core/src/main/java/org/apache/druid/guice/ConfigProvider.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/ConfigProvider.java rename to core/src/main/java/org/apache/druid/guice/ConfigProvider.java diff --git a/api/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java b/core/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java rename to core/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java diff --git a/api/src/main/java/org/apache/druid/guice/DruidScopes.java b/core/src/main/java/org/apache/druid/guice/DruidScopes.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/DruidScopes.java rename to core/src/main/java/org/apache/druid/guice/DruidScopes.java diff --git a/common/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java b/core/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java rename to core/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java diff --git a/common/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java b/core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java rename to core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java diff --git a/common/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java b/core/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java rename to core/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java diff --git a/common/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java b/core/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java rename to core/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java diff --git a/common/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java b/core/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java rename to core/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java diff --git a/api/src/main/java/org/apache/druid/guice/Jerseys.java b/core/src/main/java/org/apache/druid/guice/Jerseys.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/Jerseys.java rename to core/src/main/java/org/apache/druid/guice/Jerseys.java diff --git a/api/src/main/java/org/apache/druid/guice/JsonConfigProvider.java b/core/src/main/java/org/apache/druid/guice/JsonConfigProvider.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/JsonConfigProvider.java rename to core/src/main/java/org/apache/druid/guice/JsonConfigProvider.java diff --git a/api/src/main/java/org/apache/druid/guice/JsonConfigurator.java b/core/src/main/java/org/apache/druid/guice/JsonConfigurator.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/JsonConfigurator.java rename to core/src/main/java/org/apache/druid/guice/JsonConfigurator.java diff --git a/api/src/main/java/org/apache/druid/guice/KeyHolder.java b/core/src/main/java/org/apache/druid/guice/KeyHolder.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/KeyHolder.java rename to core/src/main/java/org/apache/druid/guice/KeyHolder.java diff --git a/api/src/main/java/org/apache/druid/guice/LazySingleton.java b/core/src/main/java/org/apache/druid/guice/LazySingleton.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/LazySingleton.java rename to core/src/main/java/org/apache/druid/guice/LazySingleton.java diff --git a/api/src/main/java/org/apache/druid/guice/LifecycleModule.java b/core/src/main/java/org/apache/druid/guice/LifecycleModule.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/LifecycleModule.java rename to core/src/main/java/org/apache/druid/guice/LifecycleModule.java diff --git a/api/src/main/java/org/apache/druid/guice/LifecycleScope.java b/core/src/main/java/org/apache/druid/guice/LifecycleScope.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/LifecycleScope.java rename to core/src/main/java/org/apache/druid/guice/LifecycleScope.java diff --git a/common/src/main/java/org/apache/druid/guice/ListProvider.java b/core/src/main/java/org/apache/druid/guice/ListProvider.java similarity index 100% rename from common/src/main/java/org/apache/druid/guice/ListProvider.java rename to core/src/main/java/org/apache/druid/guice/ListProvider.java diff --git a/api/src/main/java/org/apache/druid/guice/ManageLifecycle.java b/core/src/main/java/org/apache/druid/guice/ManageLifecycle.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/ManageLifecycle.java rename to core/src/main/java/org/apache/druid/guice/ManageLifecycle.java diff --git a/api/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java b/core/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java rename to core/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java diff --git a/api/src/main/java/org/apache/druid/guice/PolyBind.java b/core/src/main/java/org/apache/druid/guice/PolyBind.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/PolyBind.java rename to core/src/main/java/org/apache/druid/guice/PolyBind.java diff --git a/api/src/main/java/org/apache/druid/guice/SupplierProvider.java b/core/src/main/java/org/apache/druid/guice/SupplierProvider.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/SupplierProvider.java rename to core/src/main/java/org/apache/druid/guice/SupplierProvider.java diff --git a/api/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java b/core/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java rename to core/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java diff --git a/java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java b/core/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java rename to core/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Global.java b/core/src/main/java/org/apache/druid/guice/annotations/Global.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/annotations/Global.java rename to core/src/main/java/org/apache/druid/guice/annotations/Global.java diff --git a/api/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java b/core/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java rename to core/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Json.java b/core/src/main/java/org/apache/druid/guice/annotations/Json.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/annotations/Json.java rename to core/src/main/java/org/apache/druid/guice/annotations/Json.java diff --git a/java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java b/core/src/main/java/org/apache/druid/guice/annotations/PublicApi.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java rename to core/src/main/java/org/apache/druid/guice/annotations/PublicApi.java diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Self.java b/core/src/main/java/org/apache/druid/guice/annotations/Self.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/annotations/Self.java rename to core/src/main/java/org/apache/druid/guice/annotations/Self.java diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Smile.java b/core/src/main/java/org/apache/druid/guice/annotations/Smile.java similarity index 100% rename from api/src/main/java/org/apache/druid/guice/annotations/Smile.java rename to core/src/main/java/org/apache/druid/guice/annotations/Smile.java diff --git a/api/src/main/java/org/apache/druid/indexer/IngestionState.java b/core/src/main/java/org/apache/druid/indexer/IngestionState.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/IngestionState.java rename to core/src/main/java/org/apache/druid/indexer/IngestionState.java diff --git a/common/src/main/java/org/apache/druid/indexer/Jobby.java b/core/src/main/java/org/apache/druid/indexer/Jobby.java similarity index 100% rename from common/src/main/java/org/apache/druid/indexer/Jobby.java rename to core/src/main/java/org/apache/druid/indexer/Jobby.java diff --git a/common/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java b/core/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java similarity index 100% rename from common/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java rename to core/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java diff --git a/api/src/main/java/org/apache/druid/indexer/RunnerTaskState.java b/core/src/main/java/org/apache/druid/indexer/RunnerTaskState.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/RunnerTaskState.java rename to core/src/main/java/org/apache/druid/indexer/RunnerTaskState.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskInfo.java b/core/src/main/java/org/apache/druid/indexer/TaskInfo.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskInfo.java rename to core/src/main/java/org/apache/druid/indexer/TaskInfo.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskLocation.java b/core/src/main/java/org/apache/druid/indexer/TaskLocation.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskLocation.java rename to core/src/main/java/org/apache/druid/indexer/TaskLocation.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java b/core/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java rename to core/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java b/core/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java rename to core/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskState.java b/core/src/main/java/org/apache/druid/indexer/TaskState.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskState.java rename to core/src/main/java/org/apache/druid/indexer/TaskState.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskStatus.java b/core/src/main/java/org/apache/druid/indexer/TaskStatus.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskStatus.java rename to core/src/main/java/org/apache/druid/indexer/TaskStatus.java diff --git a/api/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java b/core/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java similarity index 100% rename from api/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java rename to core/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java diff --git a/api/src/main/java/org/apache/druid/initialization/DruidModule.java b/core/src/main/java/org/apache/druid/initialization/DruidModule.java similarity index 100% rename from api/src/main/java/org/apache/druid/initialization/DruidModule.java rename to core/src/main/java/org/apache/druid/initialization/DruidModule.java diff --git a/common/src/main/java/org/apache/druid/io/ByteBufferInputStream.java b/core/src/main/java/org/apache/druid/io/ByteBufferInputStream.java similarity index 100% rename from common/src/main/java/org/apache/druid/io/ByteBufferInputStream.java rename to core/src/main/java/org/apache/druid/io/ByteBufferInputStream.java diff --git a/common/src/main/java/org/apache/druid/io/Channels.java b/core/src/main/java/org/apache/druid/io/Channels.java similarity index 100% rename from common/src/main/java/org/apache/druid/io/Channels.java rename to core/src/main/java/org/apache/druid/io/Channels.java diff --git a/common/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java b/core/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java similarity index 100% rename from common/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java rename to core/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java diff --git a/api/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java b/core/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java similarity index 100% rename from api/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java rename to core/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java diff --git a/api/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java b/core/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java similarity index 100% rename from api/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java rename to core/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java b/core/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java b/core/src/main/java/org/apache/druid/java/util/common/Cacheable.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java rename to core/src/main/java/org/apache/druid/java/util/common/Cacheable.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java b/core/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java rename to core/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java b/core/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java b/core/src/main/java/org/apache/druid/java/util/common/DateTimes.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java rename to core/src/main/java/org/apache/druid/java/util/common/DateTimes.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java b/core/src/main/java/org/apache/druid/java/util/common/FileUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/FileUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/IAE.java b/core/src/main/java/org/apache/druid/java/util/common/IAE.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/IAE.java rename to core/src/main/java/org/apache/druid/java/util/common/IAE.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/IOE.java b/core/src/main/java/org/apache/druid/java/util/common/IOE.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/IOE.java rename to core/src/main/java/org/apache/druid/java/util/common/IOE.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/ISE.java b/core/src/main/java/org/apache/druid/java/util/common/ISE.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/ISE.java rename to core/src/main/java/org/apache/druid/java/util/common/ISE.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java b/core/src/main/java/org/apache/druid/java/util/common/Intervals.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java rename to core/src/main/java/org/apache/druid/java/util/common/Intervals.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java b/core/src/main/java/org/apache/druid/java/util/common/JodaUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/JodaUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java b/core/src/main/java/org/apache/druid/java/util/common/MapUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/MapUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java b/core/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java rename to core/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java b/core/src/main/java/org/apache/druid/java/util/common/Numbers.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java rename to core/src/main/java/org/apache/druid/java/util/common/Numbers.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Pair.java b/core/src/main/java/org/apache/druid/java/util/common/Pair.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/Pair.java rename to core/src/main/java/org/apache/druid/java/util/common/Pair.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/RE.java b/core/src/main/java/org/apache/druid/java/util/common/RE.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/RE.java rename to core/src/main/java/org/apache/druid/java/util/common/RE.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java b/core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/StringUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/UOE.java b/core/src/main/java/org/apache/druid/java/util/common/UOE.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/UOE.java rename to core/src/main/java/org/apache/druid/java/util/common/UOE.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java b/core/src/main/java/org/apache/druid/java/util/common/collect/Utils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java rename to core/src/main/java/org/apache/druid/java/util/common/collect/Utils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java b/core/src/main/java/org/apache/druid/java/util/common/config/Config.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java rename to core/src/main/java/org/apache/druid/java/util/common/config/Config.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java b/core/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java rename to core/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java rename to core/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java b/core/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java b/core/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java b/core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java b/core/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java b/core/src/main/java/org/apache/druid/java/util/common/io/Closer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java rename to core/src/main/java/org/apache/druid/java/util/common/io/Closer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java b/core/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java rename to core/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java b/core/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java b/core/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java rename to core/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java b/core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java rename to core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java b/core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java rename to core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java b/core/src/main/java/org/apache/druid/java/util/common/logger/Logger.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java rename to core/src/main/java/org/apache/druid/java/util/common/logger/Logger.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java similarity index 98% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java index 0c722932597c..2cdb2339f06d 100644 --- a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java +++ b/core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java @@ -168,7 +168,7 @@ public Set> entrySet() return keySet().stream() .map( field -> { - return new Map.Entry() + return new Entry() { @Override public String getKey() diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java rename to core/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java b/core/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java rename to core/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Event.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Event.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java rename to core/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java rename to core/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java rename to core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java rename to core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java rename to core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java rename to core/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java rename to core/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java rename to core/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java rename to core/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java rename to core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java rename to core/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java b/core/src/main/java/org/apache/druid/java/util/http/client/Request.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java rename to core/src/main/java/org/apache/druid/java/util/http/client/Request.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java b/core/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java rename to core/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java b/core/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java rename to core/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java b/core/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java rename to core/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java b/core/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java rename to core/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java rename to core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java b/core/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java rename to core/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java b/core/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java rename to core/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/Monitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/Monitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java b/core/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java rename to core/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java b/core/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java rename to core/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java b/core/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java rename to core/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java b/core/src/main/java/org/apache/druid/java/util/metrics/Monitors.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java rename to core/src/main/java/org/apache/druid/java/util/metrics/Monitors.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java rename to core/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java rename to core/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java b/core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java rename to core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java rename to core/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java similarity index 100% rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java diff --git a/api/src/main/java/org/apache/druid/js/JavaScriptConfig.java b/core/src/main/java/org/apache/druid/js/JavaScriptConfig.java similarity index 100% rename from api/src/main/java/org/apache/druid/js/JavaScriptConfig.java rename to core/src/main/java/org/apache/druid/js/JavaScriptConfig.java diff --git a/common/src/main/java/org/apache/druid/math/expr/Evals.java b/core/src/main/java/org/apache/druid/math/expr/Evals.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/Evals.java rename to core/src/main/java/org/apache/druid/math/expr/Evals.java diff --git a/common/src/main/java/org/apache/druid/math/expr/Expr.java b/core/src/main/java/org/apache/druid/math/expr/Expr.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/Expr.java rename to core/src/main/java/org/apache/druid/math/expr/Expr.java diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprEval.java b/core/src/main/java/org/apache/druid/math/expr/ExprEval.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/ExprEval.java rename to core/src/main/java/org/apache/druid/math/expr/ExprEval.java diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java b/core/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java rename to core/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java b/core/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java rename to core/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprType.java b/core/src/main/java/org/apache/druid/math/expr/ExprType.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/ExprType.java rename to core/src/main/java/org/apache/druid/math/expr/ExprType.java diff --git a/common/src/main/java/org/apache/druid/math/expr/Function.java b/core/src/main/java/org/apache/druid/math/expr/Function.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/Function.java rename to core/src/main/java/org/apache/druid/math/expr/Function.java diff --git a/common/src/main/java/org/apache/druid/math/expr/Parser.java b/core/src/main/java/org/apache/druid/math/expr/Parser.java similarity index 100% rename from common/src/main/java/org/apache/druid/math/expr/Parser.java rename to core/src/main/java/org/apache/druid/math/expr/Parser.java diff --git a/common/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java b/core/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java rename to core/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java diff --git a/common/src/main/java/org/apache/druid/metadata/EntryExistsException.java b/core/src/main/java/org/apache/druid/metadata/EntryExistsException.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/EntryExistsException.java rename to core/src/main/java/org/apache/druid/metadata/EntryExistsException.java diff --git a/common/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java b/core/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java rename to core/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java b/core/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java rename to core/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java diff --git a/common/src/main/java/org/apache/druid/metadata/PasswordProvider.java b/core/src/main/java/org/apache/druid/metadata/PasswordProvider.java similarity index 100% rename from common/src/main/java/org/apache/druid/metadata/PasswordProvider.java rename to core/src/main/java/org/apache/druid/metadata/PasswordProvider.java diff --git a/api/src/main/java/org/apache/druid/query/SegmentDescriptor.java b/core/src/main/java/org/apache/druid/query/SegmentDescriptor.java similarity index 100% rename from api/src/main/java/org/apache/druid/query/SegmentDescriptor.java rename to core/src/main/java/org/apache/druid/query/SegmentDescriptor.java diff --git a/api/src/main/java/org/apache/druid/segment/SegmentUtils.java b/core/src/main/java/org/apache/druid/segment/SegmentUtils.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/SegmentUtils.java rename to core/src/main/java/org/apache/druid/segment/SegmentUtils.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/LoadSpec.java b/core/src/main/java/org/apache/druid/segment/loading/LoadSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/LoadSpec.java rename to core/src/main/java/org/apache/druid/segment/loading/LoadSpec.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java b/core/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java rename to core/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java b/core/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java rename to core/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java diff --git a/api/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java b/core/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java similarity index 100% rename from api/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java rename to core/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java diff --git a/api/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java b/core/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java similarity index 100% rename from api/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java rename to core/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java similarity index 100% rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java similarity index 100% rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java similarity index 100% rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogs.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogs.java similarity index 100% rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogs.java rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogs.java diff --git a/api/src/main/java/org/apache/druid/timeline/DataSegment.java b/core/src/main/java/org/apache/druid/timeline/DataSegment.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/DataSegment.java rename to core/src/main/java/org/apache/druid/timeline/DataSegment.java diff --git a/api/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java similarity index 98% rename from api/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java rename to core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java index 6edd2101289c..7966991a5310 100644 --- a/api/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java +++ b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java @@ -65,7 +65,7 @@ public Interval apply(String identifier) * * @param dataSource the dataSource corresponding to this identifier * @param identifier segment identifier - * @return a {@link DataSegmentUtils.SegmentIdentifierParts} object if the identifier could be parsed, null otherwise + * @return a {@link SegmentIdentifierParts} object if the identifier could be parsed, null otherwise */ public static SegmentIdentifierParts valueOf(String dataSource, String identifier) { diff --git a/common/src/main/java/org/apache/druid/timeline/LogicalSegment.java b/core/src/main/java/org/apache/druid/timeline/LogicalSegment.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/LogicalSegment.java rename to core/src/main/java/org/apache/druid/timeline/LogicalSegment.java diff --git a/api/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java b/core/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java rename to core/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java diff --git a/common/src/main/java/org/apache/druid/timeline/TimelineLookup.java b/core/src/main/java/org/apache/druid/timeline/TimelineLookup.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/TimelineLookup.java rename to core/src/main/java/org/apache/druid/timeline/TimelineLookup.java diff --git a/common/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java b/core/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java rename to core/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java diff --git a/common/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java b/core/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java rename to core/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java diff --git a/common/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java b/core/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java rename to core/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java diff --git a/common/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java rename to core/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java diff --git a/common/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java rename to core/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java diff --git a/api/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java b/core/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java rename to core/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java diff --git a/common/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java rename to core/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java diff --git a/api/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java rename to core/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java diff --git a/common/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java b/core/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java rename to core/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java diff --git a/api/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java b/core/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java rename to core/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java diff --git a/api/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java b/core/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java rename to core/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java diff --git a/api/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java similarity index 100% rename from api/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java rename to core/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java diff --git a/common/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java similarity index 100% rename from common/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java rename to core/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java diff --git a/api/src/main/java/org/apache/druid/utils/CircularBuffer.java b/core/src/main/java/org/apache/druid/utils/CircularBuffer.java similarity index 100% rename from api/src/main/java/org/apache/druid/utils/CircularBuffer.java rename to core/src/main/java/org/apache/druid/utils/CircularBuffer.java diff --git a/api/src/main/java/org/apache/druid/utils/CompressionUtils.java b/core/src/main/java/org/apache/druid/utils/CompressionUtils.java similarity index 100% rename from api/src/main/java/org/apache/druid/utils/CompressionUtils.java rename to core/src/main/java/org/apache/druid/utils/CompressionUtils.java diff --git a/api/src/main/java/org/apache/druid/utils/Runnables.java b/core/src/main/java/org/apache/druid/utils/Runnables.java similarity index 100% rename from api/src/main/java/org/apache/druid/utils/Runnables.java rename to core/src/main/java/org/apache/druid/utils/Runnables.java diff --git a/common/src/main/resources/log4j2.debug.xml b/core/src/main/resources/log4j2.debug.xml similarity index 100% rename from common/src/main/resources/log4j2.debug.xml rename to core/src/main/resources/log4j2.debug.xml diff --git a/common/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml similarity index 100% rename from common/src/main/resources/log4j2.xml rename to core/src/main/resources/log4j2.xml diff --git a/common/src/main/resources/services/javax.annotation.processing.Processor b/core/src/main/resources/services/javax.annotation.processing.Processor similarity index 100% rename from common/src/main/resources/services/javax.annotation.processing.Processor rename to core/src/main/resources/services/javax.annotation.processing.Processor diff --git a/api/src/test/java/org/apache/druid/TestObjectMapper.java b/core/src/test/java/org/apache/druid/TestObjectMapper.java similarity index 100% rename from api/src/test/java/org/apache/druid/TestObjectMapper.java rename to core/src/test/java/org/apache/druid/TestObjectMapper.java diff --git a/common/src/test/java/org/apache/druid/collections/BlockingPoolTest.java b/core/src/test/java/org/apache/druid/collections/BlockingPoolTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/BlockingPoolTest.java rename to core/src/test/java/org/apache/druid/collections/BlockingPoolTest.java diff --git a/common/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java b/core/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java rename to core/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java diff --git a/common/src/test/java/org/apache/druid/collections/CloseableStupidPool.java b/core/src/test/java/org/apache/druid/collections/CloseableStupidPool.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/CloseableStupidPool.java rename to core/src/test/java/org/apache/druid/collections/CloseableStupidPool.java diff --git a/common/src/test/java/org/apache/druid/collections/CombiningIterableTest.java b/core/src/test/java/org/apache/druid/collections/CombiningIterableTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/CombiningIterableTest.java rename to core/src/test/java/org/apache/druid/collections/CombiningIterableTest.java diff --git a/common/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java b/core/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java rename to core/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java diff --git a/common/src/test/java/org/apache/druid/collections/IteratorShell.java b/core/src/test/java/org/apache/druid/collections/IteratorShell.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/IteratorShell.java rename to core/src/test/java/org/apache/druid/collections/IteratorShell.java diff --git a/common/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java b/core/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java rename to core/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java diff --git a/common/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java b/core/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java rename to core/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java diff --git a/common/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java b/core/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java rename to core/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java diff --git a/common/src/test/java/org/apache/druid/collections/SerializablePairTest.java b/core/src/test/java/org/apache/druid/collections/SerializablePairTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/SerializablePairTest.java rename to core/src/test/java/org/apache/druid/collections/SerializablePairTest.java diff --git a/common/src/test/java/org/apache/druid/collections/StupidPoolTest.java b/core/src/test/java/org/apache/druid/collections/StupidPoolTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/StupidPoolTest.java rename to core/src/test/java/org/apache/druid/collections/StupidPoolTest.java diff --git a/common/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java b/core/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java rename to core/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java diff --git a/common/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java b/core/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java rename to core/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java diff --git a/common/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java b/core/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java rename to core/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java diff --git a/common/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java b/core/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java rename to core/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/LogTest.java b/core/src/test/java/org/apache/druid/common/utils/LogTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/LogTest.java rename to core/src/test/java/org/apache/druid/common/utils/LogTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java b/core/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java rename to core/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java rename to core/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java b/core/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java rename to core/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java diff --git a/common/src/test/java/org/apache/druid/concurrent/ExecsTest.java b/core/src/test/java/org/apache/druid/concurrent/ExecsTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/concurrent/ExecsTest.java rename to core/src/test/java/org/apache/druid/concurrent/ExecsTest.java diff --git a/common/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java b/core/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java rename to core/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java b/core/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java rename to core/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java b/core/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java b/core/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java b/core/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java b/core/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java b/core/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java b/core/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java b/core/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java diff --git a/api/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java rename to core/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java diff --git a/api/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java b/core/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java rename to core/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java diff --git a/api/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java b/core/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java rename to core/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java diff --git a/common/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java b/core/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java rename to core/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java diff --git a/api/src/test/java/org/apache/druid/guice/PolyBindTest.java b/core/src/test/java/org/apache/druid/guice/PolyBindTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/guice/PolyBindTest.java rename to core/src/test/java/org/apache/druid/guice/PolyBindTest.java diff --git a/api/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java b/core/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java rename to core/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java diff --git a/api/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java b/core/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java rename to core/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java b/core/src/test/java/org/apache/druid/java/util/common/BufferUtils.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java rename to core/src/test/java/org/apache/druid/java/util/common/BufferUtils.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java b/core/src/test/java/org/apache/druid/java/util/common/GranularityTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java rename to core/src/test/java/org/apache/druid/java/util/common/GranularityTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java b/core/src/test/java/org/apache/druid/java/util/common/NumbersTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java rename to core/src/test/java/org/apache/druid/java/util/common/NumbersTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java b/core/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java b/core/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java b/core/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java rename to core/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java b/core/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java rename to core/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java b/core/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java rename to core/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java b/core/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java rename to core/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java b/core/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java rename to core/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java rename to core/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java rename to core/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java rename to core/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java rename to core/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java rename to core/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java rename to core/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java b/core/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java rename to core/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java rename to core/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java rename to core/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java rename to core/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java rename to core/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java rename to core/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java rename to core/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java b/core/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java rename to core/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java similarity index 100% rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java diff --git a/api/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java b/core/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java rename to core/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java diff --git a/common/src/test/java/org/apache/druid/math/expr/EvalTest.java b/core/src/test/java/org/apache/druid/math/expr/EvalTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/math/expr/EvalTest.java rename to core/src/test/java/org/apache/druid/math/expr/EvalTest.java diff --git a/common/src/test/java/org/apache/druid/math/expr/FunctionTest.java b/core/src/test/java/org/apache/druid/math/expr/FunctionTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/math/expr/FunctionTest.java rename to core/src/test/java/org/apache/druid/math/expr/FunctionTest.java diff --git a/common/src/test/java/org/apache/druid/math/expr/ParserTest.java b/core/src/test/java/org/apache/druid/math/expr/ParserTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/math/expr/ParserTest.java rename to core/src/test/java/org/apache/druid/math/expr/ParserTest.java diff --git a/common/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java b/core/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java rename to core/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java diff --git a/common/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java b/core/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java rename to core/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java diff --git a/common/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java b/core/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java rename to core/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java diff --git a/api/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java b/core/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java rename to core/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java diff --git a/api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java b/core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java similarity index 100% rename from api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java rename to core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java diff --git a/api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java b/core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java similarity index 100% rename from api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java rename to core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java diff --git a/api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java b/core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java similarity index 100% rename from api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java rename to core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java diff --git a/common/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java b/core/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java similarity index 100% rename from common/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java rename to core/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java diff --git a/common/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java b/core/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java similarity index 100% rename from common/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java rename to core/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java diff --git a/api/src/test/java/org/apache/druid/timeline/DataSegmentTest.java b/core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/timeline/DataSegmentTest.java rename to core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java diff --git a/api/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java b/core/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java rename to core/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java diff --git a/common/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java b/core/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java rename to core/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java diff --git a/common/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java b/core/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java rename to core/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java diff --git a/api/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java b/core/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java similarity index 100% rename from api/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java rename to core/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java diff --git a/common/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java b/core/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java similarity index 100% rename from common/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java rename to core/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java diff --git a/java-util/src/test/resources/cpuacct.usage_all b/core/src/test/resources/cpuacct.usage_all similarity index 100% rename from java-util/src/test/resources/cpuacct.usage_all rename to core/src/test/resources/cpuacct.usage_all diff --git a/java-util/src/test/resources/keystore.jks b/core/src/test/resources/keystore.jks similarity index 100% rename from java-util/src/test/resources/keystore.jks rename to core/src/test/resources/keystore.jks diff --git a/api/src/test/resources/log4j2.xml b/core/src/test/resources/log4j2.xml similarity index 100% rename from api/src/test/resources/log4j2.xml rename to core/src/test/resources/log4j2.xml diff --git a/java-util/src/test/resources/loremipsum.txt b/core/src/test/resources/loremipsum.txt similarity index 100% rename from java-util/src/test/resources/loremipsum.txt rename to core/src/test/resources/loremipsum.txt diff --git a/java-util/src/test/resources/memory.numa_stat b/core/src/test/resources/memory.numa_stat similarity index 100% rename from java-util/src/test/resources/memory.numa_stat rename to core/src/test/resources/memory.numa_stat diff --git a/java-util/src/test/resources/memory.stat b/core/src/test/resources/memory.stat similarity index 100% rename from java-util/src/test/resources/memory.stat rename to core/src/test/resources/memory.stat diff --git a/java-util/src/test/resources/proc.cgroups b/core/src/test/resources/proc.cgroups similarity index 100% rename from java-util/src/test/resources/proc.cgroups rename to core/src/test/resources/proc.cgroups diff --git a/java-util/src/test/resources/proc.mounts b/core/src/test/resources/proc.mounts similarity index 100% rename from java-util/src/test/resources/proc.mounts rename to core/src/test/resources/proc.mounts diff --git a/java-util/src/test/resources/proc.pid.cgroup b/core/src/test/resources/proc.pid.cgroup similarity index 100% rename from java-util/src/test/resources/proc.pid.cgroup rename to core/src/test/resources/proc.pid.cgroup diff --git a/docs/content/design/realtime.md b/docs/content/design/realtime.md index 4088c6120f26..95ed0dcc7f28 100644 --- a/docs/content/design/realtime.md +++ b/docs/content/design/realtime.md @@ -42,7 +42,7 @@ Extending the code Realtime integration is intended to be extended in two ways: -1. Connect to data streams from varied systems ([Firehose](https://github.com/apache/incubator-druid-api/blob/master/src/main/java/org/apache/druid/data/input/FirehoseFactory.java)) +1. Connect to data streams from varied systems ([Firehose](https://github.com/apache/incubator-druid/blob/master/core/src/main/org/apache/druid/data/input/FirehoseFactory.java)) 2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/apache/incubator-druid/blob/master/server/src/main/java/org/apache/druid/segment/realtime/plumber/PlumberSchool.java)) The expectations are that the former will be very common and something that users of Druid will do on a fairly regular basis. Most users will probably never have to deal with the latter form of customization. Indeed, we hope that all potential use cases can be packaged up as part of Druid proper without requiring proprietary customization. diff --git a/docs/content/development/modules.md b/docs/content/development/modules.md index e1a0d6c612e4..133e3b51b780 100644 --- a/docs/content/development/modules.md +++ b/docs/content/development/modules.md @@ -72,7 +72,7 @@ Binders.dataSegmentPusherBinder(binder) .to(HdfsDataSegmentPusher.class).in(LazySingleton.class); ``` -`Binders.dataSegment*Binder()` is a call provided by the druid-api jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation. +`Binders.dataSegment*Binder()` is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation. `addBinding("hdfs")` for the Puller binder creates a new handler for loadSpec objects of type "hdfs". For the Pusher binder it creates a new type value that you can specify for the `druid.storage.type` parameter. diff --git a/examples/pom.xml b/examples/pom.xml index 404bb469bde4..94b362dd865f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -41,7 +41,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extendedset/pom.xml b/extendedset/pom.xml index 4a0c87de3927..2528d657ee0d 100755 --- a/extendedset/pom.xml +++ b/extendedset/pom.xml @@ -39,7 +39,7 @@ org.apache.druid - java-util + druid-core ${project.parent.version} diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml index 6c4d5cc125fc..ead4738e1d6f 100644 --- a/extensions-contrib/ambari-metrics-emitter/pom.xml +++ b/extensions-contrib/ambari-metrics-emitter/pom.xml @@ -37,19 +37,7 @@ org.apache.druid - druid-common - ${project.parent.version} - provided - - - org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - java-util + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/azure-extensions/pom.xml b/extensions-contrib/azure-extensions/pom.xml index 6d30cddfcc66..685bc4cb9b52 100644 --- a/extensions-contrib/azure-extensions/pom.xml +++ b/extensions-contrib/azure-extensions/pom.xml @@ -37,7 +37,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml index 46d0b0414176..4a3347904aca 100644 --- a/extensions-contrib/cassandra-storage/pom.xml +++ b/extensions-contrib/cassandra-storage/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml b/extensions-contrib/cloudfiles-extensions/pom.xml index 2be137282b25..307cd27ed791 100644 --- a/extensions-contrib/cloudfiles-extensions/pom.xml +++ b/extensions-contrib/cloudfiles-extensions/pom.xml @@ -45,7 +45,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/distinctcount/pom.xml b/extensions-contrib/distinctcount/pom.xml index 16f18704f325..99b0aac8e984 100644 --- a/extensions-contrib/distinctcount/pom.xml +++ b/extensions-contrib/distinctcount/pom.xml @@ -45,7 +45,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test test-jar diff --git a/extensions-contrib/druid-rocketmq/pom.xml b/extensions-contrib/druid-rocketmq/pom.xml index fa163a0029a9..bd22bab418e3 100644 --- a/extensions-contrib/druid-rocketmq/pom.xml +++ b/extensions-contrib/druid-rocketmq/pom.xml @@ -50,7 +50,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/google-extensions/pom.xml b/extensions-contrib/google-extensions/pom.xml index a0b4b1e159ef..508aa4880956 100644 --- a/extensions-contrib/google-extensions/pom.xml +++ b/extensions-contrib/google-extensions/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml index afc207ae8d53..5c268d768ad3 100644 --- a/extensions-contrib/graphite-emitter/pom.xml +++ b/extensions-contrib/graphite-emitter/pom.xml @@ -37,13 +37,7 @@ org.apache.druid - druid-common - ${project.parent.version} - provided - - - org.apache.druid - druid-api + druid-core ${project.parent.version} provided @@ -53,12 +47,6 @@ ${project.parent.version} provided - - org.apache.druid - java-util - ${project.parent.version} - provided - io.dropwizard.metrics metrics-graphite diff --git a/extensions-contrib/influx-extensions/pom.xml b/extensions-contrib/influx-extensions/pom.xml index 246bf6c3cdac..bb9d0fdaab56 100644 --- a/extensions-contrib/influx-extensions/pom.xml +++ b/extensions-contrib/influx-extensions/pom.xml @@ -43,7 +43,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/kafka-eight-simpleConsumer/pom.xml b/extensions-contrib/kafka-eight-simpleConsumer/pom.xml index 4dbb20768ea3..a92d751b3fce 100644 --- a/extensions-contrib/kafka-eight-simpleConsumer/pom.xml +++ b/extensions-contrib/kafka-eight-simpleConsumer/pom.xml @@ -36,13 +36,7 @@ org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - java-util + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/kafka-emitter/pom.xml b/extensions-contrib/kafka-emitter/pom.xml index 6753a486623d..7c5e3e3f023f 100644 --- a/extensions-contrib/kafka-emitter/pom.xml +++ b/extensions-contrib/kafka-emitter/pom.xml @@ -42,19 +42,7 @@ org.apache.druid - druid-common - ${project.parent.version} - provided - - - org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - java-util + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/opentsdb-emitter/pom.xml b/extensions-contrib/opentsdb-emitter/pom.xml index d16cf841b871..ab368635f87c 100644 --- a/extensions-contrib/opentsdb-emitter/pom.xml +++ b/extensions-contrib/opentsdb-emitter/pom.xml @@ -38,7 +38,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/rabbitmq/pom.xml b/extensions-contrib/rabbitmq/pom.xml index 9b5ab11ba56d..ee3aea32eebf 100644 --- a/extensions-contrib/rabbitmq/pom.xml +++ b/extensions-contrib/rabbitmq/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/redis-cache/pom.xml b/extensions-contrib/redis-cache/pom.xml index 7edc956d0ba6..cf8c8c74b311 100644 --- a/extensions-contrib/redis-cache/pom.xml +++ b/extensions-contrib/redis-cache/pom.xml @@ -37,7 +37,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/sqlserver-metadata-storage/pom.xml b/extensions-contrib/sqlserver-metadata-storage/pom.xml index 2081f1d430ba..a3d0281adf6f 100644 --- a/extensions-contrib/sqlserver-metadata-storage/pom.xml +++ b/extensions-contrib/sqlserver-metadata-storage/pom.xml @@ -36,13 +36,7 @@ org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/statsd-emitter/pom.xml b/extensions-contrib/statsd-emitter/pom.xml index 94bbc63c849f..d8c49abd8362 100644 --- a/extensions-contrib/statsd-emitter/pom.xml +++ b/extensions-contrib/statsd-emitter/pom.xml @@ -36,19 +36,7 @@ org.apache.druid - druid-common - ${project.parent.version} - provided - - - org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - java-util + druid-core ${project.parent.version} provided diff --git a/extensions-contrib/time-min-max/pom.xml b/extensions-contrib/time-min-max/pom.xml index e3eacf5c8be6..9b7aa5e273e2 100644 --- a/extensions-contrib/time-min-max/pom.xml +++ b/extensions-contrib/time-min-max/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided @@ -46,12 +46,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-common - ${project.parent.version} - provided - junit junit @@ -64,7 +58,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test-jar test diff --git a/extensions-contrib/virtual-columns/pom.xml b/extensions-contrib/virtual-columns/pom.xml index da8e79bcda8e..06ea0b412fa6 100644 --- a/extensions-contrib/virtual-columns/pom.xml +++ b/extensions-contrib/virtual-columns/pom.xml @@ -36,13 +36,7 @@ org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extensions-core/avro-extensions/pom.xml b/extensions-core/avro-extensions/pom.xml index 127284761d70..35212b27f6ae 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -82,7 +82,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index 32863dbd1fb6..1abb026ffe03 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -46,7 +46,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided @@ -119,7 +119,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test-jar test diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml index 3b134790534e..f08db35b5bae 100644 --- a/extensions-core/hdfs-storage/pom.xml +++ b/extensions-core/hdfs-storage/pom.xml @@ -36,22 +36,10 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided - - org.apache.druid - druid-common - ${project.parent.version} - provided - - - org.apache.druid - java-util - ${project.parent.version} - provided - org.apache.hadoop hadoop-client diff --git a/extensions-core/histogram/pom.xml b/extensions-core/histogram/pom.xml index 61a7159b0a12..f30bb39d3614 100644 --- a/extensions-core/histogram/pom.xml +++ b/extensions-core/histogram/pom.xml @@ -49,7 +49,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test test-jar diff --git a/extensions-core/kafka-eight/pom.xml b/extensions-core/kafka-eight/pom.xml index 6b7800162302..2ea7a80c648d 100644 --- a/extensions-core/kafka-eight/pom.xml +++ b/extensions-core/kafka-eight/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml index f69ba14d9cf4..24a06cafecb1 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml index 1ba42f5c9dd7..ff22c8d737b8 100644 --- a/extensions-core/kafka-indexing-service/pom.xml +++ b/extensions-core/kafka-indexing-service/pom.xml @@ -40,7 +40,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-core/lookups-cached-global/pom.xml b/extensions-core/lookups-cached-global/pom.xml index 7243c2863403..5a2b4be1680c 100644 --- a/extensions-core/lookups-cached-global/pom.xml +++ b/extensions-core/lookups-cached-global/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-core/lookups-cached-single/pom.xml b/extensions-core/lookups-cached-single/pom.xml index a99333fb7764..706a899010cf 100644 --- a/extensions-core/lookups-cached-single/pom.xml +++ b/extensions-core/lookups-cached-single/pom.xml @@ -36,7 +36,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided diff --git a/extensions-core/mysql-metadata-storage/pom.xml b/extensions-core/mysql-metadata-storage/pom.xml index 60bee90d99c1..2a8d5649b5df 100644 --- a/extensions-core/mysql-metadata-storage/pom.xml +++ b/extensions-core/mysql-metadata-storage/pom.xml @@ -37,13 +37,7 @@ org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extensions-core/postgresql-metadata-storage/pom.xml b/extensions-core/postgresql-metadata-storage/pom.xml index b760ba8caff5..e828cfb3686c 100644 --- a/extensions-core/postgresql-metadata-storage/pom.xml +++ b/extensions-core/postgresql-metadata-storage/pom.xml @@ -37,13 +37,7 @@ org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml index 77df4e407b55..2f02db0c19e1 100644 --- a/extensions-core/protobuf-extensions/pom.xml +++ b/extensions-core/protobuf-extensions/pom.xml @@ -42,7 +42,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} provided diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml index d483de8f81be..c61874adaf2b 100644 --- a/extensions-core/s3-extensions/pom.xml +++ b/extensions-core/s3-extensions/pom.xml @@ -37,7 +37,7 @@ org.apache.druid - druid-api + druid-core ${project.parent.version} provided @@ -47,12 +47,6 @@ ${project.parent.version} provided - - org.apache.druid - java-util - ${project.parent.version} - provided - commons-io commons-io diff --git a/extensions-core/simple-client-sslcontext/pom.xml b/extensions-core/simple-client-sslcontext/pom.xml index 49cfeb7042da..97d9c5b1d0a1 100644 --- a/extensions-core/simple-client-sslcontext/pom.xml +++ b/extensions-core/simple-client-sslcontext/pom.xml @@ -37,13 +37,7 @@ org.apache.druid - druid-api - ${project.parent.version} - provided - - - org.apache.druid - druid-common + druid-core ${project.parent.version} provided @@ -53,11 +47,5 @@ ${project.parent.version} provided - - org.apache.druid - java-util - ${project.parent.version} - provided - diff --git a/extensions-core/stats/pom.xml b/extensions-core/stats/pom.xml index caa299402433..ea5c591cd510 100644 --- a/extensions-core/stats/pom.xml +++ b/extensions-core/stats/pom.xml @@ -48,7 +48,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test test-jar diff --git a/hll/pom.xml b/hll/pom.xml index 0641ad912271..1fe71b1604d5 100644 --- a/hll/pom.xml +++ b/hll/pom.xml @@ -41,7 +41,7 @@ org.apache.druid - java-util + druid-core ${project.parent.version} diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index a213e800792b..6af9139791cd 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -40,7 +40,7 @@ org.apache.druid - java-util + druid-core ${project.parent.version} diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 6d6dd5bfff09..4aec189a636e 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -34,7 +34,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} @@ -71,7 +71,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test-jar test @@ -90,13 +90,6 @@ test-jar test - - org.apache.druid - druid-api - ${project.parent.version} - test-jar - test - diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 4790c7733b8b..73390ab537f1 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -38,7 +38,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} diff --git a/java-util/src/test/resources/log4j2.xml b/integration-tests/src/main/resources/log4j2.xml similarity index 97% rename from java-util/src/test/resources/log4j2.xml rename to integration-tests/src/main/resources/log4j2.xml index e4477cf17a9e..dbce142e7f60 100644 --- a/java-util/src/test/resources/log4j2.xml +++ b/integration-tests/src/main/resources/log4j2.xml @@ -25,7 +25,7 @@ - + diff --git a/java-util/pom.xml b/java-util/pom.xml deleted file mode 100644 index eae7b5a5f8b8..000000000000 --- a/java-util/pom.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - - - 4.0.0 - - - org.apache.druid - druid - 0.13.0-incubating-SNAPSHOT - - - java-util - java-util - java-util - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - UTF-8 - 1.6.5 - ${sigar.base.version}.132 - - - - - org.slf4j - slf4j-api - - - org.skife.config - config-magic - - - com.google.inject - guice - - - com.google.guava - guava - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.opencsv - opencsv - - - joda-time - joda-time - - - org.mozilla - rhino - - - org.apache.commons - commons-compress - - - org.tukaani - xz - - - com.github.luben - zstd-jni - - - com.jayway.jsonpath - json-path - - - net.thisptr - jackson-jq - - - - - com.google.code.findbugs - jsr305 - - - net.java.dev.jna - jna - - - javax.validation - validation-api - - - org.asynchttpclient - async-http-client - - - - - org.hyperic - sigar - ${sigar.version} - - - org.hyperic - sigar-dist - ${sigar.version} - zip - - provided - - - org.gridkit.lab - jvm-attach-api - - - - - io.netty - netty - - - - - junit - junit - test - - - org.easymock - easymock - test - - - org.slf4j - slf4j-simple - test - true - - - org.apache.logging.log4j - log4j-api - test - - - org.apache.logging.log4j - log4j-core - test - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.apache.logging.log4j - log4j-1.2-api - test - - - org.apache.logging.log4j - log4j-jul - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-servlet - test - - - it.unimi.dsi - fastutil - test - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.antlr - antlr4-maven-plugin - - - - antlr4 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-sigar-lib-to-resources - generate-resources - - unpack-dependencies - - - org.hyperic - sigar-dist - **/sigar-bin/lib/* - **/sigar-bin/lib/*jar - - ${project.build.directory} - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - java.library.path - ${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib/ - - - - - - - - - - ${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib - - - - - - - - sigar - https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/ - - - - diff --git a/pom.xml b/pom.xml index fcc6f7155de3..a635d2ec2fab 100644 --- a/pom.xml +++ b/pom.xml @@ -97,8 +97,7 @@ - api - common + core examples indexing-hadoop indexing-service @@ -109,7 +108,6 @@ integration-tests benchmarks aws-common - java-util extendedset hll diff --git a/processing/pom.xml b/processing/pom.xml index 97b56e077e07..4963e32acbe8 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -34,14 +34,9 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} - - org.apache.druid - java-util - ${project.parent.version} - org.apache.druid druid-hll @@ -120,7 +115,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test-jar test @@ -172,7 +167,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} diff --git a/server/pom.xml b/server/pom.xml index e81199e4f2d3..501d336893cd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -49,7 +49,7 @@ org.apache.druid - java-util + druid-core ${project.parent.version} @@ -203,7 +203,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test-jar test diff --git a/services/pom.xml b/services/pom.xml index db221a9f3ec9..8a18dcb311df 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -31,11 +31,11 @@ - org.apache.druid - druid-common + druid-core ${project.parent.version} diff --git a/sql/pom.xml b/sql/pom.xml index ecac5d4564a5..162eb23f2414 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -90,7 +90,7 @@ org.apache.druid - druid-common + druid-core ${project.parent.version} test-jar test From d3ae2578de51d66064c67e8cd60f63a8ebcff260 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Sat, 13 Oct 2018 22:55:05 -0700 Subject: [PATCH 2/2] spacing --- core/pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 2c468d1127d0..48bb5f301c0b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ druid-core druid-core - Odds and ends + Core druid module druid @@ -381,6 +381,4 @@ - - - \ No newline at end of file +