diff --git a/.travis.yml b/.travis.yml index 6bd300f6c817..a8aca05e9f9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,34 +43,7 @@ matrix: # Strict compilation requires more than 2 GB script: MAVEN_OPTS='-Xmx3000m' mvn clean -Pstrict -pl '!benchmarks' compile test-compile spotbugs:check -B --fail-at-end - # analyze dependencies - - env: - - NAME="analyze dependencies" - install: MAVEN_OPTS='-Xmx3000m' mvn install -q -ff -DskipTests -B - script: MAVEN_OPTS='-Xmx3000m' mvn dependency:analyze -DoutputXML=true -DignoreNonCompile=true -DfailOnWarning=true - after_failure: - - | - cat << EOF - - The dependency analysis has found a dependency that is either: - - 1) Used and undeclared: These are available as a transitive dependency but should be explicitly - added to the POM to ensure the dependency version. The XML to add the dependencies to the POM is - shown above. - - 2) Unused and declared: These are not needed and removing them from the POM will speed up the build - and reduce the artifact size. - - If there are false positive dependency analysis warnings, they can be suppressed: - https://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html#usedDependencies - https://maven.apache.org/plugins/maven-dependency-plugin/examples/exclude-dependencies-from-dependency-analysis.html - - For more information, refer to: - https://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html - - EOF - - # packaging check + # packaging check - env: - NAME="packaging check" before_install: diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index cce3d0edf98e..37f657b0a96e 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -62,19 +62,32 @@ ${project.parent.version} - org.apache.druid - druid-core + org.apache.druid.extensions + druid-datasketches ${project.parent.version} - org.apache.druid - extendedset + org.apache.druid.extensions + druid-datasketches + ${project.parent.version} + test-jar + + + org.apache.druid.extensions + druid-histogram ${project.parent.version} org.apache.druid.extensions druid-histogram ${project.parent.version} + test-jar + + + org.apache.druid + druid-core + ${project.parent.version} + test-jar org.apache.druid @@ -100,44 +113,9 @@ 0.1.0 - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - - - org.apache.commons - commons-math3 - - - commons-io - commons-io - - - com.fasterxml.jackson.core - jackson-annotations - - - joda-time - joda-time - - - com.fasterxml.jackson.core - jackson-databind - - - it.unimi.dsi - fastutil - - - org.roaringbitmap - RoaringBitmap - - - com.google.guava - guava - - - com.google.code.findbugs - jsr305 + org.easymock + easymock + compile junit diff --git a/cloud/aws-common/pom.xml b/cloud/aws-common/pom.xml index 1adbb88da0c7..f1c47cd15595 100644 --- a/cloud/aws-common/pom.xml +++ b/cloud/aws-common/pom.xml @@ -51,34 +51,6 @@ checker-qual ${checkerframework.version} - - com.google.code.findbugs - jsr305 - - - com.fasterxml.jackson.core - jackson-annotations - - - com.google.guava - guava - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - - - com.amazonaws - aws-java-sdk-core - - - javax.validation - validation-api - @@ -87,4 +59,5 @@ test + diff --git a/cloud/gcp-common/pom.xml b/cloud/gcp-common/pom.xml index b4f97a11279d..053cbab15bbb 100644 --- a/cloud/gcp-common/pom.xml +++ b/cloud/gcp-common/pom.xml @@ -48,21 +48,8 @@ google-http-client-jackson2 - com.google.guava - guava - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.http-client - google-http-client + com.fasterxml.jackson.module + jackson-module-guice diff --git a/codestyle/druid-forbidden-apis.txt b/codestyle/druid-forbidden-apis.txt index 2f0b2bcfd7fc..7925b3b1a722 100644 --- a/codestyle/druid-forbidden-apis.txt +++ b/codestyle/druid-forbidden-apis.txt @@ -48,4 +48,3 @@ com.google.common.io.BaseEncoding.base64 @defaultMessage Use com.google.errorprone.annotations.concurrent.GuardedBy javax.annotations.concurrent.GuardedBy -com.amazonaws.annotation.GuardedBy \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index b79ddc54dfff..1f7cd6bc247c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -41,6 +41,10 @@ + + commons-codec + commons-codec + commons-io commons-io @@ -53,6 +57,15 @@ org.apache.commons commons-compress + + org.apache.commons + commons-dbcp2 + + + commons-pool + commons-pool + 1.6 + org.skife.config config-magic @@ -60,17 +73,14 @@ org.hibernate hibernate-validator - runtime javax.el javax.el-api - runtime - org.glassfish - javax.el - runtime + javax.xml.bind + jaxb-api com.google.guava @@ -88,6 +98,18 @@ 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 @@ -104,18 +126,42 @@ 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 @@ -124,18 +170,6 @@ it.unimi.dsi fastutil - - io.netty - netty-buffer - - - io.netty - netty-common - - - io.netty - netty-codec-http - com.opencsv @@ -149,12 +183,10 @@ org.tukaani xz - runtime com.github.luben zstd-jni - runtime com.jayway.jsonpath @@ -172,7 +204,6 @@ com.lmax disruptor - runtime @@ -237,11 +268,6 @@ hamcrest-all test - - org.hamcrest - hamcrest-core - test - org.slf4j slf4j-simple @@ -258,20 +284,10 @@ jetty-servlet test - - org.eclipse.jetty - jetty-util - test - com.google.errorprone error_prone_annotations - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - test - diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml index 8c5979f41bcb..705aff95b866 100644 --- a/extensions-contrib/ambari-metrics-emitter/pom.xml +++ b/extensions-contrib/ambari-metrics-emitter/pom.xml @@ -69,47 +69,6 @@ - - commons-io - commons-io - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.guava - guava - provided - - - org.apache.druid - druid-processing - ${project.parent.version} - test - junit junit diff --git a/extensions-contrib/azure-extensions/pom.xml b/extensions-contrib/azure-extensions/pom.xml index 78360bd3c398..d0b15c4d59c7 100644 --- a/extensions-contrib/azure-extensions/pom.xml +++ b/extensions-contrib/azure-extensions/pom.xml @@ -66,49 +66,6 @@ jackson-module-guice ${jackson.version} - - commons-io - commons-io - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - com.google.guava - guava - - - javax.validation - validation-api - provided - @@ -122,12 +79,6 @@ ${project.parent.version} test - - org.apache.druid - druid-processing - ${project.parent.version} - test - org.easymock easymock diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml index f92c108c1fc8..5dde6547574b 100644 --- a/extensions-contrib/cassandra-storage/pom.xml +++ b/extensions-contrib/cassandra-storage/pom.xml @@ -124,40 +124,6 @@ commons-io provided - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - javax.validation - validation-api - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml b/extensions-contrib/cloudfiles-extensions/pom.xml index 19d91fc4bfa6..8dfbc85ae1bb 100644 --- a/extensions-contrib/cloudfiles-extensions/pom.xml +++ b/extensions-contrib/cloudfiles-extensions/pom.xml @@ -63,50 +63,17 @@ com.google.inject.extensions - guice-multibindings + guice-servlet ${guice.version} - commons-io - commons-io - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.guava - guava - - - javax.validation - validation-api - provided + com.google.inject.extensions + guice-multibindings + ${guice.version} + - - org.apache.jclouds - jclouds-core - ${jclouds.version} - - - org.apache.jclouds.api - openstack-swift - ${jclouds.version} - org.apache.jclouds.driver jclouds-slf4j @@ -123,14 +90,15 @@ - org.apache.jclouds.api - openstack-keystone - ${jclouds.version} - - - org.apache.jclouds.api - rackspace-cloudfiles + org.apache.jclouds.driver + jclouds-sshj ${jclouds.version} + + + org.slf4j + slf4j-api + + @@ -177,12 +145,6 @@ ${project.parent.version} test - - org.apache.druid - druid-processing - ${project.parent.version} - test - diff --git a/extensions-contrib/distinctcount/pom.xml b/extensions-contrib/distinctcount/pom.xml index 7410399b9d7a..a4f20481e059 100644 --- a/extensions-contrib/distinctcount/pom.xml +++ b/extensions-contrib/distinctcount/pom.xml @@ -35,53 +35,12 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - org.apache.druid druid-processing ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - it.unimi.dsi - fastutil - provided - @@ -108,11 +67,6 @@ easymock test - - org.hamcrest - hamcrest-core - test - diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml index 4864f8390a3e..1a589afb0c6a 100644 --- a/extensions-contrib/graphite-emitter/pom.xml +++ b/extensions-contrib/graphite-emitter/pom.xml @@ -41,12 +41,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - provided - org.apache.druid druid-server @@ -58,47 +52,6 @@ metrics-graphite 3.1.2 - - commons-io - commons-io - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.guava - guava - provided - - - javax.validation - validation-api - provided - - junit junit diff --git a/extensions-contrib/influx-extensions/pom.xml b/extensions-contrib/influx-extensions/pom.xml index 6172a4c736f2..61beb012c196 100644 --- a/extensions-contrib/influx-extensions/pom.xml +++ b/extensions-contrib/influx-extensions/pom.xml @@ -51,31 +51,6 @@ org.antlr antlr4-runtime - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.code.findbugs - jsr305 - provided - @@ -84,18 +59,27 @@ test - org.hamcrest - hamcrest-all + org.mockito + mockito-core + 2.2.10 test org.hamcrest - hamcrest-core + hamcrest-all + 1.3 test pl.pragmatists JUnitParams + 1.0.4 + test + + + org.apache.druid + druid-processing + ${project.parent.version} test @@ -113,16 +97,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - - org.hamcrest:hamcrest-core - - - diff --git a/extensions-contrib/influxdb-emitter/pom.xml b/extensions-contrib/influxdb-emitter/pom.xml index 56dd89bba0bb..319d95e7b1e5 100644 --- a/extensions-contrib/influxdb-emitter/pom.xml +++ b/extensions-contrib/influxdb-emitter/pom.xml @@ -43,41 +43,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - com.fasterxml.jackson.core - jackson-annotations - - - joda-time - joda-time - - - com.google.guava - guava - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - - junit junit @@ -94,5 +59,16 @@ 1.0.4 test + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.apache.druid + druid-processing + ${project.parent.version} + + diff --git a/extensions-contrib/kafka-emitter/pom.xml b/extensions-contrib/kafka-emitter/pom.xml index 64e7ea01ae82..2e5946216af4 100644 --- a/extensions-contrib/kafka-emitter/pom.xml +++ b/extensions-contrib/kafka-emitter/pom.xml @@ -46,37 +46,6 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - junit junit @@ -107,11 +76,5 @@ test-jar test - - org.apache.druid - druid-processing - ${project.parent.version} - test - diff --git a/extensions-contrib/materialized-view-maintenance/pom.xml b/extensions-contrib/materialized-view-maintenance/pom.xml index 7af5e5d9e7d8..0442e857cfaf 100644 --- a/extensions-contrib/materialized-view-maintenance/pom.xml +++ b/extensions-contrib/materialized-view-maintenance/pom.xml @@ -34,72 +34,18 @@ materialized-view-maintenance - - org.apache.druid - druid-core - ${project.parent.version} - provided - - - org.apache.druid - druid-processing - ${project.parent.version} - provided - org.apache.druid druid-server ${project.parent.version} provided - - org.apache.druid - druid-indexing-hadoop - ${project.parent.version} - provided - org.apache.druid druid-indexing-service ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.guava - guava - provided - - - commons-codec - commons-codec - provided - - org.apache.druid druid-server @@ -114,21 +60,11 @@ test test-jar - - junit - junit - test - org.easymock easymock test - - org.hamcrest - hamcrest-core - test - - + \ No newline at end of file diff --git a/extensions-contrib/materialized-view-selection/pom.xml b/extensions-contrib/materialized-view-selection/pom.xml index 9db794c8e161..d5525838f0e4 100644 --- a/extensions-contrib/materialized-view-selection/pom.xml +++ b/extensions-contrib/materialized-view-selection/pom.xml @@ -34,18 +34,6 @@ materialized-view-selection - - org.apache.druid - druid-core - ${project.parent.version} - provided - - - org.apache.druid - druid-processing - ${project.parent.version} - provided - org.apache.druid druid-server @@ -57,57 +45,6 @@ materialized-view-maintenance ${project.parent.version} - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - org.apache.curator - curator-framework - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - org.jdbi - jdbi - provided - - - com.google.guava - guava - provided - - org.apache.druid druid-processing @@ -122,11 +59,6 @@ test test-jar - - junit - junit - test - org.easymock easymock diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml index b1003ef22e3b..4e0a260d3ded 100644 --- a/extensions-contrib/momentsketch/pom.xml +++ b/extensions-contrib/momentsketch/pom.xml @@ -58,32 +58,6 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - junit junit diff --git a/extensions-contrib/moving-average-query/pom.xml b/extensions-contrib/moving-average-query/pom.xml index 79ee2e2de00e..80e9b6bc8544 100644 --- a/extensions-contrib/moving-average-query/pom.xml +++ b/extensions-contrib/moving-average-query/pom.xml @@ -67,51 +67,5 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - com.google.guava - guava - provided - - - - org.hamcrest - hamcrest-core - test - diff --git a/extensions-contrib/opentsdb-emitter/pom.xml b/extensions-contrib/opentsdb-emitter/pom.xml index a7b44be63021..51ca058de377 100644 --- a/extensions-contrib/opentsdb-emitter/pom.xml +++ b/extensions-contrib/opentsdb-emitter/pom.xml @@ -42,12 +42,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - provided - org.apache.druid druid-server @@ -59,40 +53,6 @@ jersey-client ${jersey.version} - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - javax.ws.rs - jsr311-api - diff --git a/extensions-contrib/redis-cache/pom.xml b/extensions-contrib/redis-cache/pom.xml index 6a07460e1575..dcfd587bd8f1 100644 --- a/extensions-contrib/redis-cache/pom.xml +++ b/extensions-contrib/redis-cache/pom.xml @@ -41,12 +41,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - provided - org.apache.druid druid-server @@ -58,26 +52,6 @@ jedis 2.9.0 - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - diff --git a/extensions-contrib/sqlserver-metadata-storage/pom.xml b/extensions-contrib/sqlserver-metadata-storage/pom.xml index b7ddf11aef4e..926ebc2b927a 100644 --- a/extensions-contrib/sqlserver-metadata-storage/pom.xml +++ b/extensions-contrib/sqlserver-metadata-storage/pom.xml @@ -52,31 +52,6 @@ jdbi provided - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - org.apache.commons - commons-dbcp2 - provided - junit diff --git a/extensions-contrib/statsd-emitter/pom.xml b/extensions-contrib/statsd-emitter/pom.xml index 872ce489f1a4..ed83a35f4e1f 100644 --- a/extensions-contrib/statsd-emitter/pom.xml +++ b/extensions-contrib/statsd-emitter/pom.xml @@ -45,36 +45,6 @@ java-dogstatsd-client 2.6.1 - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - junit junit diff --git a/extensions-contrib/tdigestsketch/pom.xml b/extensions-contrib/tdigestsketch/pom.xml index bd57242a9e95..e6f25a70a4f7 100644 --- a/extensions-contrib/tdigestsketch/pom.xml +++ b/extensions-contrib/tdigestsketch/pom.xml @@ -58,42 +58,6 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - it.unimi.dsi - fastutil - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.errorprone - error_prone_annotations - provided - - junit junit diff --git a/extensions-contrib/thrift-extensions/pom.xml b/extensions-contrib/thrift-extensions/pom.xml index f9ac92f09b9d..7ac6e054e9a7 100644 --- a/extensions-contrib/thrift-extensions/pom.xml +++ b/extensions-contrib/thrift-extensions/pom.xml @@ -41,12 +41,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - org.apache.thrift libthrift @@ -93,36 +87,9 @@ - org.slf4j - slf4j-api - - - commons-lang - commons-lang - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - - - com.google.inject - guice - provided - - - org.apache.hadoop - hadoop-common - provided - - - com.fasterxml.jackson.core - jackson-databind - provided + com.twitter.elephantbird + elephant-bird-hadoop-compat + ${elephantbird.version} com.twitter @@ -135,11 +102,6 @@ junit test - - org.hamcrest - hamcrest-core - test - diff --git a/extensions-contrib/time-min-max/pom.xml b/extensions-contrib/time-min-max/pom.xml index 4467e5a65182..5e14d0f14ae5 100644 --- a/extensions-contrib/time-min-max/pom.xml +++ b/extensions-contrib/time-min-max/pom.xml @@ -46,36 +46,6 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - junit junit diff --git a/extensions-contrib/virtual-columns/pom.xml b/extensions-contrib/virtual-columns/pom.xml index adce96f0ef0b..a61ecf9bcd8f 100644 --- a/extensions-contrib/virtual-columns/pom.xml +++ b/extensions-contrib/virtual-columns/pom.xml @@ -46,36 +46,6 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - joda-time - joda-time - provided - diff --git a/extensions-core/avro-extensions/pom.xml b/extensions-core/avro-extensions/pom.xml index 28426827bbab..c56a5bb2c1f3 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -146,62 +146,6 @@ org.apache.hadoop hadoop-client - - com.google.code.findbugs - jsr305 - 2.0.1 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - org.apache.hadoop - hadoop-mapreduce-client-core - provided - - - org.apache.hadoop - hadoop-common - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - commons-lang - commons-lang - provided - - - com.google.guava - guava - provided - - - org.schemarepo - schema-repo-common - - - com.jayway.jsonpath - json-path - provided - - - joda-time - joda-time - provided - - junit diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index 41a6da08a629..db91883f1cf3 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -35,11 +35,6 @@ - - com.yahoo.datasketches - memory - 0.12.2 - com.yahoo.datasketches sketches-core @@ -51,10 +46,6 @@ - - org.apache.calcite - calcite-core - org.apache.commons commons-math3 @@ -65,12 +56,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-server - ${project.parent.version} - provided - org.apache.druid druid-processing @@ -83,67 +68,53 @@ ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - - - com.google.guava - guava - - - com.google.inject - guice - provided - - - commons-codec - commons-codec - - - it.unimi.dsi - fastutil - provided - com.fasterxml.jackson.core jackson-annotations + ${jackson.version} provided com.fasterxml.jackson.core jackson-core + ${jackson.version} provided com.fasterxml.jackson.core jackson-databind + ${jackson.version} provided com.fasterxml.jackson.datatype jackson-datatype-guava + ${jackson.version} provided com.fasterxml.jackson.datatype jackson-datatype-joda + ${jackson.version} provided com.fasterxml.jackson.dataformat jackson-dataformat-smile + ${jackson.version} provided com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson.version} provided com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider + ${jackson.version} provided diff --git a/extensions-core/druid-basic-security/pom.xml b/extensions-core/druid-basic-security/pom.xml index e2835e315997..4681fb820a4e 100644 --- a/extensions-core/druid-basic-security/pom.xml +++ b/extensions-core/druid-basic-security/pom.xml @@ -37,12 +37,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - org.apache.druid druid-services @@ -60,71 +54,6 @@ jdbi provided - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - provided - - - com.google.code.findbugs - jsr305 - provided - - - joda-time - joda-time - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.inject - guice - provided - - - io.netty - netty - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - javax.servlet - javax.servlet-api - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.sun.jersey - jersey-server - provided - - - org.apache.commons - commons-lang3 - provided - - - com.google.guava - guava - provided - - - javax.ws.rs - jsr311-api - provided - diff --git a/extensions-core/druid-bloom-filter/pom.xml b/extensions-core/druid-bloom-filter/pom.xml index 250ef1531930..6cfeea1271a9 100644 --- a/extensions-core/druid-bloom-filter/pom.xml +++ b/extensions-core/druid-bloom-filter/pom.xml @@ -35,18 +35,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - - - org.apache.druid - druid-server - ${project.parent.version} - provided - org.apache.druid druid-processing @@ -70,46 +58,6 @@ - - com.google.code.findbugs - jsr305 - provided - - - org.apache.calcite - calcite-core - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.guava - guava - provided - diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index 49371a41bcd4..b1b274e906df 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -35,12 +35,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - org.apache.druid druid-processing @@ -53,6 +47,26 @@ ${project.parent.version} provided + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-proxy + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-servlets + org.apache.hadoop hadoop-common @@ -169,57 +183,6 @@ - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - io.netty - netty - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - javax.servlet - javax.servlet-api - - - com.google.guava - guava - provided - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-client - - - org.apache.hadoop - hadoop-auth - - - javax.servlet - servlet-api - provided - diff --git a/extensions-core/ec2-extensions/pom.xml b/extensions-core/ec2-extensions/pom.xml index 470b3aa4b4c4..f16a8b5c6aed 100644 --- a/extensions-core/ec2-extensions/pom.xml +++ b/extensions-core/ec2-extensions/pom.xml @@ -35,12 +35,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - org.apache.druid druid-indexing-service @@ -53,42 +47,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - provided - - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.amazonaws - aws-java-sdk-ec2 - provided - diff --git a/extensions-core/google-extensions/pom.xml b/extensions-core/google-extensions/pom.xml index ad5444eda98f..123c73109c6c 100644 --- a/extensions-core/google-extensions/pom.xml +++ b/extensions-core/google-extensions/pom.xml @@ -62,69 +62,8 @@ - - commons-io - commons-io - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.http-client - google-http-client-jackson2 - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - com.google.guava - guava - provided - - - javax.validation - validation-api - provided - - - com.google.http-client - google-http-client - provided - - - com.google.api-client - google-api-client - provided - - - org.apache.druid - druid-processing - ${project.parent.version} - test - org.apache.druid druid-processing @@ -148,10 +87,5 @@ easymock test - - com.fasterxml.jackson.module - jackson-module-guice - test - diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml index 1622e8f4873a..9fee70cdbc9f 100644 --- a/extensions-core/hdfs-storage/pom.xml +++ b/extensions-core/hdfs-storage/pom.xml @@ -40,6 +40,117 @@ ${project.parent.version} provided + + org.apache.hadoop + hadoop-client + compile + + + commons-cli + commons-cli + + + commons-httpclient + commons-httpclient + + + log4j + log4j + + + commons-codec + commons-codec + + + commons-logging + commons-logging + + + commons-io + commons-io + + + commons-lang + commons-lang + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.apache.zookeeper + zookeeper + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + javax.ws.rs + jsr311-api + + + com.google.code.findbugs + jsr305 + + + org.mortbay.jetty + jetty-util + + + org.apache.hadoop + hadoop-annotations + + + javax.activation + activation + + + com.google.protobuf + protobuf-java + + + com.sun.jersey + jersey-core + + + org.apache.curator + curator-client + + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.commons + commons-math3 + + + com.google.guava + guava + + + org.apache.hadoop hadoop-common @@ -175,65 +286,6 @@ commons-io provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - org.apache.hadoop - hadoop-mapreduce-client-core - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - org.apache.hadoop - hadoop-hdfs-client - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - commons-lang - commons-lang - provided - - - com.google.guava - guava - - - javax.validation - validation-api - provided - @@ -280,12 +332,6 @@ ${project.parent.version} test - - org.apache.druid - druid-processing - ${project.parent.version} - test - diff --git a/extensions-core/histogram/pom.xml b/extensions-core/histogram/pom.xml index 50acf7e5f262..c38e753915fb 100644 --- a/extensions-core/histogram/pom.xml +++ b/extensions-core/histogram/pom.xml @@ -33,70 +33,18 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - org.apache.druid druid-processing ${project.parent.version} provided - - org.apache.druid - druid-server - ${project.parent.version} - provided - org.apache.druid druid-sql ${project.parent.version} provided - - com.google.code.findbugs - jsr305 - provided - - - org.apache.calcite - calcite-core - provided - - - org.apache.commons - commons-math3 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - it.unimi.dsi - fastutil - provided - - - com.google.guava - guava - provided - @@ -137,11 +85,6 @@ easymock test - - org.hamcrest - hamcrest-core - test - diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml index c55a7e5aeaf1..fb1f27f88e13 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -80,62 +80,6 @@ - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - org.apache.zookeeper - zookeeper - provided - - - com.101tec - zkclient - 0.3 - - - log4j - log4j - - - - - com.google.guava - guava - provided - - - javax.validation - validation-api - provided - - - javax.ws.rs - jsr311-api - provided - @@ -171,11 +115,6 @@ - - org.powermock - powermock-core - test - org.powermock powermock-module-junit4 @@ -186,10 +125,5 @@ powermock-api-easymock test - - org.apache.logging.log4j - log4j-1.2-api - test - diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml index 602f4b32a1c1..964a6e992d14 100644 --- a/extensions-core/kafka-indexing-service/pom.xml +++ b/extensions-core/kafka-indexing-service/pom.xml @@ -50,18 +50,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - provided - - - org.apache.druid - druid-server - ${project.parent.version} - provided - io.netty netty @@ -83,61 +71,6 @@ - - com.google.code.findbugs - jsr305 - provided - - - commons-io - commons-io - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - javax.ws.rs - jsr311-api - provided - - - org.hamcrest - hamcrest-core - test - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.guava - guava - provided - - - javax.validation - validation-api - provided - @@ -182,12 +115,6 @@ easymock test - - org.scala-lang - scala-library - 2.12.7 - test - diff --git a/extensions-core/kinesis-indexing-service/pom.xml b/extensions-core/kinesis-indexing-service/pom.xml index c5ca5e4e5f60..d1a4335c1311 100644 --- a/extensions-core/kinesis-indexing-service/pom.xml +++ b/extensions-core/kinesis-indexing-service/pom.xml @@ -53,12 +53,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-processing - ${project.parent.version} - provided - com.amazonaws aws-java-sdk-kinesis @@ -71,48 +65,7 @@ - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - io.netty - netty - provided - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - com.google.guava - guava - provided - - - com.amazonaws - aws-java-sdk-core - provided - + org.apache.druid @@ -171,11 +124,6 @@ test-jar test - - org.hamcrest - hamcrest-core - test - diff --git a/extensions-core/lookups-cached-global/pom.xml b/extensions-core/lookups-cached-global/pom.xml index c151e36e10e8..e4d7bf5dd281 100644 --- a/extensions-core/lookups-cached-global/pom.xml +++ b/extensions-core/lookups-cached-global/pom.xml @@ -52,65 +52,6 @@ ${project.parent.version} provided - - org.mapdb - mapdb - - - com.google.code.findbugs - jsr305 - provided - - - joda-time - joda-time - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - org.jdbi - jdbi - provided - - - com.google.guava - guava - provided - - - javax.validation - validation-api - provided - - - javax.ws.rs - jsr311-api - provided - @@ -153,11 +94,6 @@ - - org.powermock - powermock-core - test - org.powermock powermock-module-junit4 diff --git a/extensions-core/lookups-cached-single/pom.xml b/extensions-core/lookups-cached-single/pom.xml index 6d0bc5b8b116..465e5cb616c0 100644 --- a/extensions-core/lookups-cached-single/pom.xml +++ b/extensions-core/lookups-cached-single/pom.xml @@ -60,42 +60,6 @@ org.antlr stringtemplate 3.2 - runtime - - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - org.jdbi - jdbi - provided - - - com.google.guava - guava - provided diff --git a/extensions-core/mysql-metadata-storage/pom.xml b/extensions-core/mysql-metadata-storage/pom.xml index 0525720e6588..b9934ac39f74 100644 --- a/extensions-core/mysql-metadata-storage/pom.xml +++ b/extensions-core/mysql-metadata-storage/pom.xml @@ -58,36 +58,6 @@ jdbi provided - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - org.apache.commons - commons-dbcp2 - provided - diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml index 2f5f4b43cdf0..f6d9d6217a88 100644 --- a/extensions-core/orc-extensions/pom.xml +++ b/extensions-core/orc-extensions/pom.xml @@ -134,71 +134,6 @@ - - org.apache.orc - orc-core - ${orc.version} - - - org.apache.hadoop - hadoop-hdfs - - - - - com.google.code.findbugs - jsr305 - provided - - - com.jayway.jsonpath - json-path - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - org.apache.hadoop - hadoop-mapreduce-client-core - provided - - - org.apache.hadoop - hadoop-common - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - it.unimi.dsi - fastutil - provided - - - com.google.guava - guava - provided - - - javax.validation - validation-api - provided - - - org.apache.hive - hive-storage-api - junit junit diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml index a15cd53a6b18..3b4ae1b86a69 100644 --- a/extensions-core/parquet-extensions/pom.xml +++ b/extensions-core/parquet-extensions/pom.xml @@ -36,20 +36,9 @@ 1.10.1 + 1.1.7.2 - - org.apache.druid - druid-processing - ${project.parent.version} - provided - - - org.apache.druid - druid-server - ${project.parent.version} - provided - org.apache.druid.extensions druid-avro-extensions @@ -107,9 +96,9 @@ - org.apache.parquet - parquet-hadoop - ${parquet.version} + org.xerial.snappy + snappy-java + ${snappy.version} org.apache.druid @@ -128,61 +117,6 @@ hadoop-client provided - - com.google.code.findbugs - jsr305 - provided - - - com.jayway.jsonpath - json-path - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - org.apache.hadoop - hadoop-mapreduce-client-core - provided - - - org.apache.hadoop - hadoop-common - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.guava - guava - provided - - - org.apache.directory.api - api-util - provided - - - org.apache.avro - avro - provided - junit junit diff --git a/extensions-core/postgresql-metadata-storage/pom.xml b/extensions-core/postgresql-metadata-storage/pom.xml index e879bcc9271c..525d8bb60c7c 100644 --- a/extensions-core/postgresql-metadata-storage/pom.xml +++ b/extensions-core/postgresql-metadata-storage/pom.xml @@ -57,36 +57,6 @@ jdbi provided - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - org.apache.commons - commons-dbcp2 - provided - junit diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml index f22900f1507f..a1e0171c1def 100644 --- a/extensions-core/protobuf-extensions/pom.xml +++ b/extensions-core/protobuf-extensions/pom.xml @@ -67,45 +67,13 @@ protobuf-dynamic 0.9.3 - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - junit junit test - - org.hamcrest - hamcrest-core - test - - diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml index f9e04319d5f3..167557582b74 100644 --- a/extensions-core/s3-extensions/pom.xml +++ b/extensions-core/s3-extensions/pom.xml @@ -58,61 +58,6 @@ ${jackson.version} provided - - com.google.code.findbugs - jsr305 - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.google.inject.extensions - guice-multibindings - provided - - - commons-lang - commons-lang - provided - - - com.google.guava - guava - provided - - - com.amazonaws - aws-java-sdk-core - provided - - - javax.validation - validation-api - provided - - - com.amazonaws - aws-java-sdk-s3 - provided - @@ -121,12 +66,6 @@ ${project.parent.version} test - - org.apache.druid - druid-processing - ${project.parent.version} - test - org.apache.druid druid-processing diff --git a/extensions-core/simple-client-sslcontext/pom.xml b/extensions-core/simple-client-sslcontext/pom.xml index 176b0091cf8f..93e68c696e6c 100644 --- a/extensions-core/simple-client-sslcontext/pom.xml +++ b/extensions-core/simple-client-sslcontext/pom.xml @@ -47,25 +47,5 @@ ${project.parent.version} provided - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.google.guava - guava - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - diff --git a/extensions-core/stats/pom.xml b/extensions-core/stats/pom.xml index b07ffafd82f3..d830e5e87000 100644 --- a/extensions-core/stats/pom.xml +++ b/extensions-core/stats/pom.xml @@ -34,18 +34,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - provided - - - org.apache.druid - druid-server - ${project.parent.version} - provided - org.apache.druid druid-processing @@ -62,41 +50,6 @@ org.apache.commons commons-math3 - - com.google.code.findbugs - jsr305 - provided - - - org.apache.calcite - calcite-core - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - joda-time - joda-time - provided - - - com.google.inject - guice - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.google.guava - guava - provided - diff --git a/hll/pom.xml b/hll/pom.xml index 6b04e46c326a..296c79ae6624 100644 --- a/hll/pom.xml +++ b/hll/pom.xml @@ -45,16 +45,8 @@ ${project.parent.version} - com.google.code.findbugs - jsr305 - - - com.fasterxml.jackson.core - jackson-annotations - - - com.google.guava - guava + commons-codec + commons-codec diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index d17a0735b09f..3a3f5ff9f408 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -37,16 +37,7 @@ druid-server ${project.parent.version} - - org.apache.druid - druid-processing - ${project.parent.version} - - - org.apache.druid - druid-hll - ${project.parent.version} - + org.apache.druid druid-core @@ -80,6 +71,10 @@ com.fasterxml.jackson.core jackson-databind + + org.jdbi + jdbi + com.google.code.findbugs jsr305 @@ -100,31 +95,6 @@ - - joda-time - joda-time - - - com.fasterxml.jackson.core - jackson-annotations - - - com.google.inject - guice - - - org.apache.hadoop - hadoop-hdfs-client - provided - - - javax.validation - validation-api - - - org.eclipse.jetty - jetty-client - @@ -198,11 +168,6 @@ derbyclient test - - org.hamcrest - hamcrest-core - test - diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index e0f28c7aa7d8..771b493b7d81 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -47,149 +47,6 @@ druid-indexing-hadoop ${project.parent.version} - - org.apache.druid - druid-processing - ${project.parent.version} - - - org.apache.druid - druid-hll - ${project.parent.version} - - - - io.dropwizard.metrics - metrics-core - - - com.google.code.findbugs - jsr305 - - - commons-io - commons-io - - - com.fasterxml.jackson.core - jackson-annotations - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-client - - - joda-time - joda-time - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - - - com.google.inject.extensions - guice-multibindings - - - commons-lang - commons-lang - - - javax.ws.rs - jsr311-api - - - javax.inject - javax.inject - - - org.apache.hadoop - hadoop-mapreduce-client-core - provided - - - org.apache.hadoop - hadoop-common - provided - - - io.netty - netty - - - org.apache.zookeeper - zookeeper - - - javax.servlet - javax.servlet-api - - - com.fasterxml.jackson.core - jackson-core - - - com.sun.jersey - jersey-server - - - com.google.guava - guava - - - org.apache.curator - curator-recipes - - - javax.validation - validation-api - - - org.apache.hadoop - hadoop-yarn-common - provided - - - javax.servlet - servlet-api - provided - - - io.netty - netty-handler - - - org.apache.commons - commons-lang3 - - - commons-codec - commons-codec - - - org.eclipse.jetty - jetty-util - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-smile-provider - - - com.google.errorprone - error_prone_annotations - - - org.codehaus.plexus - plexus-utils - @@ -233,11 +90,6 @@ test-jar test - - org.hamcrest - hamcrest-core - test - diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerAutoCleanupTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerAutoCleanupTest.java index 03d1397e379e..c158c0e33a50 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerAutoCleanupTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerAutoCleanupTest.java @@ -19,6 +19,7 @@ package org.apache.druid.indexing.worker; +import com.amazonaws.util.StringUtils; import com.google.common.collect.ImmutableList; import org.apache.commons.io.FileUtils; import org.apache.druid.client.indexing.IndexingServiceClient; @@ -42,7 +43,6 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -127,7 +127,7 @@ public void testCleanup() throws IOException, InterruptedException private File generateSegmentFile() throws IOException { final File segmentFile = tempDir.newFile(); - FileUtils.write(segmentFile, "test data.", StandardCharsets.UTF_8); + FileUtils.write(segmentFile, "test data.", StringUtils.UTF8); return segmentFile; } diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerManualAddAndDeleteTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerManualAddAndDeleteTest.java index 45055ca42d22..7bd9e906a96b 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerManualAddAndDeleteTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/IntermediaryDataManagerManualAddAndDeleteTest.java @@ -19,6 +19,7 @@ package org.apache.druid.indexing.worker; +import com.amazonaws.util.StringUtils; import com.google.common.collect.ImmutableList; import org.apache.commons.io.FileUtils; import org.apache.druid.client.indexing.IndexingServiceClient; @@ -40,7 +41,6 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.Comparator; import java.util.List; @@ -153,7 +153,7 @@ public void testAddRemoveAdd() throws IOException private File generateSegmentFile() throws IOException { final File segmentFile = tempDir.newFile(); - FileUtils.write(segmentFile, "test data.", StandardCharsets.UTF_8); + FileUtils.write(segmentFile, "test data.", StringUtils.UTF8); return segmentFile; } diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 0cae657003ba..d9fd24508050 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -45,46 +45,21 @@ org.apache.druid.extensions druid-s3-extensions ${project.parent.version} - runtime org.apache.druid.extensions druid-datasketches ${project.parent.version} - runtime org.apache.druid.extensions druid-histogram ${project.parent.version} - runtime - - - org.apache.druid - druid-aws-common - ${project.parent.version} - runtime - - - org.apache.druid - druid-processing - ${project.parent.version} - - - org.apache.druid - druid-sql - ${project.parent.version} - - - org.apache.druid - druid-indexing-service - ${project.parent.version} org.apache.druid.extensions mysql-metadata-storage ${project.parent.version} - runtime org.apache.druid.extensions @@ -106,7 +81,6 @@ org.apache.druid.extensions druid-lookups-cached-global ${project.parent.version} - runtime org.apache.druid.extensions @@ -117,83 +91,23 @@ org.apache.druid druid-services ${project.parent.version} - runtime org.apache.druid druid-server ${project.parent.version} - - commons-io - commons-io - - - joda-time - joda-time - - - com.fasterxml.jackson.core - jackson-annotations - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - - - org.apache.kafka - kafka-clients - ${apache.kafka.version} - - - javax.ws.rs - jsr311-api - - - io.netty - netty - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-smile-provider - - - com.google.guava - guava - - - com.101tec - zkclient - 0.10 - - - javax.validation - validation-api - - - org.apache.logging.log4j - log4j-slf4j-impl - runtime - org.apache.calcite.avatica avatica - test + 1.10.0 org.apache.calcite.avatica - avatica-core - test + avatica-server + 1.10.0 org.testng diff --git a/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java index 779490839806..dd2945887b5e 100644 --- a/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java @@ -32,7 +32,7 @@ import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.TimelineObjectHolder; import org.apache.druid.timeline.VersionedIntervalTimeline; -import org.testng.Assert; +import org.junit.Assert; import java.io.IOException; import java.io.InputStream; @@ -135,7 +135,7 @@ void doReindexTest( fullReindexDatasourceName, "2013-08-31T00:00:00.000Z/2013-09-10T00:00:00.000Z" ); - Assert.assertFalse(dimensions.contains("robot"), "dimensions : " + dimensions); + Assert.assertFalse("dimensions : " + dimensions, dimensions.contains("robot")); } catch (Exception e) { LOG.error(e, "Error while testing"); @@ -183,12 +183,10 @@ private void submitTaskAndWait(String taskSpec, String dataSourceName, boolean w if (assertRunsSubTasks) { final long newSubTasks = countCompleteSubTasks(dataSourceName) - startSubTaskCount; Assert.assertTrue( - newSubTasks > 0, StringUtils.format( "The supervisor task[%s] didn't create any sub tasks. Was it executed in the parallel mode?", taskID - ) - ); + ), newSubTasks > 0); } // ITParallelIndexTest does a second round of ingestion to replace segements in an existing diff --git a/licenses.yaml b/licenses.yaml index 372af991638d..3e8907ba1cb0 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -488,31 +488,22 @@ module: java-core license_name: Apache License version 2.0 version: 4.1.29.Final libraries: + - io.netty: netty-buffer + - io.netty: netty-codec - io.netty: netty-codec-dns + - io.netty: netty-codec-http - io.netty: netty-codec-socks + - io.netty: netty-common + - io.netty: netty-handler - io.netty: netty-handler-proxy - io.netty: netty-resolver - io.netty: netty-resolver-dns + - io.netty: netty-transport - io.netty: netty-transport-native-epoll - io.netty: netty-transport-native-unix-common --- -name: Netty -license_category: binary -module: java-core -license_name: Apache License version 2.0 -version: 4.1.30.Final -libraries: - - io.netty: netty-buffer - - io.netty: netty-codec - - io.netty: netty-codec-http - - io.netty: netty-common - - io.netty: netty-handler - - io.netty: netty-transport - ---- - name: fastutil license_category: binary module: java-core @@ -1367,16 +1358,6 @@ libraries: --- -name: Apache Commons Pool -license_category: binary -module: extensions/druid-datasketches -license_name: Apache License version 2.0 -version: 2.5.0 -libraries: - - org.apache.commons: commons-pool2 - ---- - name: Apache Kafka version: 2.1.0 license_category: binary @@ -2025,7 +2006,7 @@ name: Jersey license_category: binary module: extensions/druid-avro-extensions license_name: CDDL 1.1 -version: 1.19.3 +version: 1.15 copyright: Oracle and/or its affiliates. license_file_path: licenses/bin/jersey.CDDL11 libraries: diff --git a/pom.xml b/pom.xml index 58ef424998d4..1a802c9f5e15 100644 --- a/pom.xml +++ b/pom.xml @@ -102,9 +102,7 @@ 3.4.11 2.5.7 1.22.0 - 1.3 - 10.11.1.1 - 0.9.0.M2 + apache.snapshots Apache Snapshot Repository https://repository.apache.org/snapshots @@ -214,16 +212,6 @@ commons-lang 2.6 - - org.apache.commons - commons-lang3 - 3.7 - - - com.amazonaws - aws-java-sdk-core - ${aws.sdk.version} - com.amazonaws aws-java-sdk-ec2 @@ -323,31 +311,16 @@ calcite-linq4j ${calcite.version} - - org.apache.calcite.avatica - avatica - ${avatica.version} - org.apache.calcite.avatica avatica-core ${avatica.version} - - org.apache.calcite.avatica - avatica-metrics - ${avatica.version} - org.apache.calcite.avatica avatica-server ${avatica.version} - - org.apache.hive - hive-storage-api - 2.6.0 - com.google.guava guava @@ -458,12 +431,6 @@ javax.el-api 3.0.0 - - javax.servlet - servlet-api - 2.5 - provided - javax.xml.bind jaxb-api @@ -474,31 +441,16 @@ javax.el 3.0.0 - - org.glassfish.grizzly - grizzly-http-server - 2.2.16 - org.jdbi jdbi 2.63.1 - - com.sun.jersey - jersey-client - ${jersey.version} - com.sun.jersey jersey-core ${jersey.version} - - com.sun.jersey - jersey-grizzly2 - ${jersey.version} - com.sun.jersey.contribs jersey-guice @@ -519,31 +471,11 @@ jersey-server ${jersey.version} - - com.sun.jersey - jersey-servlet - ${jersey.version} - com.sun.jersey jersey-json ${jersey.version} - - org.eclipse.jetty - jetty-client - ${jetty.version} - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-io - ${jetty.version} - org.eclipse.jetty jetty-server @@ -584,26 +516,6 @@ netty-all ${netty4.version} - - io.netty - netty-buffer - ${netty4.version} - - - io.netty - netty-common - ${netty4.version} - - - io.netty - netty-codec-http - ${netty4.version} - - - io.netty - netty-handler - ${netty4.version} - joda-time joda-time @@ -707,12 +619,7 @@ org.eclipse.aether aether-api - ${aether.version} - - - org.eclipse.aether - aether-util - ${aether.version} + 0.9.0.M2 org.apache.httpcomponents @@ -724,11 +631,6 @@ httpcore 4.4.4 - - org.apache.hadoop - hadoop-auth - ${hadoop.compile.version} - org.apache.hadoop hadoop-client @@ -747,12 +649,6 @@ ${hadoop.compile.version} provided - - org.apache.hadoop - hadoop-hdfs-client - ${hadoop.compile.version} - provided - org.apache.hadoop hadoop-mapreduce-client-core @@ -765,31 +661,20 @@ - - org.apache.hadoop - hadoop-yarn-common - ${hadoop.compile.version} - provided - org.mapdb mapdb 1.0.8 - - org.apache.derby - derby - ${derby.version} - org.apache.derby derbynet - ${derby.version} + 10.11.1.1 org.apache.derby derbyclient - ${derby.version} + 10.11.1.1 org.apache.commons @@ -897,28 +782,6 @@ maven-artifact 3.6.0 - - javax.ws.rs - jsr311-api - 1.1.1 - - - org.schemarepo - schema-repo-common - 0.1.3 - - - org.apache.avro - avro - 1.9.0 - provided - - - org.apache.directory.api - api-util - 1.0.0-M20 - provided - org.apache.calcite @@ -939,12 +802,6 @@ 4.12 test - - org.powermock - powermock-core - ${powermock.version} - test - org.powermock powermock-module-junit4 @@ -1045,11 +902,6 @@ - - com.google.http-client - google-http-client - ${com.google.apis.client.version} - com.google.http-client google-http-client-jackson2 @@ -1089,13 +941,7 @@ org.hamcrest hamcrest-all - ${hamcrest.version} - test - - - org.hamcrest - hamcrest-core - ${hamcrest.version} + 1.3 test @@ -1417,7 +1263,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 2.8 org.apache.maven.plugins diff --git a/processing/pom.xml b/processing/pom.xml index b2b6f9faf4f3..53c1d23f3ed1 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -59,18 +59,6 @@ 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 - org.roaringbitmap RoaringBitmap @@ -107,6 +95,10 @@ org.lz4 lz4-java + + org.mapdb + mapdb + commons-lang commons-lang @@ -128,30 +120,7 @@ org.apache.maven maven-artifact - - com.google.code.findbugs - jsr305 - - - joda-time - joda-time - - - com.google.inject - guice - - - javax.inject - javax.inject - - - com.google.guava - guava - - - javax.validation - validation-api - + @@ -197,11 +166,6 @@ guava-testlib test - - org.hamcrest - hamcrest-core - test - diff --git a/server/pom.xml b/server/pom.xml index e62bc2b95403..2bcd4434822e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -39,23 +39,48 @@ org.apache.druid - druid-core + druid-aws-common ${project.parent.version} org.apache.druid - druid-hll + druid-gcp-common ${project.parent.version} - + + org.apache.druid + druid-console + ${project.parent.version} + + + org.apache.druid + druid-core + ${project.parent.version} + + + commons-cli + commons-cli + + + commons-lang + commons-lang + javax.inject javax.inject + + org.glassfish + javax.el + org.apache.zookeeper zookeeper + + org.apache.httpcomponents + httpclient + org.apache.curator curator-framework @@ -91,10 +116,6 @@ com.sun.jersey jersey-core - - com.google.inject.extensions - guice-multibindings - com.google.inject.extensions guice-servlet @@ -123,6 +144,10 @@ io.tesla.aether tesla-aether + + org.eclipse.aether + aether-api + net.spy spymemcached @@ -139,10 +164,19 @@ org.eclipse.jetty jetty-servlets + + org.apache.derby + derby + 10.11.1.1 + org.apache.derby derbynet + + org.apache.derby + derbyclient + org.apache.commons commons-math3 @@ -155,134 +189,6 @@ com.github.ben-manes.caffeine caffeine - - org.jdbi - jdbi - - - io.netty - netty - - - org.apache.commons - commons-dbcp2 - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - org.asynchttpclient - async-http-client - - - org.apache.curator - curator-client - - - com.google.inject - guice - - - commons-codec - commons-codec - - - org.eclipse.jetty - jetty-io - - - io.netty - netty-common - - - io.netty - netty-handler - - - com.google.guava - guava - - - org.skife.config - config-magic - - - org.apache.curator - curator-recipes - - - com.sun.jersey - jersey-servlet - - - commons-io - commons-io - - - com.fasterxml.jackson.core - jackson-annotations - - - joda-time - joda-time - - - com.fasterxml.jackson.core - jackson-databind - - - org.eclipse.jetty - jetty-client - - - javax.ws.rs - jsr311-api - - - javax.servlet - javax.servlet-api - - - com.fasterxml.jackson.core - jackson-core - - - org.eclipse.jetty - jetty-http - - - javax.validation - validation-api - - - org.hibernate - hibernate-validator - - - com.google.errorprone - error_prone_annotations - - - commons-lang - commons-lang - - - org.eclipse.aether - aether-api - - - org.slf4j - slf4j-api - @@ -293,11 +199,7 @@ org.hamcrest hamcrest-all - test - - - org.hamcrest - hamcrest-core + 1.3 test @@ -364,31 +266,6 @@ 1.0.4 test - - com.sun.jersey - jersey-grizzly2 - test - - - com.sun.jersey - jersey-client - test - - - org.glassfish.grizzly - grizzly-http-server - test - - - org.apache.httpcomponents - httpcore - test - - - org.apache.logging.log4j - log4j-slf4j-impl - test - @@ -404,16 +281,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - - io.tesla.aether:tesla-aether - - - diff --git a/services/pom.xml b/services/pom.xml index c273d82b75ed..b0c434365006 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -38,11 +38,6 @@ druid-core ${project.parent.version} - - org.apache.druid - druid-processing - ${project.parent.version} - org.apache.druid druid-server @@ -67,90 +62,6 @@ io.airlift airline - - com.google.code.findbugs - jsr305 - - - commons-io - commons-io - - - org.eclipse.jetty - jetty-server - - - org.apache.curator - curator-framework - - - joda-time - joda-time - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - - - com.opencsv - opencsv - - - org.eclipse.jetty - jetty-servlet - - - com.google.inject.extensions - guice-multibindings - - - org.roaringbitmap - RoaringBitmap - - - org.eclipse.jetty - jetty-util - - - io.netty - netty-common - - - org.eclipse.aether - aether-api - - - javax.servlet - javax.servlet-api - - - com.fasterxml.jackson.core - jackson-core - - - com.google.guava - guava - - - org.eclipse.aether - aether-util - - - com.google.inject.extensions - guice-servlet - - - io.tesla.aether - tesla-aether - - - javax.xml.bind - jaxb-api - @@ -158,16 +69,6 @@ junit test - - org.apache.calcite - calcite-core - test - - - org.apache.calcite.avatica - avatica-server - test - diff --git a/services/src/main/java/org/apache/druid/cli/ExportMetadata.java b/services/src/main/java/org/apache/druid/cli/ExportMetadata.java index 97d77ef4562a..27f5509570e4 100644 --- a/services/src/main/java/org/apache/druid/cli/ExportMetadata.java +++ b/services/src/main/java/org/apache/druid/cli/ExportMetadata.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.api.client.util.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; @@ -52,7 +53,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.UUID; @@ -263,9 +263,9 @@ private void rewriteDatasourceExport( String outFile = StringUtils.format("%s/%s.csv", outputPath, datasourceTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); ) { String line; while ((line = reader.readLine()) != null) { @@ -294,9 +294,9 @@ private void rewriteRulesExport( String outFile = StringUtils.format("%s/%s.csv", outputPath, rulesTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); ) { String line; while ((line = reader.readLine()) != null) { @@ -325,9 +325,9 @@ private void rewriteConfigExport( String outFile = StringUtils.format("%s/%s.csv", outputPath, configTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); ) { String line; while ((line = reader.readLine()) != null) { @@ -354,9 +354,9 @@ private void rewriteSupervisorExport( String outFile = StringUtils.format("%s/%s.csv", outputPath, supervisorTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); ) { String line; while ((line = reader.readLine()) != null) { @@ -386,9 +386,9 @@ private void rewriteSegmentsExport( String outFile = StringUtils.format("%s/%s.csv", outputPath, segmentsTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); ) { String line; while ((line = reader.readLine()) != null) { diff --git a/sql/pom.xml b/sql/pom.xml index 1acade9e5f75..7193f620b30a 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -33,21 +33,6 @@ - - org.apache.druid - druid-core - ${project.parent.version} - - - org.apache.druid - druid-hll - ${project.parent.version} - - - org.apache.druid - druid-processing - ${project.parent.version} - org.apache.druid druid-server @@ -87,74 +72,9 @@ - - com.google.code.findbugs - jsr305 - - - org.eclipse.jetty - jetty-server - - - joda-time - joda-time - - - com.fasterxml.jackson.core - jackson-annotations - - - com.google.inject - guice - - - com.fasterxml.jackson.core - jackson-databind - - - com.opencsv - opencsv - - - com.google.inject.extensions - guice-multibindings - - - javax.ws.rs - jsr311-api - io.netty - netty - - - javax.servlet - javax.servlet-api - - - it.unimi.dsi - fastutil - 8.1.0 - - - com.fasterxml.jackson.core - jackson-core - - - com.google.guava - guava - - - com.google.errorprone - error_prone_annotations - - - org.apache.calcite.avatica - avatica-metrics - - - org.apache.curator - curator-x-discovery + netty-all @@ -195,11 +115,6 @@ test-jar test - - org.hamcrest - hamcrest-core - test - diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java index 3c71b99ef856..2116fbb38d6f 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java @@ -19,6 +19,7 @@ package org.apache.druid.sql.calcite.schema; +import com.amazonaws.annotation.GuardedBy; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; @@ -30,7 +31,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import com.google.errorprone.annotations.concurrent.GuardedBy; import com.google.inject.Inject; import org.apache.calcite.schema.Table; import org.apache.calcite.schema.impl.AbstractSchema;