From e7ec073d7562fff9da6bb7472810920ba19af6c1 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Wed, 31 Oct 2012 16:10:07 -0700 Subject: [PATCH] Cleaned Maven dependency configuration. In particular the 'mvn dependency:analyze' report no longer warns of used but undeclared dependencies. --- client/pom.xml | 188 +++++++++++++++++++-------------- common/pom.xml | 115 ++++++++++----------- examples/rand/pom.xml | 163 ++++++++++++++--------------- examples/twitter/pom.xml | 192 +++++++++++++++++----------------- index-common/pom.xml | 30 +++++- indexer/pom.xml | 47 ++++++++- merger/pom.xml | 118 ++++++++++++++++++++- pom.xml | 218 +++++++++++++++++++++++++++++++++++++++ realtime/pom.xml | 93 ++++++++++++++--- server/pom.xml | 167 +++++++++++++++++++----------- 10 files changed, 921 insertions(+), 410 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index f5b3ffaef08..333b98689c1 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-client @@ -45,112 +46,141 @@ com.metamx - http-client - 0.6.1 + emitter com.metamx - emitter - 0.0.7 - - - - org.mortbay.jetty - jetty - 6.1.26 + http-client - com.google.inject - guice - 3.0 - - - com.google.guava - guava - 11.0.1 - - - com.sun.jersey - jersey-server - 1.9.1 - - - com.sun.jersey - jersey-core - 1.9.1 - - - com.sun.jersey.contribs - jersey-guice - 1.9.1 - - - com.google.inject.extensions - guice-servlet - 3.0 - - - org.codehaus.jackson - jackson-jaxrs - 1.9.9 - - - org.codehaus.jackson - jackson-smile - 1.9.9 - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-log4j12 - 1.6.2 - - - com.github.sgroschupf - zkclient - 0.1 - - - commons-codec - commons-codec - 1.3 - - - org.skife.config - config-magic - 0.9 + com.metamx + java-util com.metamx server-metrics - 0.0.2 + com.davekoelle alphanum - 1.0.3 + + + commons-codec + commons-codec + + + org.skife.config + config-magic + + + com.netflix.curator + curator-client + + + com.netflix.curator + curator-framework + + + com.netflix.curator + curator-x-discovery + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + 6.1.26 + + + com.google.guava + guava + + + com.google.inject + guice com.ibm.icu icu4j - 4.8.1 + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + javax.inject + javax.inject + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-core + + + com.sun.jersey.contribs + jersey-guice + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.google.inject.extensions + guice-servlet + + + log4j + log4j + + + org.jboss.netty + netty + 3.2.4.Final + + + org.mortbay.jetty + servlet-api + + + org.slf4j + slf4j-log4j12 + + + com.github.sgroschupf + zkclient junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/common/pom.xml b/common/pom.xml index 801d005fabc..5539f1298be 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-common @@ -31,66 +32,15 @@ 0.1.0-SNAPSHOT - - 0.16.0 - - com.metamx java-util - ${metamx.java-util.version} - - - joda-time - joda-time - 1.6 - - - com.google.guava - guava - 11.0.1 - - - log4j - log4j - 1.2.16 - - - commons-codec - commons-codec - 1.3 - org.codehaus.jackson - jackson-core-asl - 1.9.9 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.9 - - - it.uniroma3.mat - extendedset - 1.3.2 - - - mysql - mysql-connector-java - 5.1.18 - - - org.jdbi - jdbi - 2.32 - - - commons-pool - commons-pool - 1.6 + commons-codec + commons-codec commons-dbcp @@ -98,38 +48,79 @@ 1.4 - org.mozilla - rhino - 1.7R4 + commons-pool + commons-pool + 1.6 + + + org.skife.config + config-magic com.netflix.curator curator-recipes - 1.2.2 com.netflix.curator curator-x-discovery - 1.2.2 + + + it.uniroma3.mat + extendedset + + + com.google.guava + guava + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.jdbi + jdbi + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + log4j + log4j + + + mysql + mysql-connector-java + 5.1.18 + + + org.mozilla + rhino + 1.7R4 junit junit - 4.8.1 test org.easymock easymock - 3.0 test com.metamx java-util - ${metamx.java-util.version} test-jar test diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 379204d38b7..1eae59a2ced 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.metamx.druid druid-examples-rand @@ -31,117 +32,111 @@ com.metamx - http-client - 0.6.1 + emitter com.metamx - emitter - 0.0.7 - - - - org.mortbay.jetty - jetty - 6.1.26 + http-client - joda-time - joda-time - 2.1 - - - com.google.inject - guice - 3.0 - - - com.google.guava - guava - 11.0.1 - - - com.sun.jersey - jersey-server - 1.9.1 - - - com.sun.jersey - jersey-core - 1.9.1 - - - com.sun.jersey.contribs - jersey-guice - 1.9.1 - - - com.google.inject.extensions - guice-servlet - 3.0 - - - org.codehaus.jackson - jackson-jaxrs - 1.9.9 - - - org.codehaus.jackson - jackson-smile - 1.9.9 - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-log4j12 - 1.6.2 - - - com.github.sgroschupf - zkclient - 0.1 - - - commons-codec - commons-codec - 1.3 - - - org.skife.config - config-magic - 0.9 + com.metamx + java-util com.metamx server-metrics - 0.0.2 + com.davekoelle alphanum - 1.0.3 + + + commons-codec + commons-codec + + + org.skife.config + config-magic + + + com.google.guava + guava + + + com.google.inject + guice + + + com.google.inject.extensions + guice-servlet com.ibm.icu icu4j - 4.8.1 + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + org.jdbi + jdbi + + + com.sun.jersey + jersey-core + + + com.sun.jersey.contribs + jersey-guice + + + com.sun.jersey + jersey-server + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + com.github.sgroschupf + zkclient junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index a0e930229c4..d6d7cb89f91 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.metamx.druid druid-examples-twitter @@ -31,20 +32,102 @@ com.metamx - http-client - 0.6.1 + emitter com.metamx - emitter - 0.0.7 + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics - - org.twitter4j - twitter4j-core - 2.2.6 - + + com.davekoelle + alphanum + + + commons-codec + commons-codec + + + org.skife.config + config-magic + + + com.google.guava + guava + + + com.google.inject + guice + + + com.google.inject.extensions + guice-servlet + + + com.ibm.icu + icu4j + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + org.jdbi + jdbi + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-core + + + com.sun.jersey.contribs + jersey-guice + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.twitter4j + twitter4j-core + 2.2.6 + org.twitter4j twitter4j-async @@ -55,109 +138,20 @@ twitter4j-stream 2.2.6 - - - org.mortbay.jetty - jetty - 6.1.26 - - - joda-time - joda-time - 2.1 - - - com.google.inject - guice - 3.0 - - - com.google.guava - guava - 11.0.1 - - - com.sun.jersey - jersey-server - 1.9.1 - - - com.sun.jersey - jersey-core - 1.9.1 - - - com.sun.jersey.contribs - jersey-guice - 1.9.1 - - - com.google.inject.extensions - guice-servlet - 3.0 - - - org.codehaus.jackson - jackson-jaxrs - 1.9.9 - - - org.codehaus.jackson - jackson-smile - 1.9.9 - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-log4j12 - 1.6.2 - com.github.sgroschupf zkclient - 0.1 - - - commons-codec - commons-codec - 1.3 - - - org.skife.config - config-magic - 0.9 - - - com.metamx - server-metrics - 0.0.2 - - - com.davekoelle - alphanum - 1.0.3 - - - com.ibm.icu - icu4j - 4.8.1 junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/index-common/pom.xml b/index-common/pom.xml index 651248848be..c204ac4b2a7 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -38,23 +38,45 @@ druid-common ${project.parent.version} + + + com.metamx + java-util + + com.ning compress-lzf - 0.8.4 + + + it.uniroma3.mat + extendedset + + + org.codehaus.jackson + jackson-core-asl net.java.dev.jets3t jets3t - 0.8.1 - + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.google.guava + guava + junit junit - 4.8.1 test diff --git a/indexer/pom.xml b/indexer/pom.xml index 1b45e48d946..c70c9fcf041 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-indexer @@ -44,10 +45,10 @@ - org.apache.hadoop - hadoop-core - 0.20.2 + com.metamx + java-util + com.amazonaws aws-java-sdk @@ -59,12 +60,48 @@ + + commons-io + commons-io + + + com.google.guava + guava + + + org.apache.hadoop + hadoop-core + 0.20.2 + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.jdbi + jdbi + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.github.sgroschupf + zkclient + junit junit - 4.8.1 test diff --git a/merger/pom.xml b/merger/pom.xml index 6b84d6a239a..e5fc6f99f69 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-merger @@ -32,6 +33,11 @@ + + com.metamx.druid + druid-common + ${project.parent.version} + com.metamx.druid druid-server @@ -42,6 +48,11 @@ druid-client ${project.parent.version} + + com.metamx.druid + druid-index-common + ${project.parent.version} + com.metamx.druid druid-indexer @@ -53,17 +64,118 @@ ${project.parent.version} + + com.metamx + emitter + + + com.metamx + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics + + + + commons-codec + commons-codec + + + commons-io + commons-io + + + org.skife.config + config-magic + + + com.netflix.curator + curator-framework + + + com.netflix.curator + curator-recipes + + + com.google.guava + guava + + + com.google.inject + guice + + + com.google.inject.extensions + guice-servlet + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + javax.inject + javax.inject + + + org.jdbi + jdbi + + + com.sun.jersey + jersey-core + + + com.sun.jersey.contribs + jersey-guice + + + net.java.dev.jets3t + jets3t + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.github.sgroschupf + zkclient + + + org.apache.zookeeper + zookeeper + 3.4.3 + + junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/pom.xml b/pom.xml index 957687dcaee..35ecc263c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,224 @@ examples + + + + + com.metamx + emitter + 0.0.7 + + + com.metamx + http-client + 0.6.1 + + + com.metamx + java-util + 0.16.0 + + + com.metamx + server-metrics + 0.0.2 + + + + com.davekoelle + alphanum + 1.0.3 + + + commons-codec + commons-codec + 1.3 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-io + commons-io + 2.0.1 + + + commons-logging + commons-logging + 1.1.1 + + + com.ning + compress-lzf + 0.8.4 + + + org.skife.config + config-magic + 0.9 + + + com.netflix.curator + curator-client + 1.2.2 + + + com.netflix.curator + curator-framework + 1.2.2 + + + com.netflix.curator + curator-recipes + 1.2.2 + + + com.netflix.curator + curator-x-discovery + 1.2.2 + + + it.uniroma3.mat + extendedset + 1.3.2 + + + com.google.guava + guava + 11.0.1 + + + com.google.inject + guice + 3.0 + + + com.google.inject.extensions + guice-servlet + 3.0 + + + com.ibm.icu + icu4j + 4.8.1 + + + org.codehaus.jackson + jackson-core-asl + 1.9.9 + + + org.codehaus.jackson + jackson-jaxrs + 1.9.9 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.9 + + + org.codehaus.jackson + jackson-smile + 1.9.9 + + + javax.inject + javax.inject + 1 + + + com.jamesmurty.utils + java-xmlbuilder + 0.4 + + + org.jdbi + jdbi + 2.32 + + + com.sun.jersey + jersey-core + 1.9.1 + + + com.sun.jersey.contribs + jersey-guice + 1.9.1 + + + com.sun.jersey + jersey-server + 1.9.1 + + + net.java.dev.jets3t + jets3t + 0.8.1 + + + org.mortbay.jetty + jetty + 6.1.26 + + + joda-time + joda-time + 2.1 + + + com.google.code.findbugs + jsr305 + 2.0.1 + + + log4j + log4j + 1.2.16 + + + org.mortbay.jetty + servlet-api + 2.5-20081211 + + + org.slf4j + slf4j-log4j12 + 1.6.2 + + + com.github.sgroschupf + zkclient + 0.1 + + + + + com.metamx + java-util + test-jar + test + 0.16.0 + + + + org.easymock + easymock + 3.0 + test + + + junit + junit + 4.8.1 + test + + + diff --git a/realtime/pom.xml b/realtime/pom.xml index 874a8f12d92..0356a4a04f6 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-realtime @@ -46,15 +47,72 @@ druid-client ${project.parent.version} + - org.scala-lang - scala-library - ${scala.version} + com.metamx + emitter - org.scala-lang - scala-compiler - ${scala.version} + com.metamx + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics + + + + org.apache.directory.studio + org.apache.commons.collections + 3.2.1 + + + commons-io + commons-io + + + org.skife.config + config-magic + + + com.google.guava + guava + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + org.jdbi + jdbi + + + net.java.dev.jets3t + jets3t + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 kafka @@ -68,9 +126,18 @@ - org.apache.directory.studio - org.apache.commons.collections - 3.2.1 + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang + scala-compiler + ${scala.version} + + + com.github.sgroschupf + zkclient @@ -84,25 +151,21 @@ commons-codec commons-codec - 1.3 true commons-logging commons-logging - 1.1.1 true commons-httpclient commons-httpclient - 3.1 true com.jamesmurty.utils java-xmlbuilder - 0.4 true @@ -111,13 +174,11 @@ junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/server/pom.xml b/server/pom.xml index 050be3a21de..18125b45cf5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-server @@ -44,9 +45,26 @@ - org.mortbay.jetty - jetty - 6.1.26 + com.metamx + emitter + + + com.metamx + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics + + + + commons-cli + commons-cli + 1.2 commons-lang @@ -56,92 +74,127 @@ commons-io commons-io - 2.0.1 - - - com.google.inject - guice - 3.0 - - - com.google.guava - guava - 11.0.1 - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-log4j12 - 1.6.2 - - - commons-cli - commons-cli - 1.2 - - - com.github.sgroschupf - zkclient - 0.1 com.ning compress-lzf - 0.8.4 - com.sun.jersey - jersey-server - 1.9.1 + org.skife.config + config-magic - com.sun.jersey - jersey-core - 1.9.1 + com.netflix.curator + curator-framework - com.sun.jersey.contribs - jersey-guice - 1.9.1 + com.netflix.curator + curator-x-discovery + + + it.uniroma3.mat + extendedset + + + com.google.guava + guava + + + com.google.inject + guice com.google.inject.extensions guice-servlet - 3.0 + + + org.codehaus.jackson + jackson-core-asl org.codehaus.jackson jackson-jaxrs - 1.9.6 + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + javax.inject + javax.inject + + + org.jdbi + jdbi + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-core + + + com.sun.jersey.contribs + jersey-guice + + + net.java.dev.jets3t + jets3t + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + log4j + log4j + + + org.mortbay.jetty + servlet-api + + + org.slf4j + slf4j-log4j12 + + + com.github.sgroschupf + zkclient commons-codec commons-codec - 1.3 true commons-logging commons-logging - 1.1.1 true commons-httpclient commons-httpclient - 3.1 true com.jamesmurty.utils java-xmlbuilder - 0.4 true @@ -150,21 +203,19 @@ junit junit - 4.8.1 test org.easymock easymock - 3.0 test - com.metamx.druid - druid-client - ${project.parent.version} - test-jar - test + com.metamx.druid + druid-client + ${project.parent.version} + test-jar + test