diff --git a/metron-analytics/metron-maas-common/pom.xml b/metron-analytics/metron-maas-common/pom.xml index b4041118ba..4fa3163760 100644 --- a/metron-analytics/metron-maas-common/pom.xml +++ b/metron-analytics/metron-maas-common/pom.xml @@ -1,15 +1,15 @@ - org.apache.curator curator-recipes ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + org.apache.curator curator-x-discovery ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + org.apache.httpcomponents @@ -83,8 +97,15 @@ org.apache.curator curator-test - ${curator.version} + ${global_curator_test_version} test + + + + org.apache.zookeeper + zookeeper + + diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml index ebb58bde61..4e81be6617 100644 --- a/metron-analytics/metron-maas-service/pom.xml +++ b/metron-analytics/metron-maas-service/pom.xml @@ -1,15 +1,15 @@ - hadoop-yarn-server-common ${hadoop.version} provided + + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + org.apache.hadoop @@ -94,6 +111,13 @@ hadoop-yarn-common ${hadoop.version} provided + + + + org.apache.curator + curator-framework + + org.apache.hadoop @@ -119,16 +143,19 @@ provided - org.apache.curator - curator-recipes + + org.apache.curator + curator-framework - org.apache.curator - curator-client + + org.apache.curator + curator-client - org.apache.curator - curator-framework + + org.apache.curator + curator-recipes org.slf4j @@ -211,6 +238,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-analytics/metron-profiler-spark/pom.xml b/metron-analytics/metron-profiler-spark/pom.xml index 0c5a4e5ccf..da8356efb7 100644 --- a/metron-analytics/metron-profiler-spark/pom.xml +++ b/metron-analytics/metron-profiler-spark/pom.xml @@ -32,6 +32,13 @@ org.apache.spark spark-core_2.11 ${global_spark_version} + + + + org.apache.curator + curator-recipes + + org.apache.spark diff --git a/metron-analytics/metron-profiler-storm/pom.xml b/metron-analytics/metron-profiler-storm/pom.xml index 5a2bd34440..84c0631f5e 100644 --- a/metron-analytics/metron-profiler-storm/pom.xml +++ b/metron-analytics/metron-profiler-storm/pom.xml @@ -67,6 +67,26 @@ org.apache.httpcomponents httpclient + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.zookeeper + zookeeper + @@ -94,6 +114,21 @@ commons-lang commons-lang + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.curator + curator-framework + diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml index 75f3dc9c5b..9affafb89e 100644 --- a/metron-interface/metron-rest/pom.xml +++ b/metron-interface/metron-rest/pom.xml @@ -27,7 +27,6 @@ UTF-8 1.8 4.5 - 2.7.1 1.6.4 2.0.1.RELEASE 1.0.1.RELEASE @@ -127,7 +126,7 @@ org.apache.curator curator-recipes - ${curator.version} + ${global_curator_version} com.google.guava @@ -137,6 +136,11 @@ log4j log4j + + + org.apache.zookeeper + zookeeper + @@ -246,6 +250,21 @@ javax.servlet servlet-api + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-common-streaming/metron-common-storm/pom.xml b/metron-platform/metron-common-streaming/metron-common-storm/pom.xml index 27f3aa1180..2b9fbed59d 100644 --- a/metron-platform/metron-common-streaming/metron-common-storm/pom.xml +++ b/metron-platform/metron-common-streaming/metron-common-storm/pom.xml @@ -74,15 +74,34 @@ flux-core ${global_flux_version} + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + org.apache.curator curator-client ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + org.apache.curator curator-test - ${global_curator_version} + ${global_curator_test_version} + + + + org.apache.zookeeper + zookeeper + + test diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index 710abc71e9..5d6ddaa630 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -39,6 +39,47 @@ + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + + + org.apache.curator + curator-client + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-recipes + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-framework + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + org.apache.metron metron-maas-common @@ -146,11 +187,6 @@ - - org.apache.curator - curator-client - ${global_curator_version} - org.atteo.classindex classindex @@ -206,6 +242,26 @@ slf4j-log4j12 org.slf4j + + + org.apache.zookeeper + zookeeper + + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -229,6 +285,21 @@ asm asm + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.zookeeper + zookeeper + @@ -254,8 +325,15 @@ org.apache.curator curator-test - ${global_curator_version} + ${global_curator_test_version} test + + + + org.apache.zookeeper + zookeeper + + nl.jqno.equalsverifier diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml index 6ea2fb0252..07f98cf82b 100644 --- a/metron-platform/metron-data-management/pom.xml +++ b/metron-platform/metron-data-management/pom.xml @@ -168,6 +168,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -187,6 +202,16 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + provided @@ -245,6 +270,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml index 052586a4bc..9f8ddb9076 100644 --- a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml +++ b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml @@ -155,6 +155,16 @@ org.apache.httpcomponents httpcore + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml index 4bbf65339a..062860910f 100644 --- a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml +++ b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml @@ -132,6 +132,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -224,6 +239,16 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-hbase-server/pom.xml b/metron-platform/metron-hbase-server/pom.xml index 0d33af4000..0f6bd83c90 100644 --- a/metron-platform/metron-hbase-server/pom.xml +++ b/metron-platform/metron-hbase-server/pom.xml @@ -132,6 +132,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -203,6 +218,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-hbase/metron-hbase-common/pom.xml b/metron-platform/metron-hbase/metron-hbase-common/pom.xml index 5b484c2a21..548d976605 100644 --- a/metron-platform/metron-hbase/metron-hbase-common/pom.xml +++ b/metron-platform/metron-hbase/metron-hbase-common/pom.xml @@ -1,15 +1,15 @@ - org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -99,6 +114,16 @@ com.google.guava guava + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -151,6 +176,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-indexing/metron-indexing-common/pom.xml b/metron-platform/metron-indexing/metron-indexing-common/pom.xml index 2850983335..f118521c17 100644 --- a/metron-platform/metron-indexing/metron-indexing-common/pom.xml +++ b/metron-platform/metron-indexing/metron-indexing-common/pom.xml @@ -59,7 +59,11 @@ ${global_log4j_core_version} runtime - + + org.apache.commons + commons-math + 2.2 + org.apache.hbase hbase-client @@ -114,6 +118,16 @@ log4j log4j + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-integration-test/pom.xml b/metron-platform/metron-integration-test/pom.xml index 76520d4333..6bb8291332 100644 --- a/metron-platform/metron-integration-test/pom.xml +++ b/metron-platform/metron-integration-test/pom.xml @@ -1,15 +1,15 @@ - + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + log4j log4j @@ -37,13 +42,47 @@ junit ${global_junit_version} - org.apache.storm flux-core ${global_flux_version} - + + org.apache.curator + curator-client + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-recipes + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-framework + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + org.apache.storm storm-core @@ -77,6 +116,25 @@ org.slf4j slf4j-log4j12 + + org.apache.zookeeper + zookeeper + + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -96,6 +154,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -144,20 +217,29 @@ - - org.apache.kafka kafka_2.12 ${global_kafka_version} + + + org.apache.zookeeper + zookeeper + + org.apache.kafka kafka_2.12 ${global_kafka_version} test + + + org.apache.zookeeper + zookeeper + + - org.apache.hadoop hadoop-hdfs @@ -195,6 +277,21 @@ slf4j-log4j12 org.slf4j + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + @@ -247,6 +344,23 @@ org.apache.hadoop hadoop-yarn-server-common ${global_hadoop_version} + + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + org.apache.hadoop @@ -263,6 +377,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml index 309a42d43e..d081c0144f 100644 --- a/metron-platform/metron-management/pom.xml +++ b/metron-platform/metron-management/pom.xml @@ -123,16 +123,39 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + test + org.apache.curator curator-test - ${global_curator_version} + ${global_curator_test_version} test + + + + org.apache.zookeeper + zookeeper + + org.apache.metron @@ -171,6 +194,21 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + test diff --git a/metron-platform/metron-parsing/metron-parsers-common/pom.xml b/metron-platform/metron-parsing/metron-parsers-common/pom.xml index a35fd94951..c23cfac777 100644 --- a/metron-platform/metron-parsing/metron-parsers-common/pom.xml +++ b/metron-platform/metron-parsing/metron-parsers-common/pom.xml @@ -1,15 +1,15 @@ - log4j log4j + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml index c2cfa2484c..a9dd765e05 100644 --- a/metron-platform/metron-pcap-backend/pom.xml +++ b/metron-platform/metron-pcap-backend/pom.xml @@ -36,10 +36,22 @@ ${guava_version} compile + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + org.apache.curator curator-client - 2.10.0 + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + org.apache.storm @@ -50,12 +62,6 @@ org.apache.metron metron-common ${project.parent.version} - - - org.apache.curator - curator-client - - org.apache.metron @@ -87,9 +93,15 @@ ${global_hadoop_version} + org.apache.curator curator-client + + + org.apache.curator + curator-recipes + org.slf4j slf4j-log4j12 diff --git a/metron-platform/metron-pcap/pom.xml b/metron-platform/metron-pcap/pom.xml index b5d0c5fa53..000fb9d0db 100644 --- a/metron-platform/metron-pcap/pom.xml +++ b/metron-platform/metron-pcap/pom.xml @@ -121,6 +121,21 @@ org.apache.httpcomponents httpcore + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-solr/metron-solr-common/pom.xml b/metron-platform/metron-solr/metron-solr-common/pom.xml index 118a9250a2..a2bfe76cdd 100644 --- a/metron-platform/metron-solr/metron-solr-common/pom.xml +++ b/metron-platform/metron-solr/metron-solr-common/pom.xml @@ -132,6 +132,16 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-solr/metron-solr-storm/pom.xml b/metron-platform/metron-solr/metron-solr-storm/pom.xml index 3d55616fe0..38688fb38d 100644 --- a/metron-platform/metron-solr/metron-solr-storm/pom.xml +++ b/metron-platform/metron-solr/metron-solr-storm/pom.xml @@ -56,6 +56,21 @@ caffeine com.github.ben-manes.caffeine + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-test-utilities/pom.xml b/metron-platform/metron-test-utilities/pom.xml index c651fc7c41..165db4a43e 100644 --- a/metron-platform/metron-test-utilities/pom.xml +++ b/metron-platform/metron-test-utilities/pom.xml @@ -1,15 +1,15 @@ - org.apache.hadoop hadoop-auth ${global_hadoop_version} + + + + org.apache.curator + curator-framework + + + + org.apache.zookeeper + zookeeper + + org.apache.hadoop @@ -65,6 +77,21 @@ commons-httpclient commons-httpclient + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.zookeeper + zookeeper + @@ -140,11 +167,22 @@ - + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + org.apache.curator curator-test - ${global_curator_version} + ${global_curator_test_version} + + + + org.apache.zookeeper + zookeeper + + junit diff --git a/metron-platform/metron-writer/metron-writer-common/pom.xml b/metron-platform/metron-writer/metron-writer-common/pom.xml index 24722f15e5..3a5ef9f284 100644 --- a/metron-platform/metron-writer/metron-writer-common/pom.xml +++ b/metron-platform/metron-writer/metron-writer-common/pom.xml @@ -47,6 +47,26 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.curator + curator-framework + + + + org.apache.zookeeper + zookeeper + @@ -70,6 +90,21 @@ com.google.guava guava + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.zookeeper + zookeeper + provided @@ -102,6 +137,11 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.apache.zookeeper + zookeeper + provided @@ -131,6 +171,11 @@ org.apache.hadoop hadoop-common + + + org.apache.zookeeper + zookeeper + diff --git a/metron-platform/metron-writer/metron-writer-storm/pom.xml b/metron-platform/metron-writer/metron-writer-storm/pom.xml index b1e33a9c75..0c62cb48c0 100644 --- a/metron-platform/metron-writer/metron-writer-storm/pom.xml +++ b/metron-platform/metron-writer/metron-writer-storm/pom.xml @@ -63,6 +63,16 @@ org.slf4j slf4j-log4j12 + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + provided @@ -115,6 +125,21 @@ org.mortbay.jetty jetty-util + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + diff --git a/metron-platform/metron-zookeeper/pom.xml b/metron-platform/metron-zookeeper/pom.xml index c9083be055..ebcd43a057 100644 --- a/metron-platform/metron-zookeeper/pom.xml +++ b/metron-platform/metron-zookeeper/pom.xml @@ -1,15 +1,15 @@ - UTF-8 + + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} + org.apache.curator curator-client ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + org.apache.curator curator-recipes ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-framework + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + com.google.guava diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml index 24d13c319b..584b27cb35 100644 --- a/metron-stellar/stellar-common/pom.xml +++ b/metron-stellar/stellar-common/pom.xml @@ -44,6 +44,26 @@ asm asm + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.curator + curator-framework + + + + org.apache.zookeeper + zookeeper + @@ -51,6 +71,33 @@ hadoop-auth ${global_hadoop_version} test + + + + org.apache.curator + curator-client + + + + org.apache.curator + curator-recipes + + + + org.apache.curator + curator-framework + + + + org.apache.zookeeper + zookeeper + + + + org.apache.zookeeper + zookeeper + + org.apache.accumulo @@ -129,20 +176,58 @@ 1.6 - org.apache.curator - curator-client - ${global_curator_version} + org.apache.zookeeper + zookeeper + ${global_zookeeper_version} - org.apache.curator - curator-recipes - ${global_curator_version} + org.apache.curator + curator-client + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-recipes + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-framework + ${global_curator_version} + + + + org.apache.zookeeper + zookeeper + + org.apache.curator curator-test - ${global_curator_version} + ${global_curator_test_version} test + + + + org.apache.zookeeper + zookeeper + + org.jboss.aesh diff --git a/pom.xml b/pom.xml index 308c167ac0..9437439a2d 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,6 @@ 2.6.2 4.5 3.7 - 2.7.1 3.3 1.1.1 12.0 @@ -151,6 +150,11 @@ 7.4.0 2.0.2 17.0 + + 3.4.6 + 2.7.1 + 2.7.1 @@ -167,6 +171,11 @@ 6.6.2 2.0.2 17.0 + + 3.4.6 + 2.7.1 + 2.7.1