From 94a7c372094fb6c8f342dfd04984a34c975eb849 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Wed, 9 Jun 2021 12:14:54 -0400
Subject: Making changes as per SILICON ODL Adding few dependencies and
 refactoring sli versioning

Issue-ID: CCSDK-3331
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I9678e4b4401791a98499ab3c39ef5b24e404aea8
---
 dependencies/pom.xml | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to 'dependencies')

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 190559a1..5d02b381 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -8,9 +8,7 @@
         <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>dependencies</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ${project.artifactId}</name>
@@ -21,17 +19,10 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-              <groupId>org.glassfish.jersey</groupId>
-              <artifactId>jersey-bom</artifactId>
-              <version>2.27</version>
-              <scope>import</scope>
-              <type>pom</type>
-          </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.1.1</version>
+                <version>2.2.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -43,7 +34,6 @@
         </dependencies>
     </dependencyManagement>
 
-
     <dependencies>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -77,10 +67,6 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
@@ -89,6 +75,20 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+        </dependency>
+        <!-- Below provides javax.jws -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-ri</artifactId>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
@@ -154,6 +154,10 @@
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-filter-base</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
@@ -179,6 +183,16 @@
             <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
             <version>2.3_1</version>
         </dependency>
+        <!-- Below is required by com.google.guava : guava : jar : 28.2-jre -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>listenablefuture</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <version>2.3.4</version>
+        </dependency>
     </dependencies>
 
     <build>
-- 
cgit 1.2.3-korg