diff options
Diffstat (limited to 'a1-policy-management')
| -rw-r--r-- | a1-policy-management/pom.xml | 121 | ||||
| -rw-r--r-- | a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/aspect/LogAspectTest.java | 6 |
2 files changed, 73 insertions, 54 deletions
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index 81a3b5cb..495b882d 100644 --- a/a1-policy-management/pom.xml +++ b/a1-policy-management/pom.xml @@ -39,21 +39,16 @@ <properties> <java.version.source>11</java.version.source> <java.version.target>11</java.version.target> - <springfox.version>2.9.2</springfox.version> - <immutable.version>2.8.2</immutable.version> + <springfox.version>2.9.2</springfox.version><!-- Do not change to version 3.0.0! Will break the generated json. --> + <immutable.version>2.8.8</immutable.version> <sdk.version>1.1.6</sdk.version> - <swagger.version>2.0.0</swagger.version> - <json.version>20190722</json.version> - <commons-net.version>3.6</commons-net.version> + <json.version>20200518</json.version> + <formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version> + <spotless-maven-plugin.version>2.5.0</spotless-maven-plugin.version> <commons-io.version>2.5</commons-io.version> - <maven.compile.plugin.version>3.8.0</maven.compile.plugin.version> - <formatter-maven-plugin.version>2.8.1</formatter-maven-plugin.version> - <spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version> <docker-maven-plugin>0.30.0</docker-maven-plugin> - <version.dmaap>1.1.11</version.dmaap> - <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version> - <surefire-maven-plugin.version>2.22.2</surefire-maven-plugin.version><!-- Version must be this for tests to be run. Do not remove! --> - <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version> + <surefire-maven-plugin.version>3.0.0-M5</surefire-maven-plugin.version><!-- Version must be higher than version 2.19.1 that is defined in the parent pom for JUnit 5 tests to be run. Do not remove! --> + <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version> <exec.skip>true</exec.skip> <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> @@ -61,42 +56,71 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> + <artifactId>spring-boot</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-thymeleaf</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-webflux</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-aop</artifactId> + <artifactId>spring-boot-autoconfigure</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <optional>true</optional> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webflux</artifactId> </dependency> <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-jaxrs2</artifactId> - <version>${swagger.version}</version> + <groupId>io.springfox</groupId> + <artifactId>springfox-spring-web</artifactId> + <version>${springfox.version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-spi</artifactId> + <version>${springfox.version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-core</artifactId> + <version>${springfox.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + </dependency> + <dependency> + <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> + <artifactId>cbs-client</artifactId> + <version>${sdk.version}</version> </dependency> <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-jaxrs2-servlet-initializer</artifactId> - <version>${swagger.version}</version> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.immutables</groupId> @@ -115,33 +139,15 @@ <version>${json.version}</version> </dependency> <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>${commons-net.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> - <artifactId>cbs-client</artifactId> - <version>${sdk.version}</version> - </dependency> - <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - </dependency> <!-- Actuator dependencies --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> + <scope>runtime</scope> </dependency> <!--REQUIRED TO GENERATE DOCUMENTATION --> <dependency> @@ -153,10 +159,29 @@ <groupId>io.springfox</groupId> <artifactId>springfox-swagger-ui</artifactId> <version>${springfox.version}</version> + <scope>runtime</scope> + </dependency> + <!-- For development help --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <optional>true</optional> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <optional>true</optional> + <scope>runtime</scope> </dependency> <!-- TEST --> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/aspect/LogAspectTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/aspect/LogAspectTest.java index 339a8252..65dc8b5a 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/aspect/LogAspectTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/aspect/LogAspectTest.java @@ -32,20 +32,14 @@ import ch.qos.logback.core.read.ListAppender; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; -import org.junit.Rule; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; import org.mockito.junit.jupiter.MockitoExtension; import org.onap.ccsdk.oran.a1policymanagementservice.utils.LoggingUtils; @ExtendWith(MockitoExtension.class) class LogAspectTest { - @Rule - MockitoRule mockitoRule = MockitoJUnit.rule(); - @Mock private ProceedingJoinPoint proceedingJoinPoint; |