summaryrefslogtreecommitdiffstats
path: root/components/parent/pom.xml
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-03-31 12:42:12 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-31 12:42:12 +0000
commitea8fd6be7ad470d398ce029f2866e1ce3e44474b (patch)
tree5111c4e59ed8842d8f69b5c8279d7afa4d136f11 /components/parent/pom.xml
parent20eda4bcdd1c32890d0a16a556cee1bfbbc08353 (diff)
parentc4efe038f0a604a59331c69b34a415514a98a7df (diff)
Merge "Fix logging dependency conflict"
Diffstat (limited to 'components/parent/pom.xml')
-rw-r--r--components/parent/pom.xml37
1 files changed, 18 insertions, 19 deletions
diff --git a/components/parent/pom.xml b/components/parent/pom.xml
index dc0795f5d..d6b40d74a 100644
--- a/components/parent/pom.xml
+++ b/components/parent/pom.xml
@@ -54,22 +54,17 @@
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- <version>${eelf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-slf4j</artifactId>
- <version>${onap.logger.slf4j}</version>
- </dependency>
-
<!--Swagger Dependencies -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${springfox.swagger2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
@@ -232,14 +227,6 @@
<dependencies>
<dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-slf4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
@@ -258,6 +245,12 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -266,6 +259,12 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>