X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fpom.xml;h=760dbb5dc90e8870371e1071c5cdf83f2923ce23;hb=5c257b89124ece245948772145a2bc8a60347178;hp=a4a1e378d59c838a1609788767dbc2f0b04c6581;hpb=16faef60a02ca16b6f0c88082c2244241d57c15c;p=so.git

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index a4a1e378d5..760dbb5dc9 100644
--- 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.7.1-SNAPSHOT</version>
+    <version>1.12.1-SNAPSHOT</version>
   </parent>
 
   <packaging>pom</packaging>
@@ -78,54 +78,6 @@
                 <dockerFile>docker-files/Dockerfile.so-base-image</dockerFile>
               </build>
             </image>
-            <image>
-              <name>${docker.image.prefix}/vnfm-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:etsi-sol003-adapter-application</include>
-                        </includes>
-                        <outputFileNameMapping>app.jar</outputFileNameMapping>
-                      </dependencySet>
-                    </dependencySets>
-                  </inline>
-                </assembly>
-              </build>
-            </image>
-	     <image>
-              <name>${docker.image.prefix}/mso-cnf-adapter</name>
-              <build>
-                <cleanup>try</cleanup>
-                <dockerFile>docker-files/Dockerfile.mso-cnf-adapter</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-cnf-adapter</include>
-                        </includes>
-                        <outputFileNameMapping>app.jar</outputFileNameMapping>
-                      </dependencySet>
-                    </dependencySets>
-                  </inline>
-                </assembly>
-              </build>
-            </image>
             <image>
               <name>${docker.image.prefix}/catalog-db-adapter</name>
               <build>
@@ -222,54 +174,6 @@
                 </assembly>
               </build>
             </image>
-            <image>
-              <name>${docker.image.prefix}/vfc-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-vfc-adapter</include>
-                        </includes>
-                        <outputFileNameMapping>app.jar</outputFileNameMapping>
-                      </dependencySet>
-                    </dependencySets>
-                  </inline>
-                </assembly>
-              </build>
-            </image>
-            <image>
-              <name>${docker.image.prefix}/nssmf-adapter</name>
-              <build>
-                <cleanup>try</cleanup>
-                <dockerFile>docker-files/Dockerfile.so-nssmf-adapter</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>
@@ -366,30 +270,6 @@
                 </assembly>
               </build>
             </image>
-            <image>
-              <name>${docker.image.prefix}/so-monitoring</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.monitoring:so-monitoring-service</include>
-                        </includes>
-                        <outputFileNameMapping>app.jar</outputFileNameMapping>
-                      </dependencySet>
-                    </dependencySets>
-                  </inline>
-                </assembly>
-              </build>
-            </image>
             <image>
               <name>${docker.image.prefix}/so-simulator</name>
               <build>
@@ -414,30 +294,6 @@
                 </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>
 
@@ -469,7 +325,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,${docker.image.prefix}/mso-cnf-adapter,${docker.image.prefix}/so-etsi-nfvo-ns-lcm</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}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-simulator</image>
             </configuration>
           </execution>
         </executions>
@@ -487,21 +343,11 @@
   </build>
 
   <dependencies>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-adapter-application</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
       <artifactId>mso-catalog-db-adapter</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>mso-cnf-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
       <artifactId>mso-requests-db-adapter</artifactId>
@@ -517,16 +363,6 @@
       <artifactId>mso-openstack-adapters</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>mso-vfc-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>mso-nssmf-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
       <artifactId>so-appc-orchestrator</artifactId>
@@ -547,20 +383,10 @@
       <artifactId>mso-api-handler-infra</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.onap.so.monitoring</groupId>
-      <artifactId>so-monitoring-service</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.onap.so.simulator</groupId>
       <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>