Upgrade Spring Boot from 1.5.x to 2.1.6

[aai/babel.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 65a963d..2c762b2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,8 @@
     ============LICENSE_END=========================================================
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
@@ -42,7 +43,7 @@
 
        <properties>
                <!-- Spring boot version -->
-               <spring.boot.version>1.5.19.RELEASE</spring.boot.version>
+               <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
 
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -88,11 +89,11 @@
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-jersey</artifactId>
-                       <exclusions>
-                         <exclusion>
-                           <groupId>org.springframework.boot</groupId>
-                           <artifactId>spring-boot-starter-tomcat</artifactId>
-                         </exclusion>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.springframework.boot</groupId>
+                                       <artifactId>spring-boot-starter-tomcat</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -122,7 +123,6 @@
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
-                       <version>${apache.lang3.version}</version>
                </dependency>
                <dependency>
                        <groupId>javax.ws.rs</groupId>
@@ -131,7 +131,7 @@
                </dependency>
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>
-                       <artifactId>groovy-all</artifactId>
+                       <artifactId>groovy</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.onap.sdc.sdc-tosca</groupId>
@@ -175,7 +175,7 @@
                                        <jvmArguments>
                                                -DCONFIG_HOME=./appconfig-local
                                                -DAPP_HOME=.
-                                                -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
+                                               -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
                                                -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
                                        </jvmArguments>
                                </configuration>