Upgrade Spring Boot from 1.5.x to 2.1.6

Changes required to upgrade Babel to latest Spring Boot version.

This changelist is dependent on https://gerrit.onap.org/r/c/aai/oom/+/92293

Issue-ID: AAI-2540
Change-Id: I804b80506514d274249fa4eae36392793cb737fb
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>

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>

diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
index eae1a24..f1b3549 100644 (file)
--- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
+++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
@@ -165,7 +165,7 @@ public class AAIMicroServiceAuthCore {
             }
         } catch (FileNotFoundException e) {
             throw new AAIAuthException("Auth policy file could not be found", e);
-        } catch (JsonProcessingException e) {
+        } catch (JsonProcessingException | NullPointerException e) {
             throw new AAIAuthException("Error processing Auth policy file ", e);
         } catch (IOException e) {
             throw new AAIAuthException("Error reading Auth policy file", e);

diff --git a/src/main/java/org/onap/aai/babel/BabelApplication.java b/src/main/java/org/onap/aai/babel/BabelApplication.java
index e524e6e..b3eaee4 100644 (file)
--- a/src/main/java/org/onap/aai/babel/BabelApplication.java
+++ b/src/main/java/org/onap/aai/babel/BabelApplication.java
@@ -26,7 +26,7 @@ import org.eclipse.jetty.util.security.Password;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ImportResource;
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 187826a..9a7d699 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@ server.port=9516
 server.ssl.key-store=${CONFIG_HOME}/auth/tomcat_keystore
 server.ssl.client-auth=need
 
-server.contextPath=/services/babel-service
+server.servlet.context-path=/services/babel-service
 
 logging.config=${CONFIG_HOME}/logback.xml