Fix VFCNS termination invocation

[so.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 263a632..ed64d08 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,6 @@
   <groupId>org.onap.so</groupId>
   <artifactId>so</artifactId>
   <packaging>pom</packaging>
-  <!-- <version>1.2.0-SNAPSHOT</version> -->
   <version>1.2.0-SNAPSHOT</version>
   <name>so</name>
   <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project.
@@ -47,10 +46,9 @@
     <org.apache.maven.user-settings></org.apache.maven.user-settings>
     <!-- this is used for Chef mso-code cookbook -->
     <swm.version>2.19.3-1</swm.version>
-    <!-- <openstack.version>1.2.0-SNAPSHOT</openstack.version> -->
-       <openstack.version>1.2.0</openstack.version>
+       <openstack.version>1.2.1</openstack.version>
     <nexusproxy>https://nexus.onap.org</nexusproxy>
-    <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
+    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     <resteasy.version>3.0.19.Final</resteasy.version>
   </properties>
   <distributionManagement>
@@ -434,21 +432,24 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>
-      <version>${resteasy.version}</version>
+      <version>3.1.0.Final</version>
     </dependency>
-    <dependency>
+       <dependency>
+               <groupId>org.hamcrest</groupId>
+               <artifactId>hamcrest-core</artifactId>
+               <version>1.3</version>
+       </dependency>
+       <dependency>
+               <groupId>org.hamcrest</groupId>
+               <artifactId>hamcrest-all</artifactId>
+               <version>1.3</version>
+       </dependency>
+       <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jmockit</groupId>
       <artifactId>jmockit</artifactId>
@@ -473,12 +474,6 @@
       <version>1.6.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock</artifactId>
@@ -549,7 +544,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.1</version>
+        <version>4.4.4</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -564,12 +559,6 @@
         <version>2.5</version>
         <scope>compile</scope>
       </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>1.3</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
@@ -588,6 +577,12 @@
         <version>1.2.13</version>
         <scope>compile</scope>
       </dependency>
+         <dependency>
+               <groupId>org.mockito</groupId>
+               <artifactId>mockito-core</artifactId>
+               <version>1.10.19</version>
+               <scope>test</scope>
+         </dependency>
     </dependencies>
   </dependencyManagement>
 </project>