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 46dfe93..53c602a 100644 (file)
--- a/nokiav2/driver/pom.xml
+++ b/nokiav2/driver/pom.xml
@@ -40,13 +40,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>1.5.10.RELEASE</version>
+      <version>${spring.boot.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
-      <version>1.5.10.RELEASE</version>
+      <version>${spring.boot.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -61,14 +61,13 @@
       <version>1.19</version>
     </dependency>
     <dependency>
-      <!-- this does not have a compile time dependency, but is required to be able to deserialize the date to joda time -->
+      <!-- this version must be in sync with the dependency comming from spring boot -->
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <!-- this version must be in sync with the dependency comming from spring boot -->
-      <version>2.8.10</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>
@@ -85,20 +84,45 @@
       <version>9.4.8.v20171121</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>RELEASE</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>
   <build>
@@ -106,7 +130,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>