summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nokiav2/driver/pom.xml46
-rw-r--r--nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/RealConfig.java2
-rw-r--r--nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/ServletInitializer.java2
-rw-r--r--nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/TestRealConfig.java2
-rw-r--r--nokiav2/pom.xml6
5 files changed, 40 insertions, 18 deletions
diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml
index a06b4166..53c602a9 100644
--- 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>
diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/RealConfig.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/RealConfig.java
index 3ed94c94..ddf7df31 100644
--- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/RealConfig.java
+++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/RealConfig.java
@@ -15,7 +15,7 @@
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.spring;
-import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.GsonHttpMessageConverter;
diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/ServletInitializer.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/ServletInitializer.java
index fe1bb183..79d3d921 100644
--- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/ServletInitializer.java
+++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/ServletInitializer.java
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.spring;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.NokiaSvnfmApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/**
* Responsible for initializing the Spring application
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/TestRealConfig.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/TestRealConfig.java
index 1c92a75a..6caeb3a9 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/TestRealConfig.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/spring/TestRealConfig.java
@@ -21,7 +21,7 @@ import com.nokia.cbam.lcm.v32.model.VnfIdentifierDeletionNotification;
import com.nokia.cbam.lcm.v32.model.VnfInfoAttributeValueChangeNotification;
import com.nokia.cbam.lcm.v32.model.VnfLifecycleChangeNotification;
import org.junit.Test;
-import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.http.MediaType;
public class TestRealConfig {
diff --git a/nokiav2/pom.xml b/nokiav2/pom.xml
index 6ada74f7..879ac373 100644
--- a/nokiav2/pom.xml
+++ b/nokiav2/pom.xml
@@ -28,8 +28,7 @@
<name>vfc-nfvo-driver-vnfm-svnfm-nokiav2</name>
<properties>
<jacoco.version>0.8.0</jacoco.version>
- <spring.boot.version>1.5.10.RELEASE</spring.boot.version>
-<!-- <spring.boot.version>2.0.0.RELEASE</spring.boot.version> -->
+ <spring.boot.version>2.0.0.RELEASE</spring.boot.version>
</properties>
<!--
<build>
@@ -45,6 +44,7 @@
<rules>
<DependencyConvergence/>
</rules>
+ <fail>false</fail>
</configuration>
<goals>
<goal>enforce</goal>
@@ -54,7 +54,7 @@
</plugin>
</plugins>
</build>
- -->
+-->
<modules>
<module>generatedapis</module>
<module>driver</module>