X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Fdist%2Fsdc-onboard-backend-docker%2Fpom.xml;h=a214d7e28dc6c0a154c0061059e3bf90dcf182e5;hb=9dcb6f393bfc76237cca809b39d5034afecf1c55;hp=d95580bdf2974eb9eaae121fa64fba3f27cfff77;hpb=55c536e65dcbd1981de61c6c8bea318585324d22;p=sdc.git

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
index d95580bdf2..a214d7e28d 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
@@ -1,56 +1,72 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    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>
 
     <name>openecomp-sdc-docker-backend</name>
-    <groupId>org.openecomp.sdc</groupId>
     <artifactId>openecomp-sdc-docker-backend</artifactId>
     <packaging>pom</packaging>
 
-    <url>http://maven.apache.org</url>
-
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>openecomp-sdc-docker-dist</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.13.4-SNAPSHOT</version>
     </parent>
 
-
     <properties>
         <docker.image.name>sdc-onboard-backend</docker.image.name>
     </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>clean files</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${project.basedir}/artifacts/</directory>
-                                    <followSymlinks>false</followSymlinks>
-                                    <includes>
-                                        <include>*.war</include>
-                                        <include>onboarding_configuration.yaml</include>
-                                        <include>logback.xml</include>
-                                    </includes>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+    <dependencies>
+        <dependency>
+            <groupId>org.openecomp.sdc.onboarding</groupId>
+            <artifactId>api-docs</artifactId>
+            <type>war</type>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdc.onboarding</groupId>
+            <artifactId>onboarding-be</artifactId>
+            <type>war</type>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>clean files</id>
+                                <phase>clean</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                                <configuration>
+                                    <filesets>
+                                        <fileset>
+                                            <directory>${project.basedir}/artifacts/</directory>
+                                            <followSymlinks>false</followSymlinks>
+                                            <includes>
+                                                <include>*.war</include>
+                                                <include>onboarding_configuration.yaml</include>
+                                                <include>logback.xml</include>
+                                            </includes>
+                                        </fileset>
+                                    </filesets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
 
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.0.2</version>
                         <executions>
                             <execution>
                                 <id>copy-resources-war</id>
@@ -98,30 +114,35 @@
                             </execution>
                         </executions>
                     </plugin>
+
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <apiVersion>1.23</apiVersion>
-                            <registry>nexus3.onap.org:10001</registry>
+                            <verbose>${verbose}</verbose>
+                            <apiVersion>${docker.api.version}</apiVersion>
+                            <registry>${docker.registry}</registry>
                             <authConfig>
                                 <pull>
-                                    <username>docker</username>
-                                    <password>docker</password>
+                                    <username>${docker.username}</username>
+                                    <password>${docker.password}</password>
                                 </pull>
                             </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
                                 <image>
-                                    <name>onap/${docker.image.name}</name>
+                                    <name>${docker.namespace}/${docker.image.name}</name>
                                     <alias>${docker.image.name}</alias>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${project.basedir}/artifacts</dockerFileDir>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                            <tag>latest</tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+                                            </tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -136,7 +157,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/${docker.image.name}</image>
+                                    <image>${docker.namespace}/${docker.image.name}</image>
                                 </configuration>
                             </execution>
 
@@ -155,11 +176,13 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/${docker.image.name}</image>
+                                    <image>${docker.namespace}/${docker.image.name}</image>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
-</project>
\ No newline at end of file
+        </profile>
+    </profiles>
+</project>