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 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'dependencies-bom')

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>
-- 
cgit 1.2.3-korg