Code Review
/
oparent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump oparent 3.2.1-SNAPSHOT
[oparent.git]
/
dependencies
/
pom.xml
diff --git
a/dependencies/pom.xml
b/dependencies/pom.xml
index
55023bc
..
705e580
100644
(file)
--- a/
dependencies/pom.xml
+++ b/
dependencies/pom.xml
@@
-1,6
+1,7
@@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018 AT&T Technologies and others.
+ Copyright (c) 2018-2020 AT&T Technologies and others.
+ Modifications Copyright (C) 2020 Bell Canada.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-19,83
+20,97
@@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
- <version>
1.2.2
-SNAPSHOT</version>
+ <version>
3.2.1
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dependencies</artifactId>
<name>oparent/dependencies</name>
<packaging>pom</packaging>
<relativePath>..</relativePath>
</parent>
<artifactId>dependencies</artifactId>
<name>oparent/dependencies</name>
<packaging>pom</packaging>
+ <properties>
+ <spring.version>5.2.10.RELEASE</spring.version>
+ <jetty.version>9.4.33.v20201020</jetty.version>
+ </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>
26
.0-jre</version>
+ <version>
30
.0-jre</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>
9.4.12.v20180830
</version>
+ <version>
${jetty.version}
</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>9.4.12.v20180830</version>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.12.v20180830</version>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>
5.0.9.RELEASE
</version>
+ <version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>
5.0.9.RELEASE
</version>
+ <version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>
5.0.9.RELEASE
</version>
+ <version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>
5.0.9.RELEASE
</version>
+ <version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.9.
3
</version>
+ <version>1.9.
4
</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>9.0.12</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <version>9.0.39</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
- <version>4.
1.2
</version>
+ <version>4.
5.3
</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.6</version>
+ <version>2.11.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.11.3</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
- <version>3.
3.1-
1</version>
+ <version>3.
5.
1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@
-105,7
+120,7
@@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.
6
</version>
+ <version>4.5.
13
</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
</dependency>
<dependency>
<groupId>xerces</groupId>