diff options
Diffstat (limited to 'dcaedt_catalog')
| -rw-r--r-- | dcaedt_catalog/api/pom.xml | 15 | ||||
| -rw-r--r-- | dcaedt_catalog/asdc/pom.xml | 29 | ||||
| -rw-r--r-- | dcaedt_catalog/asdc/src/test/java/org/onap/sdc/dcae/utils/SDCResponseErrorHandlerTest.java | 5 | ||||
| -rw-r--r-- | dcaedt_catalog/service/pom.xml | 8 |
4 files changed, 40 insertions, 17 deletions
diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml index f6925db..950ced8 100644 --- a/dcaedt_catalog/api/pom.xml +++ b/dcaedt_catalog/api/pom.xml @@ -177,8 +177,19 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.10.19</version> + <artifactId>mockito-all</artifactId> + <version>2.0.2-beta</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.8.16</version> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.8.16</version> <scope>test</scope> </dependency> diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml index 1414a91..2ecf3ff 100644 --- a/dcaedt_catalog/asdc/pom.xml +++ b/dcaedt_catalog/asdc/pom.xml @@ -44,9 +44,10 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>1.3.3.RELEASE</version> + <version>2.0.5.RELEASE</version> <configuration> <mainClass>org.onap.sdc.dcae.catalog.asdc.ASDCEngine</mainClass> + <classifier>exec</classifier> </configuration> <executions> <execution> @@ -78,7 +79,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>1.4.1.RELEASE</version> + <version>2.0.5.RELEASE</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -88,7 +89,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-autoconfigure</artifactId> - <version>1.4.1.RELEASE</version> + <version>2.0.5.RELEASE</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -125,10 +126,22 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>2.0.2-beta</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.8.16</version> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.8.16</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/dcaedt_catalog/asdc/src/test/java/org/onap/sdc/dcae/utils/SDCResponseErrorHandlerTest.java b/dcaedt_catalog/asdc/src/test/java/org/onap/sdc/dcae/utils/SDCResponseErrorHandlerTest.java index 15c4a8a..82eec21 100644 --- a/dcaedt_catalog/asdc/src/test/java/org/onap/sdc/dcae/utils/SDCResponseErrorHandlerTest.java +++ b/dcaedt_catalog/asdc/src/test/java/org/onap/sdc/dcae/utils/SDCResponseErrorHandlerTest.java @@ -3,9 +3,8 @@ package org.onap.sdc.dcae.utils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.MockitoAnnotations; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpResponse; @@ -15,7 +14,6 @@ import org.springframework.web.client.HttpServerErrorException; import java.io.IOException; import java.io.InputStream; -@RunWith(MockitoJUnitRunner.class) public class SDCResponseErrorHandlerTest { @InjectMocks private SDCResponseErrorHandler classUnderTest; @@ -24,6 +22,7 @@ public class SDCResponseErrorHandlerTest { @Before public void setup() { + MockitoAnnotations.initMocks(this); clientHttpResponse = new ClientHttpResponse() { @Override public HttpStatus getStatusCode() throws IOException { diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml index b4f20d2..85a3019 100644 --- a/dcaedt_catalog/service/pom.xml +++ b/dcaedt_catalog/service/pom.xml @@ -26,9 +26,9 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>1.3.3.RELEASE</version> + <version>2.0.5.RELEASE</version> <configuration> - <mainClass>org.onap.sdc.dcae.catalog.engine.CatalogEngine</mainClass> + <classifier>exec</classifier> </configuration> <executions> <execution> @@ -60,7 +60,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>1.4.1.RELEASE</version> + <version>2.0.5.RELEASE</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -70,7 +70,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-autoconfigure</artifactId> - <version>1.4.1.RELEASE</version> + <version>2.0.5.RELEASE</version> </dependency> <dependency> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> |