This is an automated email from the ASF dual-hosted git repository.
nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1
in repository https://gitbox.apache.org/repos/asf/metron.git
commit 9e53a83e68d5dfa0486ec885f3659a7302573dd4
Author: Nick Allen <n...@nickallen.org>
AuthorDate: Thu Sep 5 11:17:44 2019 -0400
METRON-2248 Merge Master into Feature Branch
---
metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml | 6 ++++++
metron-platform/metron-parsing/metron-parsing-storm/pom.xml | 7 +++++++
metron-platform/metron-solr/metron-solr-storm/pom.xml | 6 ++++++
3 files changed, 19 insertions(+)
diff --git a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
index 832d070..6aee1e6 100644
--- a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
+++ b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
@@ -33,6 +33,12 @@
<guava.version>${global_hbase_guava_version}</guava.version>
</properties>
<dependencies>
+ <!-- Dependencies needed preferentially -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.2</version>
+ </dependency>
<!-- Metron -->
<dependency>
diff --git a/metron-platform/metron-parsing/metron-parsing-storm/pom.xml
b/metron-platform/metron-parsing/metron-parsing-storm/pom.xml
index 9bd898e..c983be5 100644
--- a/metron-platform/metron-parsing/metron-parsing-storm/pom.xml
+++ b/metron-platform/metron-parsing/metron-parsing-storm/pom.xml
@@ -30,6 +30,13 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencies>
+ <!-- Dependencies needed preferentially -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.2</version>
+ </dependency>
+
<!-- Metron dependencies -->
<dependency>
<groupId>org.apache.metron</groupId>
diff --git a/metron-platform/metron-solr/metron-solr-storm/pom.xml
b/metron-platform/metron-solr/metron-solr-storm/pom.xml
index b515ceb..3d55616 100644
--- a/metron-platform/metron-solr/metron-solr-storm/pom.xml
+++ b/metron-platform/metron-solr/metron-solr-storm/pom.xml
@@ -83,6 +83,12 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.metron</groupId>
+ <artifactId>stellar-common</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.storm</groupId>
<artifactId>flux-core</artifactId>
<version>${global_flux_version}</version>
