bump the master to 1.7.1

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

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 8d95d06..c260e12 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>
@@ -42,20 +42,20 @@
             </goals>
             <configuration>
               <source>
-                                                               println 'Project version: ' + project.properties['so.project.version'];
-                                                               def versionArray;
-                                                               if ( project.properties['so.project.version'] != null ) {
-                                                                       versionArray = project.properties['so.project.version'].split('-');
-                                                               }
+                println 'Project version: ' + project.properties['so.project.version'];
+                def versionArray;
+                if ( project.properties['so.project.version'] != null ) {
+                  versionArray = project.properties['so.project.version'].split('-');
+                }
 
-                                                               if ( project.properties['so.project.version'].endsWith("-SNAPSHOT") ) {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
-                                                               } else {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
-                                                               }
+                if ( project.properties['so.project.version'].endsWith("-SNAPSHOT") ) {
+                  project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
+                } else {
+                  project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                }
 
-                                                               println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
-                                                       </source>
+                println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
+              </source>
             </configuration>
           </execution>
         </executions>
@@ -65,28 +65,24 @@
         <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>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-base-image</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-base-image</dockerFile>
               </build>
             </image>
             <image>
               <name>${docker.image.prefix}/vnfm-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -97,7 +93,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so.adapters:mso-vnfm-etsi-adapter</include>
+                          <include>org.onap.so.adapters:etsi-sol003-adapter-application</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -107,11 +103,10 @@
               </build>
             </image>
             <image>
-              <name>${docker.image.prefix}/ve-vnfm-adapter</name>
+              <name>${docker.image.prefix}/catalog-db-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -122,7 +117,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so.adapters:mso-ve-vnfm-adapter</include>
+                          <include>org.onap.so.adapters:mso-catalog-db-adapter</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -132,11 +127,10 @@
               </build>
             </image>
             <image>
-              <name>${docker.image.prefix}/catalog-db-adapter</name>
+              <name>${docker.image.prefix}/request-db-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -147,7 +141,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so.adapters:mso-catalog-db-adapter</include>
+                          <include>org.onap.so.adapters:mso-requests-db-adapter</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -157,11 +151,10 @@
               </build>
             </image>
             <image>
-              <name>${docker.image.prefix}/request-db-adapter</name>
+              <name>${docker.image.prefix}/sdnc-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -172,7 +165,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so.adapters:mso-requests-db-adapter</include>
+                          <include>org.onap.so:mso-sdnc-adapter</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -182,11 +175,10 @@
               </build>
             </image>
             <image>
-              <name>${docker.image.prefix}/sdnc-adapter</name>
+              <name>${docker.image.prefix}/openstack-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -197,7 +189,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so:mso-sdnc-adapter</include>
+                          <include>org.onap.so:mso-openstack-adapters</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -207,11 +199,10 @@
               </build>
             </image>
             <image>
-              <name>${docker.image.prefix}/openstack-adapter</name>
+              <name>${docker.image.prefix}/vfc-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -222,7 +213,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so:mso-openstack-adapters</include>
+                          <include>org.onap.so.adapters:mso-vfc-adapter</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -232,11 +223,10 @@
               </build>
             </image>
             <image>
-              <name>${docker.image.prefix}/vfc-adapter</name>
+              <name>${docker.image.prefix}/nssmf-adapter</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-nssmf-adapter</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -247,7 +237,7 @@
                     <dependencySets>
                       <dependencySet>
                         <includes>
-                          <include>org.onap.so.adapters:mso-vfc-adapter</include>
+                          <include>org.onap.so.adapters:mso-nssmf-adapter</include>
                         </includes>
                         <outputFileNameMapping>app.jar</outputFileNameMapping>
                       </dependencySet>
@@ -256,37 +246,11 @@
                 </assembly>
               </build>
             </image>
-            <image>
-             <name>${docker.image.prefix}/nssmf-adapter</name>
-              <build>
-               <cleanup>try</cleanup>
-               <dockerFileDir>docker-files</dockerFileDir>
-               <dockerFile>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-nssmf-adapter</include>
-                   </includes>
-                   <outputFileNameMapping>app.jar</outputFileNameMapping>
-                 </dependencySet>
-                </dependencySets>
-               </inline>
-              </assembly>
-             </build>
-           </image>
             <image>
               <name>${docker.image.prefix}/so-appc-orchestrator</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -310,8 +274,7 @@
               <name>${docker.image.prefix}/sdc-controller</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -335,8 +298,7 @@
               <name>${docker.image.prefix}/bpmn-infra</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -360,8 +322,7 @@
               <name>${docker.image.prefix}/api-handler-infra</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -385,8 +346,7 @@
               <name>${docker.image.prefix}/so-monitoring</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -410,8 +370,7 @@
               <name>${docker.image.prefix}/so-simulator</name>
               <build>
                 <cleanup>try</cleanup>
-                <dockerFileDir>docker-files</dockerFileDir>
-                <dockerFile>Dockerfile.so-app</dockerFile>
+                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                 <tags>
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -482,12 +441,7 @@
   <dependencies>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
-      <artifactId>mso-vnfm-etsi-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>mso-ve-vnfm-adapter</artifactId>
+      <artifactId>etsi-sol003-adapter-application</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>