X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=ec7ec1156fc0d2dcee487ed55e9c91cae5689822;hb=12594ee752b79605c61ff019fdeb471bf7ca4058;hp=8393442a9474c2019a47584a64afeac28966c3c8;hpb=5fd9f5fb1dabb4fcc9c117c630b2fbbfc3a25e56;p=oom%2Fplatform%2Fcert-service.git

diff --git a/pom.xml b/pom.xml
index 8393442a..ec7ec115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
         <artifactId>oparent</artifactId>
         <version>3.0.0</version>
     </parent>
-    <groupId>org.onap.aaf.certservice</groupId>
-    <artifactId>aaf-certservice</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>aaf-certservice</name>
-    <description>AAF Certification Service</description>
+    <groupId>org.onap.oom.platform.cert-service</groupId>
+    <artifactId>oom-certservice</artifactId>
+    <version>2.6.0-SNAPSHOT</version>
+    <name>oom-certservice</name>
+    <description>OOM Certification Service</description>
     <packaging>pom</packaging>
 
     <properties>
@@ -33,50 +33,62 @@
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-        <sitePath>/content/sites/site/org/onap/aaf/cert-service/${project.artifactId}/${project.version}</sitePath>
+        <sitePath>/content/sites/site/org/onap/oom/platform/cert-service/${project.artifactId}/${project.version}</sitePath>
         <java.version>11</java.version>
-        <springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs</springdoc-openapi-maven-plugin.apiDocsUrl>
+        <springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs.yaml</springdoc-openapi-maven-plugin.apiDocsUrl>
 
         <!-- Dependencies -->
         <assertj-core.version>3.15.0</assertj-core.version>
         <mockito-core.version>3.2.4</mockito-core.version>
-        <spring-core.version>5.2.3.RELEASE</spring-core.version>
-        <spring-boot-starter.version>2.2.4.RELEASE</spring-boot-starter.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-        <spring-boot-starter-actuator.version>2.2.4.RELEASE</spring-boot-starter-actuator.version>
-        <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>
+        <spring-boot-starter.version>2.5.8</spring-boot-starter.version>
+        <spring-boot-starter-actuator.version>2.6.1</spring-boot-starter-actuator.version>
+        <spring-boot-starter-log4j2.version>2.6.2</spring-boot-starter-log4j2.version>
+
+        <spring.cloud-version>2020.0.3</spring.cloud-version>
+
         <springdoc-openapi-ui.version>1.2.30</springdoc-openapi-ui.version>
-        <bouncycastle.version>1.60</bouncycastle.version>
+        <bouncycastle.version>1.70</bouncycastle.version>
         <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
         <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>
+        <gson.version>2.9.0</gson.version>
+        <httpcomponents.version>4.5.13</httpcomponents.version>
+        <commons-lang3.version>3.9</commons-lang3.version>
+        <commons-validator.version>1.7</commons-validator.version>
+        <commons-io.version>2.11.0</commons-io.version>
         <junit.version>5.5.2</junit.version>
         <mockito-junit-jupiter.version>2.17.0</mockito-junit-jupiter.version>
-
+        <log4j2.version>2.17.1</log4j2.version>
         <!-- Docker -->
         <skipDockerPush>true</skipDockerPush>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+        <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
         <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
         <docker-image.namespace>onap</docker-image.namespace>
         <docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name>
         <docker-image.latest>${project.version}</docker-image.latest>
+        <docker-image.tag.latest>latest</docker-image.tag.latest>
         <version>${project.version}</version>
         <docker.http_proxy/>
-        <immutables.version>2.7.5</immutables.version>
-
 
     </properties>
 
     <modules>
         <module>certService</module>
-        <module>certServiceClient</module>
+        <module>certServicePostProcessor</module>
+        <module>certServiceK8sExternalProvider</module>
     </modules>
 
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <configuration>
+                        <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.springdoc</groupId>
                     <artifactId>springdoc-openapi-maven-plugin</artifactId>
@@ -91,7 +103,7 @@
                     </executions>
                     <configuration>
                         <apiDocsUrl>${springdoc-openapi-maven-plugin.apiDocsUrl}</apiDocsUrl>
-                        <outputFileName>api-docs.json</outputFileName>
+                        <outputFileName>api-docs.yaml</outputFileName>
                         <outputDir>${project.build.directory}</outputDir>
                     </configuration>
                 </plugin>
@@ -105,18 +117,6 @@
                                 <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>
@@ -157,12 +157,12 @@
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
-            <name>AAF Release Repository</name>
+            <name>OOM Release Repository</name>
             <url>${nexusproxy}${releaseNexusPath}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
-            <name>AAF Snapshot Repository</name>
+            <name>OOM Snapshot Repository</name>
             <url>${nexusproxy}${snapshotNexusPath}</url>
         </snapshotRepository>
         <site>
@@ -185,11 +185,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-log4j2</artifactId>
-                <version>${spring-boot-starter-log4j2.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-starter-log4j2</artifactId>-->
+<!--                <version>${spring-boot-starter-log4j2.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-test</artifactId>
@@ -227,6 +227,26 @@
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpcomponents.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-validator</groupId>
+                <artifactId>commons-validator</artifactId>
+                <version>${commons-validator.version}</version>
+            </dependency>
             <dependency>
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
@@ -245,13 +265,7 @@
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
+                <artifactId>junit-jupiter</artifactId>
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -261,7 +275,6 @@
                 <version>${mockito-core.version}</version>
                 <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-junit-jupiter</artifactId>
@@ -269,6 +282,25 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.hibernate.validator</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>6.2.1.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-bom</artifactId>
+                <version>${log4j2.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring.cloud-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>