fix the build issue of the SO-docker

[so.git] / packages / docker / pom.xml

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 217a5fd..91df494 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.onap.so</groupId>
     <artifactId>packages</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
   </parent>
 
   <packaging>pom</packaging>
@@ -65,13 +65,11 @@
         <groupId>io.fabric8</groupId>
         <artifactId>docker-maven-plugin</artifactId>
         <version>0.31.0</version>
-
-        <configuration>
+        <configuration combine.self="override">
           <verbose>true</verbose>
           <apiVersion>1.23</apiVersion>
           <pullRegistry>${docker.pull.registry}</pullRegistry>
           <pushRegistry>${docker.push.registry}</pushRegistry>
-
           <images>
             <image>
               <name>${docker.image.prefix}/base-image:1.0</name>
@@ -86,7 +84,7 @@
                 <cleanup>try</cleanup>
                 <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
-                  <tag>${project.version}</tag>
+                  <!--tag>${project.version}</tag-->
                   <tag>${project.version}-${maven.build.timestamp}</tag>
                   <tag>${project.docker.latesttag.version}</tag>
                 </tags>
@@ -104,11 +102,11 @@
                 </assembly>
               </build>
             </image>
-            <image>
-              <name>${docker.image.prefix}/ve-vnfm-adapter</name>
+            <!--image>
+              <name>${docker.image.prefix}/mso-cnf-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.mso-cnf-adapter</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -119,7 +117,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so.adapters:etsi-sol002-adapter</include>
+                          <include>org.onap.so.adapters:mso-cnf-adapter</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -127,7 +125,7 @@
                   </inline>
                 </assembly>
               </build>
-            </image>
+            </image-->
             <image>
               <name>${docker.image.prefix}/catalog-db-adapter</name>
               <build>
@@ -272,6 +270,30 @@
                 </assembly>
               </build>
             </image>
+            <image>
+              <name>${docker.image.prefix}/so-oof-adapter</name>
+              <build>
+                <cleanup>try</cleanup>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
+                <tags>
+                  <tag>${project.version}</tag>
+                  <tag>${project.version}-${maven.build.timestamp}</tag>
+                  <tag>${project.docker.latesttag.version}</tag>
+                </tags>
+                <assembly>
+                  <inline>
+                    <dependencySets>
+                      <dependencySet>
+                        <includes>
+                          <include>org.onap.so.adapters:mso-oof-adapter</include>
+                        </includes>
+                        <outputFileNameMapping>app.jar</outputFileNameMapping>
+                      </dependencySet>
+                    </dependencySets>
+                  </inline>
+                </assembly>
+              </build>
+            </image>
             <image>
               <name>${docker.image.prefix}/so-appc-orchestrator</name>
               <build>
@@ -416,6 +438,30 @@
                 </assembly>
               </build>
             </image>
+            <image>
+              <name>${docker.image.prefix}/so-etsi-nfvo-ns-lcm</name>
+              <build>
+                <cleanup>try</cleanup>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
+                <tags>
+                  <tag>${project.version}</tag>
+                  <tag>${project.version}-${maven.build.timestamp}</tag>
+                  <tag>${project.docker.latesttag.version}</tag>
+                </tags>
+                <assembly>
+                  <inline>
+                    <dependencySets>
+                      <dependencySet>
+                        <includes>
+                          <include>org.onap.so.etsi.nfvo:so-etsi-nfvo-ns-lcm-application</include>
+                        </includes>
+                        <outputFileNameMapping>app.jar</outputFileNameMapping>
+                      </dependencySet>
+                    </dependencySets>
+                  </inline>
+                </assembly>
+              </build>
+            </image>
           </images>
         </configuration>
 
@@ -447,7 +493,7 @@
               <goal>push</goal>
             </goals>
             <configuration>
-              <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring,${docker.image.prefix}/so-simulator,${docker.image.prefix}/mso-nssmf-adapter</image>
+              <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring,${docker.image.prefix}/so-simulator,${docker.image.prefix}/mso-nssmf-adapter,${docker.image.prefix}/so-oof-adapter,${docker.image.prefix}/so-etsi-nfvo-ns-lcm</image>
             </configuration>
           </execution>
         </executions>
@@ -472,14 +518,14 @@
     </dependency>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol002-adapter</artifactId>
+      <artifactId>mso-catalog-db-adapter</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.onap.so.adapters</groupId>
-      <artifactId>mso-catalog-db-adapter</artifactId>
+      <artifactId>mso-cnf-adapter</artifactId>
       <version>${project.version}</version>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
       <artifactId>mso-requests-db-adapter</artifactId>
@@ -505,6 +551,11 @@
       <artifactId>mso-nssmf-adapter</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so.adapters</groupId>
+      <artifactId>mso-oof-adapter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
       <artifactId>so-appc-orchestrator</artifactId>
@@ -535,5 +586,10 @@
       <artifactId>so-simulator</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so.etsi.nfvo</groupId>
+      <artifactId>so-etsi-nfvo-ns-lcm-application</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>