diff options
| -rw-r--r-- | prh-app-server/pom.xml | 20 | ||||
| -rw-r--r-- | prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java | 8 |
2 files changed, 10 insertions, 18 deletions
diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml index e5f2c8c4..f178d343 100644 --- a/prh-app-server/pom.xml +++ b/prh-app-server/pom.xml @@ -109,8 +109,8 @@ <artifactId>spring-boot-starter-web</artifactId> <exclusions> <exclusion> - <artifactId>jackson-databind</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-json</artifactId> </exclusion> </exclusions> </dependency> @@ -119,14 +119,20 @@ <artifactId>spring-boot-starter-webflux</artifactId> <exclusions> <exclusion> - <artifactId>jackson-databind</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-json</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.bouncycastle</groupId> @@ -227,12 +233,6 @@ <version>2.0.1.RELEASE</version> <type>pom</type> <scope>import</scope> - <exclusions> - <exclusion> - <artifactId>jackson-databind</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> - </exclusion> - </exclusions> </dependency> </dependencies> </dependencyManagement> diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java index 26be5133..42269d44 100644 --- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java @@ -25,25 +25,17 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; -import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Objects; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentMatchers; import org.onap.dcaegen2.services.prh.IT.junit5.mockito.MockitoExtension; -import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/9/18 |