diff --git a/aws-common/pom.xml b/aws-common/pom.xml index bb761532f44..a78104b34dd 100644 --- a/aws-common/pom.xml +++ b/aws-common/pom.xml @@ -16,63 +16,37 @@ ~ limitations under the License. --> - - 4.0.0 + + 4.0.0 - druid-aws-common - druid-aws-common - druid-aws-common + druid-aws-common + druid-aws-common + druid-aws-common - - io.druid - druid - 0.7.0-SNAPSHOT - + + io.druid + druid + 0.7.0-SNAPSHOT + - - - io.druid - druid-common - ${project.parent.version} - - - com.amazonaws - aws-java-sdk - + + + io.druid + druid-common + ${project.parent.version} + + + com.amazonaws + aws-java-sdk + - - - junit - junit - test - - + + + junit + junit + test + + - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/common/pom.xml b/common/pom.xml index a735acf7ce5..3fa6e44c34f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -16,9 +16,10 @@ ~ limitations under the License. --> - + 4.0.0 - io.druid + druid-common druid-common druid-common @@ -157,17 +158,6 @@ org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - maven-jar-plugin @@ -176,15 +166,8 @@ - - - - true - true - - - + diff --git a/docs/content/Configuration.md b/docs/content/Configuration.md index bf29c3adc95..8f38b1b1459 100644 --- a/docs/content/Configuration.md +++ b/docs/content/Configuration.md @@ -69,8 +69,14 @@ Druid nodes periodically emit metrics and different metrics monitors can be incl The following monitors are available: -* CacheMonitor – Emits metrics (to logs) about the segment results cache for Historical and Broker nodes. Reports typical cache statistics include hits, misses, rates, and size (bytes and number of entries), as well as timeouts and and errors. -* SysMonitor – This uses the [SIGAR library](http://www.hyperic.com/products/sigar) to report on various system activities and statuses. +* CacheMonitor – Emits metrics (to logs) about the segment results cache + for Historical and Broker nodes. Reports typical cache statistics include + hits, misses, rates, and size (bytes and number of entries), as well as + timeouts and and errors. +* SysMonitor – This uses the [SIGAR library](http://www.hyperic.com/products/sigar) + to report on various system activities and statuses. Make sure to add the + [sigar library jar](https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar) + to your classpath if using this monitor. * ServerMonitor – Reports statistics on Historical nodes. * JvmMonitor – Reports JVM-related statistics. * RealtimeMetricsMonitor – Reports statistics on Realtime nodes. diff --git a/docs/content/Production-Cluster-Configuration.md b/docs/content/Production-Cluster-Configuration.md index 58ff3c4772e..e62fd6e8a75 100644 --- a/docs/content/Production-Cluster-Configuration.md +++ b/docs/content/Production-Cluster-Configuration.md @@ -36,7 +36,7 @@ druid.discovery.curator.path=/prod/discovery druid.request.logging.type=emitter druid.request.logging.feed=druid_requests -druid.monitoring.monitors=["com.metamx.metrics.SysMonitor","com.metamx.metrics.JvmMonitor"] +druid.monitoring.monitors=["com.metamx.metrics.JvmMonitor"] druid.emitter=http druid.emitter.http.recipientBaseUrl=#{EMITTER_URL} @@ -270,7 +270,7 @@ druid.server.maxSize=300000000000 druid.segmentCache.locations=[{"path": "/mnt/persistent/zk_druid", "maxSize": 300000000000}] -druid.monitoring.monitors=["io.druid.server.metrics.ServerMonitor", "com.metamx.metrics.SysMonitor","com.metamx.metrics.JvmMonitor"] +druid.monitoring.monitors=["io.druid.server.metrics.ServerMonitor", "com.metamx.metrics.JvmMonitor"] ``` ### Broker Node diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 8457a099b62..ea1df1a0f1a 100644 --- a/docs/content/Tutorial:-The-Druid-Cluster.md +++ b/docs/content/Tutorial:-The-Druid-Cluster.md @@ -135,7 +135,7 @@ druid.cache.sizeInBytes=10000000 druid.selectors.indexing.serviceName=overlord # Monitoring (disabled for examples) -# druid.monitoring.monitors=["com.metamx.metrics.SysMonitor","com.metamx.metrics.JvmMonitor"] +# druid.monitoring.monitors=["com.metamx.metrics.JvmMonitor"] # Metrics logging (disabled for examples) druid.emitter=noop @@ -296,7 +296,7 @@ druid.processing.buffer.sizeBytes=100000000 druid.processing.numThreads=2 # Enable Real monitoring -# druid.monitoring.monitors=["com.metamx.metrics.SysMonitor","com.metamx.metrics.JvmMonitor","io.druid.segment.realtime.RealtimeMetricsMonitor"] +# druid.monitoring.monitors=["com.metamx.metrics.JvmMonitor","io.druid.segment.realtime.RealtimeMetricsMonitor"] ``` Once the real-time node starts up, it should begin ingesting data and handing that data off to the rest of the Druid cluster. You can use a web UI located at coordinator_ip:port to view the status of data being loaded. Once data is handed off from the real-time nodes to historical nodes, the historical nodes should begin serving segments. diff --git a/examples/pom.xml b/examples/pom.xml index d7719d3e7f4..b1fad5fe76e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -16,118 +16,103 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-examples - druid-examples - druid-examples + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - + io.druid.extensions + druid-examples + druid-examples + druid-examples - - - io.druid - druid-server - ${project.parent.version} - - - io.druid - druid-common - ${project.parent.version} - + + io.druid + druid + 0.7.0-SNAPSHOT + - - org.twitter4j - twitter4j-core - 3.0.3 - - - org.twitter4j - twitter4j-async - 3.0.3 - - - org.twitter4j - twitter4j-stream - 3.0.3 - - - commons-validator - commons-validator - 1.4.0 - + + + io.druid + druid-server + ${project.parent.version} + + + io.druid + druid-common + ${project.parent.version} + - - - junit - junit - test - - + + org.twitter4j + twitter4j-core + 3.0.3 + + + org.twitter4j + twitter4j-async + 3.0.3 + + + org.twitter4j + twitter4j-stream + 3.0.3 + + + commons-validator + commons-validator + 1.4.0 + + + + + junit + junit + test + + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + ${project.build.directory}/${project.artifactId}-${project.version}-selfcontained.jar + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + - - - - maven-shade-plugin - - - package - - shade - - - - ${project.build.directory}/${project.artifactId}-${project.version}-selfcontained.jar - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - test-jar - - - - - - - true - true - - - - - - diff --git a/extensions/cassandra-storage/pom.xml b/extensions/cassandra-storage/pom.xml index 48984a29d8f..f11c2cf55d6 100644 --- a/extensions/cassandra-storage/pom.xml +++ b/extensions/cassandra-storage/pom.xml @@ -16,68 +16,42 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-cassandra-storage - druid-cassandra-storage - druid-cassandra-storage + + 4.0.0 + io.druid.extensions + druid-cassandra-storage + druid-cassandra-storage + druid-cassandra-storage - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + - - - io.druid - druid-api - - - com.netflix.astyanax - astyanax - 1.0.1 - - - commons-io - commons-io - + + + io.druid + druid-api + + + com.netflix.astyanax + astyanax + 1.0.1 + + + commons-io + commons-io + - - - junit - junit - test - - + + + junit + junit + test + + - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/extensions/hdfs-storage/pom.xml b/extensions/hdfs-storage/pom.xml index 84f32723d12..7e4ff73a12d 100644 --- a/extensions/hdfs-storage/pom.xml +++ b/extensions/hdfs-storage/pom.xml @@ -16,86 +16,61 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-hdfs-storage - druid-hdfs-storage - druid-hdfs-storage + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + druid-hdfs-storage + druid-hdfs-storage + druid-hdfs-storage - - - io.druid - druid-api - - - - net.java.dev.jets3t - jets3t - - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.hadoop - hadoop-client - compile - - - com.metamx - emitter - - - commons-io - commons-io - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + - - - junit - junit - test - - + + + io.druid + druid-api + + + + net.java.dev.jets3t + jets3t + + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.apache.hadoop + hadoop-client + compile + + + com.metamx + emitter + + + commons-io + commons-io + + + + + junit + junit + test + + - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/extensions/histogram/pom.xml b/extensions/histogram/pom.xml index 864a490a256..4091d59188e 100644 --- a/extensions/histogram/pom.xml +++ b/extensions/histogram/pom.xml @@ -15,67 +15,42 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-histogram - druid-histogram - druid-histogram + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + druid-histogram + druid-histogram + druid-histogram - - - io.druid - druid-processing - ${project.parent.version} - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + - - - io.druid - druid-processing - ${project.parent.version} - test - test-jar - - - junit - junit - test - - + + + io.druid + druid-processing + ${project.parent.version} + + + + + io.druid + druid-processing + ${project.parent.version} + test + test-jar + + + junit + junit + test + + - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/extensions/kafka-eight/pom.xml b/extensions/kafka-eight/pom.xml index f16b7b6c5fc..0e930dfa85b 100644 --- a/extensions/kafka-eight/pom.xml +++ b/extensions/kafka-eight/pom.xml @@ -16,74 +16,39 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-kafka-eight - druid-kafka-eight - druid-kafka-eight + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + druid-kafka-eight + druid-kafka-eight + druid-kafka-eight - - - io.druid - druid-api - - - org.apache.kafka - kafka_2.8.0 - 0.8.1.1 - - - log4j - log4j - - - org.apache.zookeeper - zookeeper - - - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + - - - junit - junit - test - - + + + io.druid + druid-api + + + org.apache.kafka + kafka_2.10 + 0.8.2.0 + + + + + junit + junit + test + + - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/extensions/kafka-seven/pom.xml b/extensions/kafka-seven/pom.xml index 35e38ce01b2..036521b993a 100644 --- a/extensions/kafka-seven/pom.xml +++ b/extensions/kafka-seven/pom.xml @@ -16,73 +16,51 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-kafka-seven - druid-kafka-seven - druid-kafka-seven + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + druid-kafka-seven + druid-kafka-seven + druid-kafka-seven - - - io.druid - druid-api - - - kafka - core-kafka - 0.7.2-mmx4 - - - log4j - log4j - - - org.jboss.netty - netty - - - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + + + + + io.druid + druid-api + + + + kafka + core-kafka + 0.7.2 + + + log4j + log4j + + + org.jboss.netty + netty + + + + + + + junit + junit + test + + - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/extensions/mysql-metadata-storage/pom.xml b/extensions/mysql-metadata-storage/pom.xml index c19c3ce18c0..2bb6c53ca7e 100644 --- a/extensions/mysql-metadata-storage/pom.xml +++ b/extensions/mysql-metadata-storage/pom.xml @@ -17,71 +17,46 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - mysql-metadata-storage - mysql-metadata-storage - mysql-metadata-storage + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + mysql-metadata-storage + mysql-metadata-storage + mysql-metadata-storage - - - io.druid - druid-api - - - io.druid - druid-common - ${project.parent.version} - - - io.druid - druid-server - ${project.parent.version} - - - mysql - mysql-connector-java - 5.1.33 - - - org.jdbi - jdbi - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + + + + + io.druid + druid-api + + + io.druid + druid-common + ${project.parent.version} + + + io.druid + druid-server + ${project.parent.version} + + + mysql + mysql-connector-java + 5.1.33 + + + org.jdbi + jdbi + + diff --git a/extensions/postgresql-metadata-storage/pom.xml b/extensions/postgresql-metadata-storage/pom.xml index 227ca9cdb12..b157a04e190 100644 --- a/extensions/postgresql-metadata-storage/pom.xml +++ b/extensions/postgresql-metadata-storage/pom.xml @@ -17,71 +17,46 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - postgresql-metadata-storage - postgresql-metadata-storage - postgresql-metadata-storage + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + postgresql-metadata-storage + postgresql-metadata-storage + postgresql-metadata-storage - - - io.druid - druid-api - - - io.druid - druid-common - ${project.parent.version} - - - io.druid - druid-server - ${project.parent.version} - - - org.postgresql - postgresql - 9.3-1102-jdbc41 - - - org.jdbi - jdbi - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + + + + + io.druid + druid-api + + + io.druid + druid-common + ${project.parent.version} + + + io.druid + druid-server + ${project.parent.version} + + + org.postgresql + postgresql + 9.3-1102-jdbc41 + + + org.jdbi + jdbi + + diff --git a/extensions/rabbitmq/pom.xml b/extensions/rabbitmq/pom.xml index fccc3b78801..5a0fb5e5432 100644 --- a/extensions/rabbitmq/pom.xml +++ b/extensions/rabbitmq/pom.xml @@ -16,68 +16,55 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid.extensions - druid-rabbitmq - druid-rabbitmq - druid-rabbitmq + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - ../../pom.xml - + io.druid.extensions + druid-rabbitmq + druid-rabbitmq + druid-rabbitmq - - - io.druid - druid-api - - - com.rabbitmq - amqp-client - 3.2.1 - - - net.jodah - lyra - 0.3.1 - + + io.druid + druid + 0.7.0-SNAPSHOT + ../../pom.xml + + + + + io.druid + druid-api + + + com.rabbitmq + amqp-client + 3.2.1 + + + net.jodah + lyra + 0.3.1 + + + + + junit + junit + test + + + commons-cli + commons-cli + test + + + io.druid + druid-processing + ${project.parent.version} + test + + - - - junit - junit - test - - - commons-cli - commons-cli - test - - - io.druid - druid-processing - ${project.parent.version} - test - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - diff --git a/extensions/s3-extensions/pom.xml b/extensions/s3-extensions/pom.xml index c67e4c8ba4f..81d1b1c6851 100644 --- a/extensions/s3-extensions/pom.xml +++ b/extensions/s3-extensions/pom.xml @@ -16,8 +16,10 @@ ~ limitations under the License. --> - + 4.0.0 + io.druid.extensions druid-s3-extensions druid-s3-extensions @@ -36,9 +38,9 @@ druid-api - io.druid - druid-aws-common - ${project.parent.version} + io.druid + druid-aws-common + ${project.parent.version} @@ -81,31 +83,5 @@ test - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - + diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 78ab71f598d..e078b5f6fc2 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -16,128 +16,108 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid - druid-indexing-hadoop - druid-indexing-hadoop - Druid Indexing Hadoop + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - + druid-indexing-hadoop + druid-indexing-hadoop + Druid Indexing Hadoop - - - io.druid - druid-server - ${project.parent.version} - + + io.druid + druid + 0.7.0-SNAPSHOT + - - com.metamx - java-util - + + + io.druid + druid-server + ${project.parent.version} + - - commons-io - commons-io - - - com.google.guava - guava - - - - net.java.dev.jets3t - jets3t - - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.hadoop - hadoop-client - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - org.jdbi - jdbi - - - joda-time - joda-time - - - com.google.code.findbugs - jsr305 - + + com.metamx + java-util + + + + commons-io + commons-io + + + com.google.guava + guava + + + + net.java.dev.jets3t + jets3t + + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.apache.hadoop + hadoop-client + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.jdbi + jdbi + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + - - - junit - junit - test - - + + + junit + junit + test + + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + ${project.build.directory}/${project.artifactId}-${project.version}-selfcontained.jar + + + + + + + - - - - maven-jar-plugin - - - - true - true - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-shade-plugin - - - package - - shade - - - - ${project.build.directory}/${project.artifactId}-${project.version}-selfcontained.jar - - - - - - - diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 13dab4cf825..fee2f1105db 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -16,84 +16,58 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid - druid-indexing-service - druid-indexing-service - druid-indexing-service + + 4.0.0 - - io.druid - druid - 0.7.0-SNAPSHOT - + druid-indexing-service + druid-indexing-service + druid-indexing-service - - - io.druid - druid-common - ${project.parent.version} - - - io.druid - druid-server - ${project.parent.version} - - - io.druid - druid-indexing-hadoop - ${project.parent.version} - + + io.druid + druid + 0.7.0-SNAPSHOT + - - - junit - junit - test - - - org.easymock - easymock - test - - - org.apache.curator - curator-test - test - - - org.apache.hadoop - hadoop-client - test - - + + + io.druid + druid-common + ${project.parent.version} + + + io.druid + druid-server + ${project.parent.version} + + + io.druid + druid-indexing-hadoop + ${project.parent.version} + + + + + junit + junit + test + + + org.easymock + easymock + test + + + org.apache.curator + curator-test + test + + + org.apache.hadoop + hadoop-client + test + + - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-jar-plugin - - - - true - true - - - - - - diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 01c2ac55bd1..3cfffb6ba37 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -16,133 +16,138 @@ ~ limitations under the License. --> - - 4.0.0 - io.druid - druid-integration-tests - druid-integration-tests - druid-integration-tests - - io.druid - druid - 0.7.0-SNAPSHOT - + + 4.0.0 - - - io.druid - druid-common - ${project.parent.version} - - - io.druid.extensions - druid-s3-extensions - ${project.parent.version} - - - io.druid.extensions - druid-histogram - ${project.parent.version} - - - io.druid.extensions - mysql-metadata-storage - ${project.parent.version} - - - io.druid - druid-services - ${project.parent.version} - - - io.druid - druid-server - ${project.parent.version} - + druid-integration-tests + druid-integration-tests + druid-integration-tests - - - org.testng - testng - - - org.easymock - easymock - test - - + + io.druid + druid + 0.7.0-SNAPSHOT + - - - - maven-surefire-plugin - - - **/IT*.java - - - UTC - - - - - - - - integration-tests - + + + io.druid + druid-common + ${project.parent.version} + + + io.druid.extensions + druid-s3-extensions + ${project.parent.version} + + + io.druid.extensions + druid-histogram + ${project.parent.version} + + + io.druid.extensions + mysql-metadata-storage + ${project.parent.version} + + + io.druid + druid-services + ${project.parent.version} + + + io.druid + druid-server + ${project.parent.version} + + + + + org.testng + testng + + + org.easymock + easymock + test + + + + - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - build-and-start-druid-cluster - - exec - - pre-integration-test + + org.apache.maven.plugins + maven-surefire-plugin - ${project.basedir}/run_cluster.sh + + **/IT*.java + - - - stop-druid-cluster - - exec - - post-integration-test - - ${project.basedir}/stop_cluster.sh - - - - - - maven-failsafe-plugin - - - integration-tests - integration-test - - integration-test - verify - - - - - -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Dtestrunfactory=org.testng.DruidTestRunnerFactory - -Ddruid.test.config.dockerIp=${env.DOCKER_IP} -Ddruid.zk.service.host=${env.DOCKER_IP} - - - src/test/resources/testng.xml - - - + - - - - + + + + integration-tests + + + + org.codehaus.mojo + exec-maven-plugin + + + build-and-start-druid-cluster + + exec + + pre-integration-test + + ${project.basedir}/run_cluster.sh + + + + stop-druid-cluster + + exec + + post-integration-test + + ${project.basedir}/stop_cluster.sh + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + integration-test + + integration-test + verify + + + + + + -Duser.timezone=UTC + -Dfile.encoding=UTF-8 + -Dtestrunfactory=org.testng.DruidTestRunnerFactory + -Ddruid.test.config.dockerIp=${env.DOCKER_IP} + -Ddruid.zk.service.host=${env.DOCKER_IP} + + + src/test/resources/testng.xml + + + + + + + + + diff --git a/pom.xml b/pom.xml index 10b08800c51..f4045419e44 100644 --- a/pom.xml +++ b/pom.xml @@ -16,27 +16,56 @@ ~ limitations under the License. --> - + 4.0.0 - io.druid + + + io.druid + oss-parent + 2 + + druid - pom 0.7.0-SNAPSHOT - druid - druid + pom + + ${project.groupId}:${project.artifactId} + Druid - A Distributed Column Store + http://druid.io/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + Fangjin Yang + https://github.com/fjy + + + Eric Tschetter + https://github.com/cheddar + + + Xavier Léauté + https://github.com/xvrl + + + + 2011 + scm:git:ssh://git@github.com/druid-io/druid.git scm:git:ssh://git@github.com/druid-io/druid.git - https://github.com/druid-io/druid + https://github.com/druid-io/druid.git druid-0.7.0-SNAPSHOT - - 3.0.3 - - - UTF-8 0.26.14 2.7.0 9.2.5.v20141112 @@ -59,7 +88,9 @@ extensions/cassandra-storage extensions/hdfs-storage extensions/s3-extensions - extensions/kafka-seven + + extensions/kafka-eight extensions/rabbitmq extensions/histogram @@ -99,7 +130,7 @@ com.metamx server-metrics - 0.0.10 + 0.1.0 commons-codec @@ -528,69 +559,67 @@ testng 6.8.7 - + + org.apache.maven.plugins + maven-surefire-plugin + + + -Duser.language=en -Duser.country=US + + + + org.apache.maven.plugins + maven-release-plugin + + true + + + + org.apache.maven.plugins maven-clean-plugin 2.5 - maven-compiler-plugin - 2.5.1 - - 1.7 - 1.7 - - - + org.apache.maven.plugins maven-dependency-plugin 2.8 + org.apache.maven.plugins maven-deploy-plugin 2.7 + org.apache.maven.plugins maven-help-plugin 2.1.1 + org.apache.maven.plugins maven-install-plugin 2.3.1 - maven-jar-plugin - 2.4 - - + org.apache.maven.plugins maven-resources-plugin 2.5 + org.apache.maven.plugins maven-shade-plugin - 2.1 + 2.2 + org.apache.maven.plugins maven-site-plugin 3.1 - - maven-surefire-plugin - 2.12.2 - - - -Duser.language=en -Duser.country=US - - UTC - US - en - - - org.scala-tools maven-scala-plugin @@ -607,42 +636,17 @@ 2.4 - org.apache.maven.plugins - maven-release-plugin - 2.5 - - true - + org.codehaus.mojo + license-maven-plugin + 1.8 - maven-source-plugin - 2.4 - - - maven-javadoc-plugin - 2.10.1 + org.codehaus.mojo + exec-maven-plugin + 1.2.1 - - - pub-libs - pub-libs-local - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - - thirdparty-uploads - JBoss Thirdparty Uploads - https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads - - - - - central-local - Central - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - diff --git a/processing/pom.xml b/processing/pom.xml index 791399bbe9b..0b9fe746193 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -16,9 +16,10 @@ ~ limitations under the License. --> - + 4.0.0 - io.druid + druid-processing druid-processing A module that is everything required to understands Druid Segments @@ -104,17 +105,6 @@ org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - maven-jar-plugin @@ -123,15 +113,8 @@ - - - - true - true - - - + diff --git a/server/pom.xml b/server/pom.xml index a16e8e60a8e..5be4c6486a2 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -16,9 +16,10 @@ ~ limitations under the License. --> - + 4.0.0 - io.druid + druid-server druid-server Druid Server @@ -201,17 +202,6 @@ org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - maven-jar-plugin @@ -220,14 +210,6 @@ - - - - true - true - - - org.antlr @@ -242,4 +224,5 @@ + diff --git a/services/pom.xml b/services/pom.xml index c6f86728087..81c9d84a7a3 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -15,9 +15,10 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - io.druid + druid-services druid-services druid-services @@ -59,21 +60,9 @@ - - maven-jar-plugin - - - - true - true - - - - org.apache.maven.plugins maven-shade-plugin - 2.2 package @@ -95,7 +84,7 @@ - + @@ -103,17 +92,6 @@ org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - maven-assembly-plugin @@ -133,7 +111,6 @@ org.codehaus.mojo license-maven-plugin - 1.8 download-licenses @@ -145,4 +122,5 @@ +