aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-06-10 14:09:13 -0400
committerPamela Dragosh <pdragosh@research.att.com>2020-06-10 14:14:39 -0400
commit70bb8d1679f52f474f4d13c3ad11fb7bfd29c5a3 (patch)
tree6fe9879d021d44fb254cb9079f339182070ce60d
parenta05e6d3edd5fbee93b9731ca9c9d7fd4c9911a57 (diff)
Upgrade elalto oparent dependencies
Pushed to latest dependencies for most of the dependencies. Issue-ID: INT-1487 Change-Id: Ica36ab874a80a4565bf41806acf9ebd991c4683d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--.gitreview1
-rw-r--r--dependencies-clm/pom.xml6
-rw-r--r--dependencies/pom.xml28
3 files changed, 16 insertions, 19 deletions
diff --git a/.gitreview b/.gitreview
index eb7f5fc..042b723 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=gerrit.onap.org
port=29418
project=oparent.git
+defaultbranch=elalto
diff --git a/dependencies-clm/pom.xml b/dependencies-clm/pom.xml
index 6b8324a..1cb2330 100644
--- a/dependencies-clm/pom.xml
+++ b/dependencies-clm/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018 AT&T Technologies and others.
+ Copyright (c) 2018,2020 AT&T Technologies and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -71,10 +71,6 @@
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
- <dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
</dependency>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index aafb354..30922d3 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018 AT&T Technologies and others.
+ Copyright (c) 2018-2020 AT&T Technologies and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,15 +26,15 @@
<name>oparent/dependencies</name>
<packaging>pom</packaging>
<properties>
- <spring.version>5.1.2.RELEASE</spring.version>
- <jetty.version>9.4.20.v20190813</jetty.version>
+ <spring.version>5.2.7.RELEASE</spring.version>
+ <jetty.version>9.4.29.v20200521</jetty.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.0-jre</version>
+ <version>29.0-jre</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -84,27 +84,27 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>9.0.24</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <version>9.0.36</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
- <version>4.2.1</version>
+ <version>4.5.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.8</version>
+ <version>2.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
- <version>3.4.1</version>
+ <version>3.5.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.7</version>
+ <version>4.5.12</version>
</dependency>
<dependency>
<groupId>xerces</groupId>