Merge "Bump guava to 28.2-jre"

[vid.git] / vid-app-common / pom.xml

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f3d75e..b894dc5 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
         inherit from a parent maven module. -->
     <groupId>org.onap.vid</groupId>
     <artifactId>vid-app-common</artifactId>
-    <version>6.0.2-SNAPSHOT</version>
+    <version>6.0.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>VID Common</name>
     <description>VID Common code for opensource version</description>
@@ -25,15 +25,17 @@
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <epsdk.version>2.5.0</epsdk.version>
-        <springframework.version>5.2.0.RELEASE</springframework.version>
+        <epsdk.version>2.6.0</epsdk.version>
+        <epsdk.overlay.version>2.5.0</epsdk.overlay.version>
+        <springframework.version>5.2.3.RELEASE</springframework.version>
         <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
         <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
          org.springframework.orm.hibernate4.HibernateTransactionManager
          so following orm.version lets epsdk-core find it -->
         <hibernate.version>4.3.11.Final</hibernate.version>
-        <jackson.version>2.10.1</jackson.version>
-        <jackson.databind.version>2.10.1</jackson.databind.version>
+        <jaxb.version>2.3.2</jaxb.version>
+        <jackson.version>2.10.2</jackson.version>
+        <jackson.databind.version>2.10.2</jackson.databind.version>
         <onap.logging.version>1.6.1</onap.logging.version>
         <jersey.version>2.29.1</jersey.version>
         <surefire.version>2.22.1</surefire.version>
@@ -562,7 +564,7 @@
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-app-overlay</artifactId>
-            <version>${epsdk.version}</version>
+            <version>${epsdk.overlay.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
@@ -872,6 +874,11 @@
             <artifactId>commons-collections4</artifactId>
             <version>4.4</version>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.4</version>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>
@@ -890,9 +897,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
 
         <dependency>
@@ -904,7 +911,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.0-jre</version>
+            <version>28.2-jre</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>