X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-app-common%2Fpom.xml;h=88c07d7e2d94d3a4f7159f9b2d45afa2e04c386d;hb=7d10f76469786a5fb3a5f439a689bed688b09658;hp=7f2b27c9fa41a09ae16fb1d8fde5edabbb27c5b4;hpb=6e08835bcfe44b02f73d349b0d87aa3591bc45e4;p=vid.git

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 7f2b27c9f..88c07d7e2 100755
--- 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>5.0.3-SNAPSHOT</version>
+    <version>6.0.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>VID Common</name>
     <description>VID Common code for opensource version</description>
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -25,16 +25,19 @@
         <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.1.9.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.9.9</jackson.version>
-        <jackson.databind.version>2.9.9.3</jackson.databind.version>
-        <jersey.version>2.29</jersey.version>
+        <jaxb.version>2.3.2</jaxb.version>
+        <jackson.version>2.10.1</jackson.version>
+        <jackson.databind.version>2.10.1</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>
         <selenium.version>3.141.59</selenium.version>
         <sonar.coverage.exclusions>**/webapp/**/*,**/*.js</sonar.coverage.exclusions>
@@ -53,7 +56,7 @@
         <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
 
         <aspectj.version>1.8.9</aspectj.version>
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.3.60</kotlin.version>
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
 
         <eirslett.version>1.6</eirslett.version>
@@ -561,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>
@@ -607,6 +610,16 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-filter-base</artifactId>
+            <version>${onap.logging.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-filter-spring</artifactId>
+            <version>${onap.logging.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -861,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>
@@ -879,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>