diff options
| -rw-r--r-- | certService/pom.xml | 59 | ||||
| -rw-r--r-- | certServiceClient/pom.xml | 21 | ||||
| -rw-r--r-- | certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java | 1 | ||||
| -rw-r--r-- | certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java | 1 | ||||
| -rw-r--r-- | pom.xml | 80 |
5 files changed, 90 insertions, 72 deletions
diff --git a/certService/pom.xml b/certService/pom.xml index a8a5296c..51588f16 100644 --- a/certService/pom.xml +++ b/certService/pom.xml @@ -74,67 +74,18 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - <execution> - <id>pre-integration-test</id> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>post-integration-test</id> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <verbose>false</verbose> - <useStandardDocletOptions>false</useStandardDocletOptions> - <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> - </configuration> - <executions> - <execution> - <id>aggregate</id> - <phase>site</phase> - <goals> - <goal>aggregate</goal> - </goals> - </execution> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.springdoc</groupId> <artifactId>springdoc-openapi-maven-plugin</artifactId> - <version>${springdoc-openapi-maven-plugin.version}</version> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <apiDocsUrl>${springdoc-openapi-maven-plugin.apiDocsUrl}</apiDocsUrl> - <outputFileName>api-docs.json</outputFileName> - <outputDir>${project.build.directory}</outputDir> - </configuration> </plugin> </plugins> </build> diff --git a/certServiceClient/pom.xml b/certServiceClient/pom.xml index 2b4f2d02..2f3aa62e 100644 --- a/certServiceClient/pom.xml +++ b/certServiceClient/pom.xml @@ -16,26 +16,29 @@ <packaging>jar</packaging> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> </build> <dependencies> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> </dependency> + </dependencies> diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java index f3b1c0f3..8b200be3 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java @@ -23,6 +23,5 @@ package org.onap.aaf.certservice.client; public class CertServiceClientApp { public static void main(String[] args) { - System.exit(0); } }
\ No newline at end of file diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java index a79095c4..e9d169a0 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java +++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java @@ -22,6 +22,7 @@ package org.onap.aaf.certservice.client; import org.junit.jupiter.api.Test; class CertServiceClientAppTest { + // Sonar check for this test disabled due to lack of assertion in test. // Intention of this test is to check if app runs without exiting Java. @Test @@ -52,7 +52,7 @@ <springdoc-openapi-maven-plugin.version>0.2</springdoc-openapi-maven-plugin.version> <gson.version>2.8.6</gson.version> <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version> - <junit.version>5.6.0</junit.version> + <junit.version>5.5.2</junit.version> <!-- Docker --> <skipDockerPush>true</skipDockerPush> @@ -75,13 +75,72 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.springdoc</groupId> + <artifactId>springdoc-openapi-maven-plugin</artifactId> + <version>${springdoc-openapi-maven-plugin.version}</version> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <apiDocsUrl>${springdoc-openapi-maven-plugin.apiDocsUrl}</apiDocsUrl> + <outputFileName>api-docs.json</outputFileName> + <outputDir>${project.build.directory}</outputDir> + </configuration> + </plugin> + <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <version>${spring-boot-starter.version}</version> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + <execution> + <id>pre-integration-test</id> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>post-integration-test</id> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>${maven-javadoc-plugin.version}</version> + <configuration> + <quiet>true</quiet> + <verbose>false</verbose> + <useStandardDocletOptions>false</useStandardDocletOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> + </configuration> + <executions> + <execution> + <id>aggregate</id> + <phase>site</phase> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -175,7 +234,12 @@ </dependency> <!-- Test dependecies --> - + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj-core.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> @@ -183,15 +247,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito-core.version}</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <version>${assertj-core.version}</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito-core.version}</version> <scope>test</scope> </dependency> </dependencies> |