This is an automated email from the ASF dual-hosted git repository. mmiklavcic pushed a commit to branch feature/METRON-2088-support-hdp-3.1 in repository https://gitbox.apache.org/repos/asf/metron.git
commit 275a6d837c329a0a7b7d1cfa70bc5e8f323a3d6a Merge: 0a619e0 67b4d0b Author: Michael Miklavcic <[email protected]> AuthorDate: Wed Oct 23 15:13:50 2019 -0600 Merge branch 'master' into feature/METRON-2088-support-hdp-3.1 metron-deployment/development/centos6/README.md | 8 +++--- .../show-hide-alert-entries.component.spec.ts | 32 ++++++++++++++++++++-- .../show-hide/show-hide-alert-entries.component.ts | 16 +++++++++-- .../show-hide/show-hide.service.spec.ts | 12 +++++++- .../configure-rows/show-hide/show-hide.service.ts | 6 +++- .../src/app/shared/switch/switch.component.html | 4 +-- .../src/app/shared/switch/switch.component.scss | 9 ++++++ .../src/app/shared/switch/switch.component.ts | 1 + metron-interface/metron-rest/pom.xml | 3 +- metron-platform/metron-pcap-backend/pom.xml | 3 +- 10 files changed, 78 insertions(+), 16 deletions(-) diff --cc metron-platform/metron-pcap-backend/pom.xml index 361ebaf,719292c..cf49ecf --- a/metron-platform/metron-pcap-backend/pom.xml +++ b/metron-platform/metron-pcap-backend/pom.xml @@@ -62,19 -50,21 +62,20 @@@ <groupId>org.apache.metron</groupId> <artifactId>metron-common</artifactId> <version>${project.parent.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> + <!-- Must be in the rest uber jar bc certain functions, e.g. MR calls with PCAP will + not work with just a classpath reference. Libjars option does not work with "yarn jar" --> <groupId>org.apache.metron</groupId> <artifactId>stellar-common</artifactId> <version>${project.parent.version}</version> - <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.metron</groupId> + <artifactId>metron-common-storm</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${global_junit_version}</version>
