Merge "Removing AAF references from Cert-Service in OOM repo. Certificates regenerate...

diff --combined pom.xml
index 59be1ba,b0f25e6..919ac7b
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -21,11 -21,11 +21,11 @@@
          <artifactId>oparent</artifactId>
          <version>3.0.0</version>
      </parent>
-     <groupId>org.onap.aaf.certservice</groupId>
-     <artifactId>aaf-certservice</artifactId>
+     <groupId>org.onap.oom.platform.cert-service</groupId>
+     <artifactId>oom-certservice</artifactId>
      <version>1.2.0-SNAPSHOT</version>
-     <name>aaf-certservice</name>
-     <description>AAF Certification Service</description>
+     <name>oom-certservice</name>
+     <description>OOM Certification Service</description>
      <packaging>pom</packaging>
  
      <properties>
@@@ -33,7 -33,7 +33,7 @@@
          <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/cert-service/${project.artifactId}/${project.version}</sitePath>
          <java.version>11</java.version>
          <springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs.yaml</springdoc-openapi-maven-plugin.apiDocsUrl>
  
@@@ -75,7 -75,6 +75,7 @@@
      <modules>
          <module>certService</module>
          <module>certServiceClient</module>
 +        <module>trustStoreMerger</module>
      </modules>
  
      <build>
@@@ -155,12 -154,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>