X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=793439ddd42868bb723a7710297fbbcecc6f04e2;hb=96b0be0389a6563d67a64bd302547d582a4de862;hp=c9e829c8d8f259173adc0be9956f4171d5fccd9e;hpb=1d535a1b38e26c7035db2bde7405261d97bf7261;p=oom%2Fplatform%2Fcert-service.git

diff --git a/pom.xml b/pom.xml
index c9e829c8..793439dd 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.0.0-SNAPSHOT</version>
+    <name>oom-certservice</name>
+    <description>OOM Certification Service</description>
     <packaging>pom</packaging>
 
     <properties>
@@ -33,9 +33,9 @@
         <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>
@@ -55,7 +55,6 @@
         <httpcomponents.version>4.5.6</httpcomponents.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <commons-io.version>2.6</commons-io.version>
-        <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
         <junit.version>5.5.2</junit.version>
         <mockito-junit-jupiter.version>2.17.0</mockito-junit-jupiter.version>
 
@@ -67,6 +66,7 @@
         <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/>
 
@@ -75,11 +75,18 @@
     <modules>
         <module>certService</module>
         <module>certServiceClient</module>
+        <module>trustStoreMerger</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>
@@ -94,7 +101,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>
@@ -108,18 +115,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>
@@ -160,12 +155,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>
@@ -263,13 +258,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>