summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2019-04-04 21:54:00 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-04 21:54:00 +0000
commit8bd651006b7d276d35fc7a03dcc96a0f811f5585 (patch)
tree2fc1fc1e4cbded7736c606f2d1420c6b221d0495
parent07f2b06e3151cc267d990406ef7dacf0addbe8e8 (diff)
parent2a623d0f72d716b7d7212fe3f76c4e549db0df28 (diff)
Merge "upgrade spring boot to v1.5.19"
-rw-r--r--sparkybe-onap-application/pom.xml13
-rw-r--r--sparkybe-onap-service/pom.xml13
2 files changed, 24 insertions, 2 deletions
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 1916948..70c303e 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.18.RELEASE</version>
+ <version>1.5.19.RELEASE</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
@@ -62,6 +62,17 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
<dependency>
diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index c27c51c..d558246 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.18.RELEASE</version>
+ <version>1.5.19.RELEASE</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
@@ -64,6 +64,17 @@ some of the depedencies should probably have a scope of provided so they don't a
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
<dependency>