This is an automated email from the ASF dual-hosted git repository. nickallen pushed a commit to branch METRON-2223 in repository https://gitbox.apache.org/repos/asf/metron.git
commit e9613e4efa24be2c7401f6d68893b09f3e471c3f Author: nickallen <[email protected]> AuthorDate: Tue Oct 29 11:53:28 2019 -0400 Start on changes to root pom --- metron-interface/pom.xml | 2 +- metron-platform/metron-common/pom.xml | 2 +- pom.xml | 50 +++++------------------------------ 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/metron-interface/pom.xml b/metron-interface/pom.xml index 2934368..8968966 100644 --- a/metron-interface/pom.xml +++ b/metron-interface/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${global_junit_version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index b4114cc..04b12fa 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -175,7 +175,7 @@ <dependency> <groupId>org.krakenapps</groupId> <artifactId>kraken-pcap</artifactId> - <version>${global_pcap_version}</version> + <version>${global_kraken_pcap_version}</version> <exclusions> <exclusion> <artifactId>slf4j-api</artifactId> diff --git a/pom.xml b/pom.xml index 90de889..25df5ed 100644 --- a/pom.xml +++ b/pom.xml @@ -86,30 +86,16 @@ <twitter>@ApacheMetron</twitter> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <!-- base project versions --> - <base_kafka_version>0.10.0</base_kafka_version> - <base_hadoop_version>2.7.1</base_hadoop_version> - <base_flume_version>1.5.2</base_flume_version> - <!-- full dependency versions --> <global_accumulo_version>1.8.0</global_accumulo_version> <global_caffeine_version>2.6.2</global_caffeine_version> <global_antlr_version>4.5</global_antlr_version> <global_opencsv_version>3.7</global_opencsv_version> <global_classindex_version>3.3</global_classindex_version> - <global_hbase_version>1.1.1</global_hbase_version> - <global_hbase_guava_version>12.0</global_hbase_guava_version> - <global_storm_version>1.0.3</global_storm_version> - <global_storm_kafka_version>1.2.2</global_storm_kafka_version> - <global_pcap_version>1.7.1</global_pcap_version> - <global_hadoop_version>${base_hadoop_version}</global_hadoop_version> - <global_flume_version>${base_flume_version}</global_flume_version> - <global_elasticsearch_version>5.6.14</global_elasticsearch_version> + <global_kraken_pcap_version>1.7.1</global_kraken_pcap_version> <global_json_simple_version>1.1.1</global_json_simple_version> <global_metrics_version>3.0.2</global_metrics_version> <global_junit_version>4.12</global_junit_version> <global_guava_version>17.0</global_guava_version> - <global_json_schema_validator_version>2.2.5</global_json_schema_validator_version> - <global_opencsv_version>3.7</global_opencsv_version> <global_java_version>1.8</global_java_version> <global_mockito_version>1.10.19</global_mockito_version> <global_powermock_version>1.7.0</global_powermock_version> @@ -125,10 +111,10 @@ <global_checkstyle_version>8.0</global_checkstyle_version> <global_log4j_core_version>2.1</global_log4j_core_version> <global_simple_syslog_version>0.0.3</global_simple_syslog_version> - <global_spark_version>2.3.1</global_spark_version> <global_httpclient_version>4.3.2</global_httpclient_version> <global_aesh_version>0.66.19</global_aesh_version> <global_jacoco_version>0.8.3</global_jacoco_version> + <global_slf4j_version>1.7.25</global_slf4j_version> <argLine></argLine> </properties> <profiles> @@ -138,43 +124,21 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <hdp_version>3.1.0.0</hdp_version> <global_kafka_version>2.0.0</global_kafka_version> - <global_slf4j_version>1.7.25</global_slf4j_version> <global_storm_version>1.2.1</global_storm_version> <global_storm_kafka_version>1.2.3</global_storm_kafka_version> <global_zeppelin_version>0.8.0</global_zeppelin_version> - <global_solr_version>7.4.0</global_solr_version> - <base_hadoop_version>3.1.1</base_hadoop_version> + <global_hadoop_version>3.1.1</global_hadoop_version> <global_hbase_version>2.0.2</global_hbase_version> <global_hbase_guava_version>17.0</global_hbase_guava_version> + <global_spark_version>2.3.1</global_spark_version> <!-- For Zookeeper/Curator version compatibility see - http://curator.apache.org/zk-compatibility.html --> - <global_zookeeper_version>3.4.6</global_zookeeper_version> - <global_curator_version>2.7.1</global_curator_version> - <global_curator_test_version>2.7.1</global_curator_test_version> - </properties> - </profile> - <profile> - <id>HDP-2.5.0.0</id> - <properties> - <hdp_version>2.5.0.0</hdp_version> - <build_number>1245</build_number> - <global_hbase_version>1.1.1</global_hbase_version> - <global_hbase_guava_version>12.0</global_hbase_guava_version> - <global_storm_kafka_version>1.2.2</global_storm_kafka_version> - <base_storm_version>1.0.1</base_storm_version> - <global_storm_version>${base_storm_version}.${hdp_version}-${build_number}</global_storm_version> - <global_kafka_version>${base_kafka_version}.${hdp_version}-${build_number}</global_kafka_version> - <global_zeppelin_version>0.7.3</global_zeppelin_version> - <global_solr_version>6.6.2</global_solr_version> - <global_hbase_version>2.0.2</global_hbase_version> - <global_hbase_guava_version>17.0</global_hbase_guava_version> - <!-- For Zookeeper/Curator version compatibility see - http://curator.apache.org/zk-compatibility.html --> + http://curator.apache.org/zk-compatibility.html --> <global_zookeeper_version>3.4.6</global_zookeeper_version> <global_curator_version>2.7.1</global_curator_version> <global_curator_test_version>2.7.1</global_curator_test_version> + <global_solr_version>7.4.0</global_solr_version> + <global_elasticsearch_version>5.6.14</global_elasticsearch_version> </properties> </profile> </profiles>
