Upgrade spring security issue

[vfc/nfvo/driver/vnfm/svnfm.git] / nokiav2 / driver / pom.xml

diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml
index a06b416..53c602a 100644 (file)
--- a/nokiav2/driver/pom.xml
+++ b/nokiav2/driver/pom.xml
@@ -60,14 +60,14 @@
       <artifactId>snakeyaml</artifactId>
       <version>1.19</version>
     </dependency>
-    <!-- this version must be in sync with the dependency comming from spring boot -->
     <dependency>
+      <!-- this version must be in sync with the dependency comming from spring boot -->
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>2.9.3</version>
+      <version>2.9.4</version>
     </dependency>
-    <!-- access MSB during registration -->
     <dependency>
+      <!-- access MSB during registration -->
       <groupId>org.onap.msb.java-sdk</groupId>
       <artifactId>msb-java-sdk</artifactId>
       <version>1.1.0-SNAPSHOT</version>
@@ -84,25 +84,47 @@
       <version>9.4.8.v20171121</version>
       <scope>test</scope>
     </dependency>
-<!--
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>16.0.1</version>
-    </dependency>
--->
     <dependency>
       <groupId>org.onap.aai.aai-common</groupId>
       <artifactId>aai-schema</artifactId>
       <version>1.2.0</version>
+      <exclusions>
+        <!-- Can be removed if https://jira.onap.org/browse/AAI-894 is fixed -->
+        <exclusion>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-module-junit4</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-api-mockito</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.onap.aai</groupId>
       <artifactId>rest-client</artifactId>
       <version>1.2.0</version>
+      <exclusions>
+        <!-- Can be removed if https://jira.onap.org/browse/AAI-894 is fixed -->
+        <exclusion>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-module-junit4</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-api-mockito</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-
- </dependencies>
+  </dependencies>
   <build>
     <plugins>
       <plugin>