This is an automated email from the ASF dual-hosted git repository. mmiklavcic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push: new 7f6ad42 METRON-2067 Maven pom file duplicate dependency fixes (mmiklavc) closes apache/metron#1379 7f6ad42 is described below commit 7f6ad42e534eeaf9423f33c3a6ea1d3d131049f5 Author: mmiklavc <michael.miklav...@gmail.com> AuthorDate: Wed Apr 17 12:49:36 2019 -0600 METRON-2067 Maven pom file duplicate dependency fixes (mmiklavc) closes apache/metron#1379 --- metron-analytics/metron-profiler-storm/pom.xml | 16 ++++------------ metron-platform/metron-parsing/metron-parsers/pom.xml | 3 ++- metron-platform/metron-writer/pom.xml | 6 ------ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/metron-analytics/metron-profiler-storm/pom.xml b/metron-analytics/metron-profiler-storm/pom.xml index 30566fd..66deb4d 100644 --- a/metron-analytics/metron-profiler-storm/pom.xml +++ b/metron-analytics/metron-profiler-storm/pom.xml @@ -170,6 +170,10 @@ <groupId>org.hamcrest</groupId> <artifactId>hamcrest-core</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -313,18 +317,6 @@ </dependency> <dependency> <groupId>org.apache.metron</groupId> - <artifactId>metron-integration-test</artifactId> - <version>${project.parent.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.metron</groupId> <artifactId>metron-test-utilities</artifactId> <version>${project.parent.version}</version> <scope>test</scope> diff --git a/metron-platform/metron-parsing/metron-parsers/pom.xml b/metron-platform/metron-parsing/metron-parsers/pom.xml index 9645fb9..9b82754 100644 --- a/metron-platform/metron-parsing/metron-parsers/pom.xml +++ b/metron-platform/metron-parsing/metron-parsers/pom.xml @@ -143,7 +143,6 @@ </excludes> </artifactSet> <transformers> - <transformer implementation="org.atteo.classindex.ClassIndexTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resources> @@ -164,6 +163,8 @@ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <mainClass></mainClass> </transformer> + <!-- ClassIndexTransformer needs to go LAST. For some reason it will clobber other transformers from operating when it is put first --> + <transformer implementation="org.atteo.classindex.ClassIndexTransformer"/> </transformers> </configuration> </execution> diff --git a/metron-platform/metron-writer/pom.xml b/metron-platform/metron-writer/pom.xml index 2205cec..f8ae4c4 100644 --- a/metron-platform/metron-writer/pom.xml +++ b/metron-platform/metron-writer/pom.xml @@ -245,12 +245,6 @@ <artifactId>stellar-common</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${global_httpclient_version}</version> - <scope>test</scope> - </dependency> </dependencies> <build>