summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorEran (ev672n), Vosk <ev672n@att.com>2018-10-29 11:43:57 +0200
committerEran (ev672n), Vosk <ev672n@att.com>2018-10-29 11:43:57 +0200
commitcb2a1bb438d1f2eb1a50dd80cb494bb39ab4fe1b (patch)
tree935f442b5e988c2abb2e3993e564ec21af0e2ec9 /pom.xml
parentf226cd89b2da5046eff1361bcc39eeeccceb75ab (diff)
Merge source code
Merge source code Change-Id: Ie0f4de131666995b089f17711579e1e8af6ff0ab Issue-ID: SDC-1874 Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/pom.xml b/pom.xml
index 2f4ee6f..f35d2dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>