From: Ittay Stern <ittay.stern@att.com>
Date: Thu, 10 Jan 2019 12:42:59 +0000 (+0000)
Subject: Merge "Merge from ECOMP's repository"
X-Git-Tag: 4.0.0~100
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=659874df80409170e57b6dd6197eb3a81eb3468e;p=vid.git

Merge "Merge from ECOMP's repository"
---

659874df80409170e57b6dd6197eb3a81eb3468e
diff --cc epsdk-app-onap/pom.xml
index fb80e2409,235716bd8..f2441b357
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@@ -127,8 -129,9 +127,8 @@@
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-surefire-plugin</artifactId>
-                 <version>2.19.1</version>
+                 <version>2.22.1</version>
                  <configuration>
 -                    <skipTests>${skiptests}</skipTests>
                      <includes>
                          <include>**/Test*.java</include>
                          <include>**/*Test.java</include>
diff --cc vid-app-common/pom.xml
index 9a01c6cce,79d8cdd4f..7cd30a21f
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@@ -21,8 -21,14 +21,12 @@@
          <epsdk.version>2.4.0</epsdk.version>
          <springframework.version>4.2.9.RELEASE</springframework.version>
          <hibernate.version>4.3.11.Final</hibernate.version>
+         <jackson.version>2.9.7</jackson.version>
+         <jersey.version>2.27</jersey.version>
+         <surefire.version>2.22.1</surefire.version>
+ 
          <!-- Skip assembling the zip by default -->
          <skipassembly>true</skipassembly>
 -        <!-- Tests usually require some setup that maven cannot do, so skip. -->
 -        <skiptests>false</skiptests>
          <nexusproxy>https://nexus.onap.org</nexusproxy>
          <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
          <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@@ -153,8 -196,9 +194,8 @@@
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-surefire-plugin</artifactId>
-                 <version>2.19.1</version>
+                 <version>${surefire.version}</version>
                  <configuration>
 -                    <skipTests>${skiptests}</skipTests>
                      <includes>
                          <include>**/Test*.java</include>
                          <include>**/*Test.java</include>