diff --git a/.travis.yml b/.travis.yml index 42cb9e968ce1..d93f928ad0aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,28 @@ jobs: MAVEN_OPTS='-Xmx3000m' ${MVN} clean -Pstrict compile test-compile --fail-at-end -pl '!benchmarks' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} + - name: "analyze dependencies" + script: MAVEN_OPTS='-Xmx3000m' ${MVN} ${MAVEN_SKIP} dependency:analyze -DoutputXML=true -DignoreNonCompile=true -DfailOnWarning=true + after_failure: |- + echo "FAILURE EXPLANATION: + + 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. The dependencies to remove are shown above. + + 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 + " + - &package name: "(openjdk8) packaging check" install: skip diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 9285d25f65fa..521c197957ad 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -62,32 +62,24 @@ ${project.parent.version} - org.apache.druid.extensions - druid-datasketches + org.apache.druid + druid-core ${project.parent.version} org.apache.druid.extensions druid-datasketches ${project.parent.version} - test-jar - org.apache.druid.extensions - druid-histogram + org.apache.druid + extendedset ${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 @@ -113,9 +105,48 @@ 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 + + + com.yahoo.datasketches + sketches-core junit diff --git a/cloud/aws-common/pom.xml b/cloud/aws-common/pom.xml index f1c47cd15595..1adbb88da0c7 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 053cbab15bbb..9999e6d19fc0 100644 --- a/cloud/gcp-common/pom.xml +++ b/cloud/gcp-common/pom.xml @@ -50,6 +50,24 @@ com.fasterxml.jackson.module jackson-module-guice + runtime + + + 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 7925b3b1a722..2f0b2bcfd7fc 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 a06b082189ea..2fb1c11bb464 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,22 @@ org.hibernate hibernate-validator + runtime javax.el javax.el-api + runtime + + + org.glassfish + javax.el + runtime javax.xml.bind jaxb-api + runtime com.google.guava @@ -101,14 +96,17 @@ com.fasterxml.jackson.datatype jackson-datatype-guava + runtime com.fasterxml.jackson.datatype jackson-datatype-joda + runtime com.fasterxml.jackson.dataformat jackson-dataformat-smile + runtime com.google.inject @@ -129,6 +127,7 @@ org.apache.logging.log4j log4j-api + runtime org.apache.logging.log4j @@ -137,14 +136,17 @@ org.apache.logging.log4j log4j-slf4j-impl + runtime org.apache.logging.log4j log4j-jul + runtime org.apache.logging.log4j log4j-1.2-api + runtime org.slf4j @@ -153,15 +155,12 @@ org.slf4j jcl-over-slf4j + runtime io.airlift airline - - io.dropwizard.metrics - metrics-core - net.thisptr jackson-jq @@ -170,6 +169,18 @@ it.unimi.dsi fastutil + + io.netty + netty-buffer + + + io.netty + netty-common + + + io.netty + netty-codec-http + com.opencsv @@ -183,10 +194,12 @@ org.tukaani xz + runtime com.github.luben zstd-jni + runtime com.jayway.jsonpath @@ -204,6 +217,7 @@ com.lmax disruptor + runtime @@ -268,6 +282,11 @@ hamcrest-all test + + org.hamcrest + hamcrest-core + test + org.slf4j slf4j-simple @@ -284,6 +303,11 @@ jetty-servlet test + + org.eclipse.jetty + jetty-util + test + com.google.errorprone error_prone_annotations diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml index 856ecfb8a25f..4f34293f8543 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 d0b15c4d59c7..78360bd3c398 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 5dde6547574b..f92c108c1fc8 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 8dfbc85ae1bb..19d91fc4bfa6 100644 --- a/extensions-contrib/cloudfiles-extensions/pom.xml +++ b/extensions-contrib/cloudfiles-extensions/pom.xml @@ -63,17 +63,50 @@ com.google.inject.extensions - guice-servlet + guice-multibindings ${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 a4f20481e059..7410399b9d7a 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 5ebc544d8846..2791d5b77e9c 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 09ff650fcbab..303cdb93f5a4 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,15 +84,13 @@ test - org.mockito - mockito-core - 2.2.10 + org.hamcrest + hamcrest-all test org.hamcrest - hamcrest-all - 1.3 + hamcrest-core test @@ -75,12 +98,6 @@ JUnitParams test - - org.apache.druid - druid-processing - ${project.parent.version} - test - diff --git a/extensions-contrib/influxdb-emitter/pom.xml b/extensions-contrib/influxdb-emitter/pom.xml index 5bbde2eee6dd..bef6a9cf3203 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 @@ -58,16 +93,5 @@ JUnitParams 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 8d09e6f8cf23..2538a99bcd57 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 @@ -75,5 +106,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 fffffb0820fb..d5178731946f 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 @@ -75,6 +129,11 @@ hamcrest-all 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 95577f44ed87..79a9d62d077f 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 @@ -80,4 +143,4 @@ test - \ No newline at end of file + diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml index 4e0a260d3ded..b1003ef22e3b 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 80e9b6bc8544..79ee2e2de00e 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 51ca058de377..a7b44be63021 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 dcfd587bd8f1..6a07460e1575 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 926ebc2b927a..b7ddf11aef4e 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 9c19af4195fd..f1a7b6cafb9d 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 8b275f5e919f..2ab189d4551d 100644 --- a/extensions-contrib/tdigestsketch/pom.xml +++ b/extensions-contrib/tdigestsketch/pom.xml @@ -108,6 +108,11 @@ jackson-core provided + + com.fasterxml.jackson.core + jackson-annotations + provided + com.google.errorprone error_prone_annotations diff --git a/extensions-contrib/thrift-extensions/pom.xml b/extensions-contrib/thrift-extensions/pom.xml index 7ac6e054e9a7..efe66fa8be96 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 @@ -90,6 +96,39 @@ com.twitter.elephantbird elephant-bird-hadoop-compat ${elephantbird.version} + runtime + + + 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 +141,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 5e14d0f14ae5..8383136ed6c8 100644 --- a/extensions-contrib/time-min-max/pom.xml +++ b/extensions-contrib/time-min-max/pom.xml @@ -46,6 +46,41 @@ ${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 + junit junit diff --git a/extensions-contrib/virtual-columns/pom.xml b/extensions-contrib/virtual-columns/pom.xml index a61ecf9bcd8f..adce96f0ef0b 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 4f701caef1ca..af40540e7b3e 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -37,7 +37,6 @@ 0.1.3 3.0.1 - 1.9.0 @@ -51,7 +50,6 @@ org.apache.avro avro - ${avro.version} org.slf4j @@ -111,6 +109,12 @@ druid-core ${project.parent.version} provided + + + org.slf4j + slf4j-api + + org.schemarepo @@ -172,6 +176,79 @@ org.apache.hadoop hadoop-client + + com.google.code.findbugs + jsr305 + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + org.apache.hadoop + hadoop-mapreduce-client-core + provided + + + org.slf4j + slf4j-api + + + + + org.apache.hadoop + hadoop-common + provided + + + org.slf4j + slf4j-api + + + + + 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 + + + org.slf4j + slf4j-api + + + + + 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 151b55442020..74ec78ace76c 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -35,7 +35,6 @@ - 0.13.4 0.12.2 @@ -43,7 +42,6 @@ com.yahoo.datasketches sketches-core - ${datasketches.core.version} com.google.code.findbugs @@ -56,6 +54,11 @@ memory ${datasketches.memory.version} + + org.apache.calcite + calcite-core + provided + org.apache.commons commons-math3 @@ -66,6 +69,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-server + ${project.parent.version} + provided + org.apache.druid druid-processing @@ -78,53 +87,70 @@ ${project.parent.version} provided + + com.google.code.findbugs + jsr305 + provided + + + com.google.guava + guava + provided + + + com.google.inject + guice + provided + + + commons-codec + commons-codec + provided + + + 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 4681fb820a4e..e2835e315997 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 6cfeea1271a9..250ef1531930 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 8a449d059d98..18ca289b37ac 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 @@ -161,6 +167,10 @@ com.sun.jersey jersey-core + + com.sun.jersey + jersey-server + org.apache.curator curator-client @@ -223,6 +233,101 @@ + + 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 + provided + + + com.google.guava + guava + provided + + + org.eclipse.jetty + jetty-http + provided + + + org.eclipse.jetty + jetty-client + provided + + + org.apache.hadoop + hadoop-auth + + + com.nimbusds + nimbus-jose-jwt + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-logging + commons-logging + + + log4j + log4j + + + net.minidev + json-smart + + + org.apache.curator + curator-framework + + + org.apache.httpcomponents + httpclient + + + org.apache.zookeeper + zookeeper + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + diff --git a/extensions-core/ec2-extensions/pom.xml b/extensions-core/ec2-extensions/pom.xml index f16a8b5c6aed..470b3aa4b4c4 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 123c73109c6c..ad5444eda98f 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 9fee70cdbc9f..43fff883c0b9 100644 --- a/extensions-core/hdfs-storage/pom.xml +++ b/extensions-core/hdfs-storage/pom.xml @@ -43,7 +43,7 @@ org.apache.hadoop hadoop-client - compile + runtime commons-cli @@ -286,6 +286,108 @@ 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 + compile + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.google.inject.extensions + guice-servlet + + + com.google.protobuf + protobuf-java + + + io.netty + netty + + + log4j + log4j + + + org.apache.avro + avro + + + org.apache.hadoop + hadoop-annotations + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + + + com.google.inject + guice + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + + + org.apache.hadoop + hadoop-hdfs-client + runtime + + + com.fasterxml.jackson.core + jackson-core + provided + + + com.google.inject.extensions + guice-multibindings + provided + + + commons-lang + commons-lang + provided + + + com.google.guava + guava + provided + + + javax.validation + validation-api + provided + @@ -306,13 +408,13 @@ ${project.parent.version} test - - org.apache.druid - druid-processing - ${project.parent.version} - test-jar - test - + + org.apache.druid + druid-processing + ${project.parent.version} + test-jar + test + org.apache.hadoop hadoop-hdfs @@ -332,6 +434,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 c38e753915fb..50acf7e5f262 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 2867d127dadc..8af045bf7c87 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -76,6 +76,51 @@ + + 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.google.guava + guava + provided + + + javax.validation + validation-api + provided + + + javax.ws.rs + jsr311-api + provided + @@ -117,6 +162,11 @@ + + org.powermock + powermock-core + test + org.powermock powermock-module-junit4 @@ -127,5 +177,11 @@ powermock-api-easymock test + + org.scala-lang + scala-library + 2.12.7 + test + diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml index 964a6e992d14..602f4b32a1c1 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 d1a4335c1311..c5ca5e4e5f60 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 e4d7bf5dd281..c151e36e10e8 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 465e5cb616c0..6d0bc5b8b116 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 b9934ac39f74..0525720e6588 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 97c62b037e1d..e6a466f8a927 100644 --- a/extensions-core/orc-extensions/pom.xml +++ b/extensions-core/orc-extensions/pom.xml @@ -71,7 +71,6 @@ com.google.protobuf protobuf-java - com.sun.jersey jersey-core @@ -134,6 +133,97 @@ + + org.apache.orc + orc-core + ${orc.version} + + + com.google.protobuf + protobuf-java + + + commons-lang + commons-lang + + + javax.xml.bind + jaxb-api + + + org.apache.hadoop + hadoop-hdfs + + + org.slf4j + slf4j-api + + + + + 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 + + + commons-lang + commons-lang + + + org.slf4j + slf4j-api + + + junit junit diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml index 3b4ae1b86a69..e0979d7e73cc 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,23 @@ - org.xerial.snappy - snappy-java - ${snappy.version} + org.apache.parquet + parquet-hadoop + ${parquet.version} + + + commons-pool + commons-pool + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.druid @@ -117,6 +142,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 525d8bb60c7c..e879bcc9271c 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 a1e0171c1def..f22900f1507f 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 167557582b74..f9e04319d5f3 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 93e68c696e6c..176b0091cf8f 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 d830e5e87000..b07ffafd82f3 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 296c79ae6624..6b04e46c326a 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 8d0db3c0bbb2..11b4b2613224 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 @@ -84,6 +89,36 @@ hadoop-common provided + + org.apache.hadoop + hadoop-mapreduce-client-core + provided + + + 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 + @@ -157,6 +192,11 @@ derbyclient test + + org.hamcrest + hamcrest-core + test + diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 71e67c6f4364..175d2da02bb7 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -52,6 +52,153 @@ 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 + + + it.unimi.dsi + fastutil + @@ -90,6 +237,11 @@ test-jar test + + org.hamcrest + hamcrest-core + test + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 5450284a5790..1820bafc29e9 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 200c1e8966d3..c846f2747ace 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 @@ -35,7 +35,7 @@ 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; @@ -166,7 +166,7 @@ void doReindexTest( 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"); @@ -215,10 +215,12 @@ private void submitTaskAndWait(String taskSpec, String dataSourceName, boolean w final boolean perfectRollup = !taskSpec.contains("dynamic"); final long newSubTasks = countCompleteSubTasks(dataSourceName, perfectRollup) - 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 f223d7fe2bb2..af811e8187b8 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -385,20 +385,6 @@ notices: --- -name: Apache Commons CLI -license_category: binary -module: java-core -license_name: Apache License version 2.0 -version: 1.3.1 -libraries: - - commons-cli: commons-cli -notices: - - commons-cli: | - Apache Commons CLI - Copyright 2001-2015 The Apache Software Foundation - ---- - name: Apache Commons Codec license_category: binary module: java-core @@ -500,20 +486,6 @@ libraries: --- -name: Apache Commons Pool -license_category: binary -module: java-core -license_name: Apache License version 2.0 -version: 1.6 -libraries: - - commons-pool: commons-pool -notices: - - commons-pool: | - Apache Commons Pool - Copyright 2001-2012 The Apache Software Foundation - ---- - name: Apache Commons Collections license_category: binary module: java-core @@ -787,16 +759,6 @@ license_category: binary module: java-core license_name: Apache License version 2.0 version: 4.1.30.Final -libraries: - - io.netty: netty-all - ---- - -name: Netty -license_category: binary -module: java-core -license_name: Apache License version 2.0 -version: 4.1.29.Final libraries: - io.netty: netty-buffer - io.netty: netty-codec @@ -1042,7 +1004,7 @@ name: fastutil license_category: binary module: java-core license_name: Apache License version 2.0 -version: 8.1.0 +version: 8.2.3 libraries: - it.unimi.dsi: fastutil @@ -3185,34 +3147,6 @@ notices: --- -name: snappy-java -license_category: binary -module: extensions/druid-parquet-extensions -license_name: Apache License version 2.0 -version: 1.1.7.2 -libraries: - - org.xerial.snappy: snappy-java -notices: - - snappy-java: | - This product includes software developed by Google - Snappy: http://code.google.com/p/snappy/ (New BSD License) - - This product includes software developed by Apache - PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ - (Apache 2.0 license) - - This library containd statically linked libstdc++. This inclusion is allowed by - "GCC RUntime Library Exception" - http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html - - == Contributors == - * Tatu Saloranta - * Providing benchmark suite - * Alec Wysoker - * Performance and memory usage improvement - ---- - name: Protocol Buffers Dynamic Schema license_category: binary module: extensions/protobuf-extensions @@ -3753,7 +3687,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 095de02b706e..3ad0504b3878 100644 --- a/pom.xml +++ b/pom.xml @@ -75,15 +75,17 @@ 1.8 8 UTF-8 + 0.9.0.M2 4.1.0 2.12.0 1.12.0 + 1.9.0 1.17.0 10.14.2.0 4.0.0 - 8.2.3 16.0.1 4.1.0 + 1.3 9.4.10.v20180503 1.19.3 @@ -105,7 +107,6 @@ 3.4.14 2.5.7 1.22.0 - apache.snapshots Apache Snapshot Repository https://repository.apache.org/snapshots @@ -226,6 +227,16 @@ commons-net 3.6 + + org.apache.commons + commons-lang3 + 3.8.1 + + + com.amazonaws + aws-java-sdk-core + ${aws.sdk.version} + com.amazonaws aws-java-sdk-ec2 @@ -329,16 +340,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 @@ -449,6 +475,12 @@ javax.el-api 3.0.0 + + javax.servlet + servlet-api + 2.5 + provided + javax.xml.bind jaxb-api @@ -459,6 +491,11 @@ javax.el 3.0.0 + + org.glassfish.grizzly + grizzly-http-server + 2.2.16 + org.glassfish.jaxb jaxb-runtime @@ -469,11 +506,21 @@ 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 @@ -494,11 +541,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 @@ -536,7 +603,58 @@ io.netty - netty-all + netty-buffer + ${netty4.version} + + + io.netty + netty-common + ${netty4.version} + + + io.netty + netty-codec-dns + ${netty4.version} + + + io.netty + netty-codec-http + ${netty4.version} + + + io.netty + netty-codec-socks + ${netty4.version} + + + io.netty + netty-handler + ${netty4.version} + + + io.netty + netty-handler-proxy + ${netty4.version} + + + io.netty + netty-resolver + ${netty4.version} + + + io.netty + netty-resolver-dns + ${netty4.version} + + + io.netty + netty-transport-native-epoll + linux-x86_64 + ${netty4.version} + + + io.netty + netty-transport-native-unix-common ${netty4.version} @@ -642,7 +760,12 @@ org.eclipse.aether aether-api - 0.9.0.M2 + ${aether.version} + + + org.eclipse.aether + aether-util + ${aether.version} org.apache.httpcomponents @@ -654,6 +777,11 @@ httpcore 4.4.11 + + org.apache.hadoop + hadoop-auth + ${hadoop.compile.version} + org.apache.hadoop hadoop-client @@ -672,11 +800,40 @@ ${hadoop.compile.version} provided + + org.apache.hadoop + hadoop-hdfs-client + ${hadoop.compile.version} + provided + + + org.apache.hadoop + hadoop-yarn-common + ${hadoop.compile.version} + provided + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.compile.version} + provided + + + javax.servlet + servlet-api + + + org.mapdb mapdb 1.0.8 + + org.apache.derby + derby + ${derby.version} + org.apache.derby derbynet @@ -695,7 +852,7 @@ it.unimi.dsi fastutil - 8.1.0 + 8.2.3 com.opencsv @@ -793,6 +950,31 @@ 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 + ${avro.version} + + + org.apache.directory.api + api-util + 1.0.0-M20 + + + com.yahoo.datasketches + sketches-core + 0.13.4 + org.apache.calcite @@ -813,6 +995,12 @@ 4.12 test + + org.powermock + powermock-core + ${powermock.version} + test + org.powermock powermock-module-junit4 @@ -913,6 +1101,11 @@ + + com.google.http-client + google-http-client + ${com.google.apis.client.version} + com.google.http-client google-http-client-jackson2 @@ -952,7 +1145,13 @@ org.hamcrest hamcrest-all - 1.3 + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-core + ${hamcrest.version} test @@ -1301,7 +1500,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 1fdff9081e02..c8cc68f13c1d 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 @@ -99,10 +111,6 @@ org.lz4 lz4-java - - org.mapdb - mapdb - commons-lang commons-lang @@ -124,7 +132,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 + @@ -170,6 +201,11 @@ guava-testlib test + + org.hamcrest + hamcrest-core + test + diff --git a/server/pom.xml b/server/pom.xml index 873725d62223..b88e648b76e6 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -41,16 +41,19 @@ org.apache.druid druid-aws-common ${project.parent.version} + runtime org.apache.druid druid-gcp-common ${project.parent.version} + runtime org.apache.druid druid-console ${project.parent.version} + runtime org.apache.druid @@ -58,29 +61,19 @@ ${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 +109,10 @@ com.sun.jersey jersey-core + + com.google.inject.extensions + guice-multibindings + com.google.inject.extensions guice-servlet @@ -144,10 +141,6 @@ io.tesla.aether tesla-aether - - org.eclipse.aether - aether-api - net.spy spymemcached @@ -167,7 +160,7 @@ org.apache.derby derby - ${derby.version} + runtime org.apache.derby @@ -176,6 +169,7 @@ org.apache.derby derbyclient + runtime org.apache.commons @@ -189,6 +183,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 +321,11 @@ org.hamcrest hamcrest-all - 1.3 + test + + + org.hamcrest + hamcrest-core test @@ -270,6 +396,26 @@ system-rules 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 + @@ -285,6 +431,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + io.tesla.aether:tesla-aether + + + diff --git a/services/pom.xml b/services/pom.xml index 427fb4d91af4..e26944665d10 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 @@ -65,6 +70,91 @@ org.glassfish.jaxb jaxb-runtime + runtime + + + 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 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 30906860e172..56457c300fa8 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 @@ 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.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), 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 @@ private void rewriteRulesExport( 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 @@ private void rewriteConfigExport( 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 @@ private void rewriteSupervisorExport( 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 @@ private void rewriteSegmentsExport( 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 7193f620b30a..ff2b48518867 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,73 @@ + + 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 + + + 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 +194,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 55a9a7911c86..5ae810f41cc8 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.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;