diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-03-31 12:42:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-31 12:42:12 +0000 |
| commit | ea8fd6be7ad470d398ce029f2866e1ce3e44474b (patch) | |
| tree | 5111c4e59ed8842d8f69b5c8279d7afa4d136f11 /ms/controllerblueprints/parent/pom.xml | |
| parent | 20eda4bcdd1c32890d0a16a556cee1bfbbc08353 (diff) | |
| parent | c4efe038f0a604a59331c69b34a415514a98a7df (diff) | |
Merge "Fix logging dependency conflict"
Diffstat (limited to 'ms/controllerblueprints/parent/pom.xml')
| -rw-r--r-- | ms/controllerblueprints/parent/pom.xml | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml index 3fc5084ff..50cfae197 100644 --- a/ms/controllerblueprints/parent/pom.xml +++ b/ms/controllerblueprints/parent/pom.xml @@ -56,14 +56,9 @@ </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> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-logging</artifactId> + <version>${spring.boot.version}</version> </dependency> <!--Swagger Dependencies --> @@ -71,6 +66,12 @@ <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> @@ -282,14 +283,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> @@ -308,6 +301,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> @@ -316,6 +315,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> |