From 161996dd93c63db0f8cd0e72f871431e67270b00 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 9 Dec 2020 07:37:08 -0500
Subject: Updates to support use of oparent in non-ODL dependent code

Added missing dependencies needed in oparent and dependencies-bom
to allow oparent pom to be used in ccsdk/sli for code not
directly dependent on OpenDaylight.  Also, updated to latest
springboot release and to latest released version of ONAP oparent
pom.  Note: this change does NOT address changes to compile jars as
java 11.  That change will come with the changes for ODL Aluminum.

Change-Id: I599bae0c32f5ced7eada956a0ed3b57f40461cd5
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 dependencies-bom/pom.xml                           | 28 ++++++++++--
 oparent/pom.xml                                    | 51 ++++++++++++++++++++--
 .../src/main/properties/springboot2.properties     |  4 +-
 springboot/springboot2/pom.xml                     |  6 +--
 standalone/pom.xml                                 |  2 +-
 5 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index a5e26f21..06ac0b67 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -77,12 +77,17 @@
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>
                 <version>2.2.11</version>
-              </dependency>
-              <dependency>
+            </dependency>
+            <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>2.2.11</version>
-              </dependency>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.15</version>
+            </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
@@ -120,7 +125,7 @@
                 <artifactId>javax.annotation-api</artifactId>
                 <version>1.3</version>
                 <optional>true</optional>
-              </dependency>
+            </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
@@ -214,6 +219,11 @@
                 <artifactId>jackson-jaxrs</artifactId>
                 <version>1.9.13</version>
             </dependency>
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>1.4.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
@@ -221,11 +231,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+                <artifactId>jersey-guava</artifactId>
+                <version>2.26-b03</version>
+            </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-library</artifactId>
                 <version>1.3</version>
             </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>20201115</version>
+            </dependency>
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 998c0956..6ca7c830 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -55,9 +55,13 @@
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
 
+        <mariadb.connector.version>2.1.1</mariadb.connector.version>
+        <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
+        <velocity.version>2.0</velocity.version>
+
         <dmaap.listener.version>1.1.5</dmaap.listener.version>
-        <sdc.client.version>1.4.0</sdc.client.version>
-        <sdc.tosca.version>1.6.3</sdc.tosca.version>
+        <sdc.client.version>1.4.1</sdc.client.version>
+        <sdc.tosca.version>1.6.5</sdc.tosca.version>
 
     </properties>
 
@@ -70,6 +74,14 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.3.5.RELEASE</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <dependency>
                 <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                 <artifactId>sdc-distribution-client</artifactId>
@@ -92,11 +104,39 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
-          </dependency>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.11</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -153,6 +193,11 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
                 <plugin>
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr4-maven-plugin</artifactId>
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot2.properties b/springboot/spring-boot-setup/src/main/properties/springboot2.properties
index 15dca1b9..ab784993 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot2.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot2.properties
@@ -1,5 +1,5 @@
 springbootparent.artifactId=spring-boot-starter-parent
 springbootparent.groupId=org.springframework.boot
-springbootparent.version=2.3.3.RELEASE
+springbootparent.version=2.3.5.RELEASE
 springboot.project.artifactId=spring-boot-starter-parent
-spring.version=5.2.8.RELEASE
\ No newline at end of file
+spring.version=5.2.10.RELEASE
\ No newline at end of file
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 77bd08ca..432961cf 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.3.RELEASE</version>
+        <version>2.3.5.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -101,8 +101,8 @@
         <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
 
         <!-- Spring versions -->
-        <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
-        <spring.version>5.2.8.RELEASE</spring.version>
+        <spring.boot.version>2.3.5.RELEASE</spring.boot.version>
+        <spring.version>5.2.10.RELEASE</spring.version>
 
         <!-- Kotlin versions -->
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 5de9fa9f..3c931c0b 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
-- 
cgit 1.2.3-korg