diff options
| author |   Eran (ev672n), Vosk <ev672n@att.com> | 2018-10-29 11:43:57 +0200 |
|---|---|---|
| committer | Eran (ev672n), Vosk <ev672n@att.com> | 2018-10-29 11:43:57 +0200 |
| commit | cb2a1bb438d1f2eb1a50dd80cb494bb39ab4fe1b (patch) | |
| tree | 935f442b5e988c2abb2e3993e564ec21af0e2ec9 | |
| parent | f226cd89b2da5046eff1361bcc39eeeccceb75ab (diff) | |
Merge source code
Merge source code
Change-Id: Ie0f4de131666995b089f17711579e1e8af6ff0ab
Issue-ID: SDC-1874
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
| -rw-r--r-- | pom.xml | 16 | ||||
| -rw-r--r-- | src/main/java/org/onap/sdc/common/onaplog/OnapLoggerError.java | 2 |
2 files changed, 9 insertions, 9 deletions
@@ -21,12 +21,6 @@ <dependencies> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>5.0.9.RELEASE</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>5.0.9.RELEASE</version> <scope>compile</scope> @@ -40,12 +34,12 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.7</version> + <version>2.8.5</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20140107</version> + <version>20160810</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -56,6 +50,12 @@ <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-guava</artifactId> <version>2.9.6</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerError.java b/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerError.java index ef734f6..44f8467 100644 --- a/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerError.java +++ b/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerError.java @@ -5,8 +5,8 @@ import org.onap.sdc.common.onaplog.Enums.LogMarkers; import org.onap.sdc.common.onaplog.Enums.OnapLoggerErrorCode; import org.onap.sdc.common.onaplog.interfaces.IOnapMdcWrapper; import org.slf4j.LoggerFactory; -import org.slf4j.MDC; import org.slf4j.MarkerFactory; +import org.slf4j.MDC; import static org.onap.sdc.common.onaplog.interfaces.IOnapLogConfiguration.*; |