Upgrade to springboot 2.5

Upgrade to springboot version 2.5 to address third party vulnerabilities

Issue-ID: CCSDK-3415
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Id7d3d3ab9bf161600412b33862526181f2444224

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 4734ba9..1467ed4 100644 (file)
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -234,7 +234,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
+        <artifactId>spring-boot-25-starter-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -343,7 +343,7 @@
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>7.6.1</version>
+            <version>7.13.4</version>
         </dependency>
         <dependency>
             <groupId>io.searchbox</groupId>

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index e93f70a..a9ffec0 100644 (file)
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
+        <artifactId>spring-boot-25-starter-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -68,13 +68,8 @@
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>${springfox.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
@@ -97,6 +92,12 @@
             <artifactId>aaf-misc-env</artifactId>
             <version>${aaf.cadi.version}</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
@@ -514,6 +515,7 @@
                                                     <MYSQL_USER>sli</MYSQL_USER>
                                                     <MYSQL_PASSWORD>abc123</MYSQL_PASSWORD>
                                                     <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <MYSQL_HOST>dbhost</MYSQL_HOST>
                                                     <SDNC_CONFIG_DIR>/opt/onap/ccsdk/config</SDNC_CONFIG_DIR>
                                                 </env>
                                                 <dependsOn>

diff --git a/ms/sliboot/src/main/dc/docker-compose.yaml b/ms/sliboot/src/main/dc/docker-compose.yaml
index 31d0680..7b85745 100755 (executable)
--- a/ms/sliboot/src/main/dc/docker-compose.yaml
+++ b/ms/sliboot/src/main/dc/docker-compose.yaml
@@ -7,11 +7,11 @@ services:
     ports:
       - "13306:3306"
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_ROOT_HOST=%
-      - MYSQL_USER=sli
-      - MYSQL_PASSWORD=abc123
-      - MYSQL_DATABASE=sdnctl
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
     logging:       
       driver:   "json-file"
       options:  
@@ -30,10 +30,11 @@ services:
     links:
       - db:dbhost
     environment:
-      - MYSQL_DB_HOST=dbhost
-      - MYSQL_DB_USER=sli
-      - MYSQL_DB_PASSWD=abc123
-      - MYSQL_DB_DATABASE=sdnctl
+      - MYSQL_HOST=dbhost
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - SDNC_CONFIG_DIR=/opt/onap/ccsdk/config
     logging:       
       driver:   "json-file"

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
index 36048ea..beab256 100644 (file)
--- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
@@ -41,7 +41,7 @@ import org.onap.aaf.cadi.filter.CadiFilter;
 @EnableJpaRepositories("org.onap.ccsdk.apps.ms.sliboot.*")\r
 @EntityScan("org.onap.ccsdk.apps.ms.sliboot.*")\r
 @EnableTransactionManagement\r
-@EnableSwagger2\r
+// @EnableSwagger2\r
 public class SlibootApp {\r
 \r
   private static final Logger log = LoggerFactory.getLogger(SlibootApp.class);\r

diff --git a/ms/sliboot/src/main/resources/application.properties b/ms/sliboot/src/main/resources/application.properties
index 6d8b666..d98aac3 100644 (file)
--- a/ms/sliboot/src/main/resources/application.properties
+++ b/ms/sliboot/src/main/resources/application.properties
@@ -14,7 +14,7 @@ spring.jackson.date-format=org.onap.ccsdk.apps.ms.sliboot.swagger.RFC3339DateFor
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
 logging.level.com.att=TRACE
 logging.level.org.onap=TRACE
-spring.datasource.url=jdbc:mariadb://${MYSQL_DB_HOST}:3306/sdnctl
+spring.datasource.url=jdbc:mariadb://${MYSQL_DB_HOST}:3306/${MYSQL_DATABASE}
 spring.datasource.username=${MYSQL_USER}
 spring.datasource.password=${MYSQL_PASSWORD}
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
@@ -24,4 +24,4 @@ spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-spring.jpa.database=mysql
\ No newline at end of file
+spring.jpa.database=mysql

diff --git a/ms/sliboot/src/main/resources/dblib.properties b/ms/sliboot/src/main/resources/dblib.properties
index b9d9806..b166390 100644 (file)
--- a/ms/sliboot/src/main/resources/dblib.properties
+++ b/ms/sliboot/src/main/resources/dblib.properties
@@ -22,12 +22,12 @@
 # dblib.properrties
 org.onap.ccsdk.sli.dbtype=jdbc
 
-org.onap.ccsdk.sli.jdbc.hosts=dbhost
-org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.hosts=${MYSQL_HOST}
+org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://${MYSQL_HOST}:3306/${MYSQL_DATABASE}
 org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
-org.onap.ccsdk.sli.jdbc.database=sdnctl
-org.onap.ccsdk.sli.jdbc.user=sli
-org.onap.ccsdk.sli.jdbc.password=abc123
+org.onap.ccsdk.sli.jdbc.database=${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER}
+org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD}
 org.onap.ccsdk.sli.jdbc.connection.name=dbhost
 org.onap.ccsdk.sli.jdbc.connection.timeout=50
 org.onap.ccsdk.sli.jdbc.request.timeout=100

diff --git a/ms/sliboot/src/main/resources/svclogic.properties b/ms/sliboot/src/main/resources/svclogic.properties
index 76865dd..4dd6b0b 100644 (file)
--- a/ms/sliboot/src/main/resources/svclogic.properties
+++ b/ms/sliboot/src/main/resources/svclogic.properties
@@ -20,10 +20,10 @@
 ###
 
 org.onap.ccsdk.sli.dbtype = jdbc
-org.onap.ccsdk.sli.jdbc.url=jdbc:mariadb://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.url=jdbc:mariadb://${MYSQL_HOST}:3306/${MYSQL_DATABASE}
 org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
-org.onap.ccsdk.sli.jdbc.database = sdnctl
-org.onap.ccsdk.sli.jdbc.user = sli
-org.onap.ccsdk.sli.jdbc.password = abc123
+org.onap.ccsdk.sli.jdbc.database = ${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.user = ${MYSQL_USER}
+org.onap.ccsdk.sli.jdbc.password = ${MYSQL_PASSWORD}
 
 sliapi.serviceLogicDirectory=/opt/onap/sdnc/svclogic/graphs

diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 4ee6001..f21416a 100644 (file)
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -32,7 +32,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
+        <artifactId>spring-boot-25-starter-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>

diff --git a/services/pom.xml b/services/pom.xml
index 56ead63..5328b55 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
+        <artifactId>spring-boot-25-starter-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -51,13 +51,8 @@
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>${springfox.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>