diff --git a/.travis.yml b/.travis.yml index a8aca05e9f9..6bd300f6c81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,34 @@ 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 - # packaging check + # 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 - env: - NAME="packaging check" before_install: diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 37f657b0a96..cce3d0edf98 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -61,33 +61,20 @@ druid-sql ${project.parent.version} - - org.apache.druid.extensions - druid-datasketches - ${project.parent.version} - - - 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 + extendedset + ${project.parent.version} + + + org.apache.druid.extensions + druid-histogram + ${project.parent.version} org.apache.druid @@ -113,9 +100,44 @@ 0.1.0 - org.easymock - easymock - compile + 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 junit diff --git a/cloud/aws-common/pom.xml b/cloud/aws-common/pom.xml index f1c47cd1559..1adbb88da0c 100644 --- a/cloud/aws-common/pom.xml +++ b/cloud/aws-common/pom.xml @@ -51,6 +51,34 @@ 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 + @@ -59,5 +87,4 @@ test - diff --git a/cloud/gcp-common/pom.xml b/cloud/gcp-common/pom.xml index 053cbab15bb..b4f97a11279 100644 --- a/cloud/gcp-common/pom.xml +++ b/cloud/gcp-common/pom.xml @@ -48,8 +48,21 @@ google-http-client-jackson2 - com.fasterxml.jackson.module - jackson-module-guice + com.google.guava + guava + + + com.google.inject + guice + + + com.fasterxml.jackson.core + jackson-databind + provided + + + com.google.http-client + google-http-client diff --git a/codestyle/druid-forbidden-apis.txt b/codestyle/druid-forbidden-apis.txt index 7925b3b1a72..2f0b2bcfd7f 100644 --- a/codestyle/druid-forbidden-apis.txt +++ b/codestyle/druid-forbidden-apis.txt @@ -48,3 +48,4 @@ 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 1f7cd6bc247..b79ddc54dff 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -41,10 +41,6 @@ - - commons-codec - commons-codec - commons-io commons-io @@ -57,15 +53,6 @@ org.apache.commons commons-compress - - org.apache.commons - commons-dbcp2 - - - commons-pool - commons-pool - 1.6 - org.skife.config config-magic @@ -73,14 +60,17 @@ org.hibernate hibernate-validator + runtime javax.el javax.el-api + runtime - javax.xml.bind - jaxb-api + org.glassfish + javax.el + runtime com.google.guava @@ -98,18 +88,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 - com.google.inject guice @@ -126,42 +104,18 @@ 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 @@ -170,6 +124,18 @@ it.unimi.dsi fastutil + + io.netty + netty-buffer + + + io.netty + netty-common + + + io.netty + netty-codec-http + com.opencsv @@ -183,10 +149,12 @@ org.tukaani xz + runtime com.github.luben zstd-jni + runtime com.jayway.jsonpath @@ -204,6 +172,7 @@ com.lmax disruptor + runtime @@ -268,6 +237,11 @@ hamcrest-all test + + org.hamcrest + hamcrest-core + test + org.slf4j slf4j-simple @@ -284,10 +258,20 @@ 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 705aff95b86..8c5979f41bc 100644 --- a/extensions-contrib/ambari-metrics-emitter/pom.xml +++ b/extensions-contrib/ambari-metrics-emitter/pom.xml @@ -69,6 +69,47 @@ + + 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 d0b15c4d59c..78360bd3c39 100644 --- a/extensions-contrib/azure-extensions/pom.xml +++ b/extensions-contrib/azure-extensions/pom.xml @@ -66,6 +66,49 @@ 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 + @@ -79,6 +122,12 @@ ${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 5dde6547574..f92c108c1fc 100644 --- a/extensions-contrib/cassandra-storage/pom.xml +++ b/extensions-contrib/cassandra-storage/pom.xml @@ -124,6 +124,40 @@ 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 8dfbc85ae1b..19d91fc4bfa 100644 --- a/extensions-contrib/cloudfiles-extensions/pom.xml +++ b/extensions-contrib/cloudfiles-extensions/pom.xml @@ -61,19 +61,52 @@ - - com.google.inject.extensions - guice-servlet - ${guice.version} - - com.google.inject.extensions guice-multibindings ${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 + + + org.apache.jclouds + jclouds-core + ${jclouds.version} + + + org.apache.jclouds.api + openstack-swift + ${jclouds.version} + org.apache.jclouds.driver jclouds-slf4j @@ -90,15 +123,14 @@ - org.apache.jclouds.driver - jclouds-sshj + org.apache.jclouds.api + openstack-keystone + ${jclouds.version} + + + org.apache.jclouds.api + rackspace-cloudfiles ${jclouds.version} - - - org.slf4j - slf4j-api - - @@ -145,6 +177,12 @@ ${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 a4f20481e05..7410399b9d7 100644 --- a/extensions-contrib/distinctcount/pom.xml +++ b/extensions-contrib/distinctcount/pom.xml @@ -35,12 +35,53 @@ + + 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 + @@ -67,6 +108,11 @@ easymock test + + org.hamcrest + hamcrest-core + test + diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml index 1a589afb0c6..4864f8390a3 100644 --- a/extensions-contrib/graphite-emitter/pom.xml +++ b/extensions-contrib/graphite-emitter/pom.xml @@ -41,6 +41,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-processing + ${project.parent.version} + provided + org.apache.druid druid-server @@ -52,6 +58,47 @@ 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 61beb012c19..6172a4c736f 100644 --- a/extensions-contrib/influx-extensions/pom.xml +++ b/extensions-contrib/influx-extensions/pom.xml @@ -51,6 +51,31 @@ 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 + @@ -59,27 +84,18 @@ test - org.mockito - mockito-core - 2.2.10 + org.hamcrest + hamcrest-all test org.hamcrest - hamcrest-all - 1.3 + hamcrest-core test pl.pragmatists JUnitParams - 1.0.4 - test - - - org.apache.druid - druid-processing - ${project.parent.version} test @@ -97,6 +113,16 @@ + + 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 319d95e7b1e..56dd89bba0b 100644 --- a/extensions-contrib/influxdb-emitter/pom.xml +++ b/extensions-contrib/influxdb-emitter/pom.xml @@ -43,6 +43,41 @@ ${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 @@ -59,16 +94,5 @@ 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 2e5946216af..64e7ea01ae8 100644 --- a/extensions-contrib/kafka-emitter/pom.xml +++ b/extensions-contrib/kafka-emitter/pom.xml @@ -46,6 +46,37 @@ ${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 @@ -76,5 +107,11 @@ 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 0442e857cfa..7af5e5d9e7d 100644 --- a/extensions-contrib/materialized-view-maintenance/pom.xml +++ b/extensions-contrib/materialized-view-maintenance/pom.xml @@ -34,18 +34,72 @@ 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 @@ -60,11 +114,21 @@ 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 d5525838f0e..9db794c8e16 100644 --- a/extensions-contrib/materialized-view-selection/pom.xml +++ b/extensions-contrib/materialized-view-selection/pom.xml @@ -34,6 +34,18 @@ 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 @@ -45,6 +57,57 @@ 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 @@ -59,6 +122,11 @@ test test-jar + + junit + junit + test + org.easymock easymock diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml index 4e0a260d3de..b1003ef22e3 100644 --- a/extensions-contrib/momentsketch/pom.xml +++ b/extensions-contrib/momentsketch/pom.xml @@ -58,6 +58,32 @@ ${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 80e9b6bc854..79ee2e2de00 100644 --- a/extensions-contrib/moving-average-query/pom.xml +++ b/extensions-contrib/moving-average-query/pom.xml @@ -67,5 +67,51 @@ ${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 51ca058de37..a7b44be6302 100644 --- a/extensions-contrib/opentsdb-emitter/pom.xml +++ b/extensions-contrib/opentsdb-emitter/pom.xml @@ -42,6 +42,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-processing + ${project.parent.version} + provided + org.apache.druid druid-server @@ -53,6 +59,40 @@ 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 dcfd587bd8f..6a07460e157 100644 --- a/extensions-contrib/redis-cache/pom.xml +++ b/extensions-contrib/redis-cache/pom.xml @@ -41,6 +41,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-processing + ${project.parent.version} + provided + org.apache.druid druid-server @@ -52,6 +58,26 @@ 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 926ebc2b927..b7ddf11aef4 100644 --- a/extensions-contrib/sqlserver-metadata-storage/pom.xml +++ b/extensions-contrib/sqlserver-metadata-storage/pom.xml @@ -52,6 +52,31 @@ 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 ed83a35f4e1..872ce489f1a 100644 --- a/extensions-contrib/statsd-emitter/pom.xml +++ b/extensions-contrib/statsd-emitter/pom.xml @@ -45,6 +45,36 @@ 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 e6f25a70a4f..bd57242a9e9 100644 --- a/extensions-contrib/tdigestsketch/pom.xml +++ b/extensions-contrib/tdigestsketch/pom.xml @@ -58,6 +58,42 @@ ${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 7ac6e054e9a..f9ac92f09b9 100644 --- a/extensions-contrib/thrift-extensions/pom.xml +++ b/extensions-contrib/thrift-extensions/pom.xml @@ -41,6 +41,12 @@ + + org.apache.druid + druid-core + ${project.parent.version} + provided + org.apache.thrift libthrift @@ -87,9 +93,36 @@ - com.twitter.elephantbird - elephant-bird-hadoop-compat - ${elephantbird.version} + 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 @@ -102,6 +135,11 @@ 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 5e14d0f14ae..4467e5a6518 100644 --- a/extensions-contrib/time-min-max/pom.xml +++ b/extensions-contrib/time-min-max/pom.xml @@ -46,6 +46,36 @@ ${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 a61ecf9bcd8..adce96f0ef0 100644 --- a/extensions-contrib/virtual-columns/pom.xml +++ b/extensions-contrib/virtual-columns/pom.xml @@ -46,6 +46,36 @@ ${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 c56a5bb2c1f..28426827bba 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -146,6 +146,62 @@ 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 db91883f1cf..41a6da08a62 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -35,6 +35,11 @@ + + com.yahoo.datasketches + memory + 0.12.2 + com.yahoo.datasketches sketches-core @@ -46,6 +51,10 @@ + + org.apache.calcite + calcite-core + org.apache.commons commons-math3 @@ -56,6 +65,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-server + ${project.parent.version} + provided + org.apache.druid druid-processing @@ -68,53 +83,67 @@ ${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 4681fb820a4..e2835e31599 100644 --- a/extensions-core/druid-basic-security/pom.xml +++ b/extensions-core/druid-basic-security/pom.xml @@ -37,6 +37,12 @@ + + org.apache.druid + druid-core + ${project.parent.version} + provided + org.apache.druid druid-services @@ -54,6 +60,71 @@ 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 6cfeea1271a..250ef153193 100644 --- a/extensions-core/druid-bloom-filter/pom.xml +++ b/extensions-core/druid-bloom-filter/pom.xml @@ -35,6 +35,18 @@ + + org.apache.druid + druid-core + ${project.parent.version} + provided + + + org.apache.druid + druid-server + ${project.parent.version} + provided + org.apache.druid druid-processing @@ -58,6 +70,46 @@ + + 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 b1b274e906d..49371a41bcd 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -35,6 +35,12 @@ + + org.apache.druid + druid-core + ${project.parent.version} + provided + org.apache.druid druid-processing @@ -47,26 +53,6 @@ ${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 @@ -183,6 +169,57 @@ + + 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 f16a8b5c6ae..470b3aa4b4c 100644 --- a/extensions-core/ec2-extensions/pom.xml +++ b/extensions-core/ec2-extensions/pom.xml @@ -35,6 +35,12 @@ + + org.apache.druid + druid-core + ${project.parent.version} + provided + org.apache.druid druid-indexing-service @@ -47,6 +53,42 @@ ${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 123c73109c6..ad5444eda98 100644 --- a/extensions-core/google-extensions/pom.xml +++ b/extensions-core/google-extensions/pom.xml @@ -62,8 +62,69 @@ + + 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 @@ -87,5 +148,10 @@ 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 9fee70cdbc9..1622e8f4873 100644 --- a/extensions-core/hdfs-storage/pom.xml +++ b/extensions-core/hdfs-storage/pom.xml @@ -40,117 +40,6 @@ ${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 @@ -286,6 +175,65 @@ 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 + @@ -332,6 +280,12 @@ ${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 c38e753915f..50acf7e5f26 100644 --- a/extensions-core/histogram/pom.xml +++ b/extensions-core/histogram/pom.xml @@ -33,18 +33,70 @@ + + 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 + @@ -85,6 +137,11 @@ 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 fb1f27f88e1..c55a7e5aeaf 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -80,6 +80,62 @@ + + 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 + @@ -115,6 +171,11 @@ + + org.powermock + powermock-core + test + org.powermock powermock-module-junit4 @@ -125,5 +186,10 @@ 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 964a6e992d1..602f4b32a1c 100644 --- a/extensions-core/kafka-indexing-service/pom.xml +++ b/extensions-core/kafka-indexing-service/pom.xml @@ -50,6 +50,18 @@ ${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 @@ -71,6 +83,61 @@ + + 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 + @@ -115,6 +182,12 @@ 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 d1a4335c131..c5ca5e4e5f6 100644 --- a/extensions-core/kinesis-indexing-service/pom.xml +++ b/extensions-core/kinesis-indexing-service/pom.xml @@ -53,6 +53,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-processing + ${project.parent.version} + provided + com.amazonaws aws-java-sdk-kinesis @@ -65,7 +71,48 @@ - + + 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 @@ -124,6 +171,11 @@ 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 e4d7bf5dd28..c151e36e10e 100644 --- a/extensions-core/lookups-cached-global/pom.xml +++ b/extensions-core/lookups-cached-global/pom.xml @@ -52,6 +52,65 @@ ${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 + @@ -94,6 +153,11 @@ + + 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 465e5cb616c..6d0bc5b8b11 100644 --- a/extensions-core/lookups-cached-single/pom.xml +++ b/extensions-core/lookups-cached-single/pom.xml @@ -60,6 +60,42 @@ 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 b9934ac39f7..0525720e658 100644 --- a/extensions-core/mysql-metadata-storage/pom.xml +++ b/extensions-core/mysql-metadata-storage/pom.xml @@ -58,6 +58,36 @@ 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 f6d9d6217a8..2f5f4b43cdf 100644 --- a/extensions-core/orc-extensions/pom.xml +++ b/extensions-core/orc-extensions/pom.xml @@ -134,6 +134,71 @@ + + 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 3b4ae1b86a6..a15cd53a6b1 100644 --- a/extensions-core/parquet-extensions/pom.xml +++ b/extensions-core/parquet-extensions/pom.xml @@ -36,9 +36,20 @@ 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 @@ -96,9 +107,9 @@ - org.xerial.snappy - snappy-java - ${snappy.version} + org.apache.parquet + parquet-hadoop + ${parquet.version} org.apache.druid @@ -117,6 +128,61 @@ 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 525d8bb60c7..e879bcc9271 100644 --- a/extensions-core/postgresql-metadata-storage/pom.xml +++ b/extensions-core/postgresql-metadata-storage/pom.xml @@ -57,6 +57,36 @@ 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 a1e0171c1de..f22900f1507 100644 --- a/extensions-core/protobuf-extensions/pom.xml +++ b/extensions-core/protobuf-extensions/pom.xml @@ -67,13 +67,45 @@ 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 167557582b7..f9e04319d5f 100644 --- a/extensions-core/s3-extensions/pom.xml +++ b/extensions-core/s3-extensions/pom.xml @@ -58,6 +58,61 @@ ${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 + @@ -66,6 +121,12 @@ ${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 93e68c696e6..176b0091cf8 100644 --- a/extensions-core/simple-client-sslcontext/pom.xml +++ b/extensions-core/simple-client-sslcontext/pom.xml @@ -47,5 +47,25 @@ ${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 d830e5e8700..b07ffafd82f 100644 --- a/extensions-core/stats/pom.xml +++ b/extensions-core/stats/pom.xml @@ -34,6 +34,18 @@ + + org.apache.druid + druid-core + ${project.parent.version} + provided + + + org.apache.druid + druid-server + ${project.parent.version} + provided + org.apache.druid druid-processing @@ -50,6 +62,41 @@ 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 296c79ae662..6b04e46c326 100644 --- a/hll/pom.xml +++ b/hll/pom.xml @@ -45,8 +45,16 @@ ${project.parent.version} - commons-codec - commons-codec + com.google.code.findbugs + jsr305 + + + com.fasterxml.jackson.core + jackson-annotations + + + com.google.guava + guava diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 3a3f5ff9f40..d17a0735b09 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -37,7 +37,16 @@ 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 @@ -71,10 +80,6 @@ com.fasterxml.jackson.core jackson-databind - - org.jdbi - jdbi - com.google.code.findbugs jsr305 @@ -95,6 +100,31 @@ + + 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 + @@ -168,6 +198,11 @@ derbyclient test + + org.hamcrest + hamcrest-core + test + diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 771b493b7d8..e0f28c7aa7d 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -47,6 +47,149 @@ 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 + @@ -90,6 +233,11 @@ 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 c158c0e33a5..03d1397e379 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,7 +19,6 @@ 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; @@ -43,6 +42,7 @@ import org.junit.rules.TemporaryFolder; 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 class IntermediaryDataManagerAutoCleanupTest private File generateSegmentFile() throws IOException { final File segmentFile = tempDir.newFile(); - FileUtils.write(segmentFile, "test data.", StringUtils.UTF8); + FileUtils.write(segmentFile, "test data.", StandardCharsets.UTF_8); 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 7bd9e906a96..45055ca42d2 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,7 +19,6 @@ 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; @@ -41,6 +40,7 @@ import org.junit.rules.TemporaryFolder; 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 class IntermediaryDataManagerManualAddAndDeleteTest private File generateSegmentFile() throws IOException { final File segmentFile = tempDir.newFile(); - FileUtils.write(segmentFile, "test data.", StringUtils.UTF8); + FileUtils.write(segmentFile, "test data.", StandardCharsets.UTF_8); return segmentFile; } diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index d9fd2450805..0cae657003b 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -45,21 +45,46 @@ 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 @@ -81,6 +106,7 @@ org.apache.druid.extensions druid-lookups-cached-global ${project.parent.version} + runtime org.apache.druid.extensions @@ -91,23 +117,83 @@ 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 - 1.10.0 + test org.apache.calcite.avatica - avatica-server - 1.10.0 + avatica-core + test 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 dd2945887b5..77949083980 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.testing.utils.SqlTestQueryHelper; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.TimelineObjectHolder; import org.apache.druid.timeline.VersionedIntervalTimeline; -import org.junit.Assert; +import org.testng.Assert; import java.io.IOException; import java.io.InputStream; @@ -135,7 +135,7 @@ public class AbstractITBatchIndexTest extends AbstractIndexerTest fullReindexDatasourceName, "2013-08-31T00:00:00.000Z/2013-09-10T00:00:00.000Z" ); - Assert.assertFalse("dimensions : " + dimensions, dimensions.contains("robot")); + Assert.assertFalse(dimensions.contains("robot"), "dimensions : " + dimensions); } catch (Exception e) { LOG.error(e, "Error while testing"); @@ -183,10 +183,12 @@ public class AbstractITBatchIndexTest extends AbstractIndexerTest 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 a38b78a97fc..2e16f5f99ba 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -488,22 +488,31 @@ 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 @@ -1358,6 +1367,16 @@ 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 @@ -2006,7 +2025,7 @@ name: Jersey license_category: binary module: extensions/druid-avro-extensions license_name: CDDL 1.1 -version: 1.15 +version: 1.19.3 copyright: Oracle and/or its affiliates. license_file_path: licenses/bin/jersey.CDDL11 libraries: diff --git a/pom.xml b/pom.xml index 1a802c9f5e1..58ef424998d 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,9 @@ 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 @@ -212,6 +214,16 @@ 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 @@ -311,16 +323,31 @@ 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 @@ -431,6 +458,12 @@ javax.el-api 3.0.0 + + javax.servlet + servlet-api + 2.5 + provided + javax.xml.bind jaxb-api @@ -441,16 +474,31 @@ 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 @@ -471,11 +519,31 @@ 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 @@ -516,6 +584,26 @@ 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 @@ -619,7 +707,12 @@ org.eclipse.aether aether-api - 0.9.0.M2 + ${aether.version} + + + org.eclipse.aether + aether-util + ${aether.version} org.apache.httpcomponents @@ -631,6 +724,11 @@ httpcore 4.4.4 + + org.apache.hadoop + hadoop-auth + ${hadoop.compile.version} + org.apache.hadoop hadoop-client @@ -649,6 +747,12 @@ ${hadoop.compile.version} provided + + org.apache.hadoop + hadoop-hdfs-client + ${hadoop.compile.version} + provided + org.apache.hadoop hadoop-mapreduce-client-core @@ -661,20 +765,31 @@ + + 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 - 10.11.1.1 + ${derby.version} org.apache.derby derbyclient - 10.11.1.1 + ${derby.version} org.apache.commons @@ -782,6 +897,28 @@ 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 @@ -802,6 +939,12 @@ 4.12 test + + org.powermock + powermock-core + ${powermock.version} + test + org.powermock powermock-module-junit4 @@ -902,6 +1045,11 @@ + + com.google.http-client + google-http-client + ${com.google.apis.client.version} + com.google.http-client google-http-client-jackson2 @@ -941,7 +1089,13 @@ org.hamcrest hamcrest-all - 1.3 + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-core + ${hamcrest.version} test @@ -1263,7 +1417,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.8 + 3.1.1 org.apache.maven.plugins diff --git a/processing/pom.xml b/processing/pom.xml index 53c1d23f3ed..b2b6f9faf4f 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -59,6 +59,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 + org.roaringbitmap RoaringBitmap @@ -95,10 +107,6 @@ org.lz4 lz4-java - - org.mapdb - mapdb - commons-lang commons-lang @@ -120,7 +128,30 @@ 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 + @@ -166,6 +197,11 @@ guava-testlib test + + org.hamcrest + hamcrest-core + test + diff --git a/server/pom.xml b/server/pom.xml index 2bcd4434822..e62bc2b9540 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -37,50 +37,25 @@ druid-processing ${project.parent.version} - - org.apache.druid - druid-aws-common - ${project.parent.version} - - - org.apache.druid - 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 + org.apache.druid + druid-hll + ${project.parent.version} + javax.inject javax.inject - - org.glassfish - javax.el - org.apache.zookeeper zookeeper - - org.apache.httpcomponents - httpclient - org.apache.curator curator-framework @@ -116,6 +91,10 @@ com.sun.jersey jersey-core + + com.google.inject.extensions + guice-multibindings + com.google.inject.extensions guice-servlet @@ -144,10 +123,6 @@ io.tesla.aether tesla-aether - - org.eclipse.aether - aether-api - net.spy spymemcached @@ -164,19 +139,10 @@ 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 @@ -189,6 +155,134 @@ 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 + @@ -199,7 +293,11 @@ org.hamcrest hamcrest-all - 1.3 + test + + + org.hamcrest + hamcrest-core test @@ -266,6 +364,31 @@ 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 + @@ -281,6 +404,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + io.tesla.aether:tesla-aether + + + diff --git a/services/pom.xml b/services/pom.xml index b0c43436500..c273d82b75e 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -38,6 +38,11 @@ druid-core ${project.parent.version} + + org.apache.druid + druid-processing + ${project.parent.version} + org.apache.druid druid-server @@ -62,6 +67,90 @@ 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 + @@ -69,6 +158,16 @@ 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 27f5509570e..97d77ef4562 100644 --- a/services/src/main/java/org/apache/druid/cli/ExportMetadata.java +++ b/services/src/main/java/org/apache/druid/cli/ExportMetadata.java @@ -21,7 +21,6 @@ package org.apache.druid.cli; 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; @@ -53,6 +52,7 @@ import java.io.FileOutputStream; 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 @@ public class ExportMetadata extends GuiceRunnable String outFile = StringUtils.format("%s/%s.csv", outputPath, datasourceTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) ) { String line; while ((line = reader.readLine()) != null) { @@ -294,9 +294,9 @@ public class ExportMetadata extends GuiceRunnable String outFile = StringUtils.format("%s/%s.csv", outputPath, rulesTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) ) { String line; while ((line = reader.readLine()) != null) { @@ -325,9 +325,9 @@ public class ExportMetadata extends GuiceRunnable String outFile = StringUtils.format("%s/%s.csv", outputPath, configTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) ) { String line; while ((line = reader.readLine()) != null) { @@ -354,9 +354,9 @@ public class ExportMetadata extends GuiceRunnable String outFile = StringUtils.format("%s/%s.csv", outputPath, supervisorTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) ) { String line; while ((line = reader.readLine()) != null) { @@ -386,9 +386,9 @@ public class ExportMetadata extends GuiceRunnable String outFile = StringUtils.format("%s/%s.csv", outputPath, segmentsTableName); try ( BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8) + new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8) ); - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8); + OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outFile), StandardCharsets.UTF_8) ) { String line; while ((line = reader.readLine()) != null) { diff --git a/sql/pom.xml b/sql/pom.xml index 7193f620b30..1acade9e5f7 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -33,6 +33,21 @@ + + 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 @@ -72,9 +87,74 @@ + + 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-all + 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 @@ -115,6 +195,11 @@ 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 2116fbb38d6..3c71b99ef85 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,7 +19,6 @@ 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; @@ -31,6 +30,7 @@ import com.google.common.collect.Iterables; 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;