Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml
index f8bd6460b..dfd61aae2 100644
--- a/vid-automation/pom.xml
+++ b/vid-automation/pom.xml
@@ -6,19 +6,18 @@
     <artifactId>automationTest</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <springframework.version>4.2.0.RELEASE</springframework.version>
+        <springframework.version>4.2.9.RELEASE</springframework.version>
         <jersey.version>2.23.1</jersey.version>
         <jackson.version>2.6.3</jackson.version>
         <aspectj.version>1.8.10</aspectj.version>
 
     </properties>
 
-
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-
+            <version>23.0</version>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
@@ -32,11 +31,11 @@
             	</exclusion>
             </exclusions>
         </dependency>
-<!--         <dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-        </dependency> -->
+            <version>1.2.17</version>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>