X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=epsdk-app-onap%2Fpom.xml;h=776274734dcd7ad4fccf21bcb8632863601a9179;hb=HEAD;hp=db123b44b589254c53f1aaae56bcf053d61bfb05;hpb=83157b3d4222e01810cfb2e0a5d9dccbb72f6b1b;p=vid.git

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index db123b44b..776274734 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
         the Portal team. -->
     <groupId>org.onap.vid</groupId>
     <artifactId>epsdk-app-onap</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>8.0.2-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>ECOMP SDK Webapp for OpenSource</name>
     <description>ECOMP SDK Web Application for public release</description>
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -24,9 +24,12 @@
         <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>
-        <jackson.version>2.9.9</jackson.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>
+        <jaxb.version>2.3.2</jaxb.version>
+        <jackson.version>2.10.2</jackson.version>
+        <jackson.databind.version>2.10.2</jackson.databind.version>
+        <springframework.version>5.2.3.RELEASE</springframework.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 -->
@@ -118,7 +121,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -128,7 +131,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>2.22.2</version>
                 <configuration>
                     <includes>
                         <include>**/Test*.java</include>
@@ -155,7 +158,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.3</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -186,7 +189,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.2.0</version>
                 <configuration>
                     <skipAssembly>${skipassembly}</skipAssembly>
                     <descriptors>
@@ -268,7 +271,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>
@@ -276,6 +279,16 @@
             <artifactId>epsdk-app-common</artifactId>
             <version>${epsdk.version}</version>
             <type>jar</type>
+	    <exclusions>
+		<exclusion>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j</artifactId>
+		</exclusion>
+		<exclusion>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-api</artifactId>
+		</exclusion>
+	    </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.vid</groupId>
@@ -301,6 +314,16 @@
             <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-core</artifactId>
             <version>${epsdk.version}</version>
+	    <exclusions>
+		<exclusion>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j</artifactId>
+		</exclusion>
+		<exclusion>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-api</artifactId>
+		</exclusion>
+	    </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>
@@ -337,7 +360,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson.databind.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
@@ -365,7 +388,7 @@
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>0.9.5.4</version>
+            <version>0.9.5.5</version>
         </dependency>
         <dependency>
             <groupId>io.searchbox</groupId>
@@ -465,10 +488,18 @@
             <version>${springframework.version}</version>
         </dependency>
 
+        <!-- https://eclipse-ee4j.github.io/jaxb-ri/#maven-artifacts -->
+        <!-- API -->
         <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>
+        <!-- Runtime -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
 
     </dependencies>