Merge "Updated the Version of Stating Dockers"

[integration.git] / test / mocks / pnfsimulator / pom.xml

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index e68ca8b..1f52bbd 100644 (file)
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -4,6 +4,12 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>1.2.1</version>
+  </parent>
+
   <groupId>org.onap.pnfsimulator</groupId>
   <artifactId>pnf-simulator</artifactId>
   <version>2.0.0-SNAPSHOT</version>
@@ -159,6 +165,22 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptor>src/assembly/resources.xml</descriptor>
+          <finalName>${project.artifactId}-${pom.version}</finalName>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -240,10 +262,8 @@
         <version>1.0.0</version>
         <configuration>
           <registryUrl>${onap.nexus.dockerregistry.daily}</registryUrl>
-          <!--
-          <serverId>${onap.nexus.dockerregistry.daily}</serverId>
-          -->
           <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>
+          <forceTags>true</forceTags>
           <imageTags>
             <tag>latest</tag>
             <tag>${project.version}</tag>
@@ -264,99 +284,6 @@
           </resources>
           <forceTags>true</forceTags>
         </configuration>
-        <!--
-        <executions>
-          <execution>
-            <id>build-image</id>
-            <phase>package</phase>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>tag-image-latest</id>
-            <phase>package</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>
-              -->
-              <!-- WA in case push does not work at second job - to remove
-              <pushImage>true</pushImage>
-              -->
-          <!--
-            </configuration>
-          </execution>
-          <execution>
-            <id>tag-image-with-version</id>
-            <phase>package</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tag-image-with-version-and-date</id>
-            <phase>package</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
-            </configuration>
-          </execution>
-          -->
-          <!-- testing pushing default imgae-->
-        <!--
-          <execution>
-            <id>default</id>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <registryUrl>${onap.nexus.dockerregistry.daily}</registryUrl>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>push-image-latest</id>
-            <phase>none</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName>
-            </configuration>
-          </execution>
-          <execution>
-            <id>push-image-with-version</id>
-            <phase>none</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</imageName>
-            </configuration>
-          </execution>
-          <execution>
-            <id>push-image-with-version-and-date</id>
-            <phase>none</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</imageName>
-            </configuration>
-          </execution>
-        </executions>
-        -->
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
@@ -409,4 +336,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>