edit POM to push images to nexus repository

Issue-ID: DMAAP-12
Change-Id: I0fb122bcb084da64ba6396aa259d94877d114056
Signed-off-by: ezcoxem <emmett.cox@ericsson.com>

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 95b2aa0..9f5de17 100755 (executable)
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -7,9 +7,9 @@
   * Licensed under the Apache License, Version 2.0 (the "License");\r
   * you may not use this file except in compliance with the License.\r
   * You may obtain a copy of the License at\r
-  * \r
+  *\r
    *      http://www.apache.org/licenses/LICENSE-2.0\r
-  * \r
+  *\r
    * Unless required by applicable law or agreed to in writing, software\r
   * distributed under the License is distributed on an "AS IS" BASIS,\r
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -196,12 +196,49 @@
                <profile>\r
                        <id>docker</id>\r
                        <properties>\r
-                               <skip.docker.build>false</skip.docker.build>\r
-                               <skip.docker.tag>false</skip.docker.tag>\r
-                               <skip.docker.push>false</skip.docker.push>\r
+                               <skipDockerBuild>false</skipDockerBuild>\r
+                               <skipDockerTag>false</skipDockerTag>\r
+                               <skipTests>true</skipTests>\r
                        </properties>\r
+                       <build>\r
+                               <plugins>\r
+                                       <plugin>\r
+                                               <groupId>com.spotify</groupId>\r
+                                               <artifactId>docker-maven-plugin</artifactId>\r
+                                               <version>1.0.0</version>\r
+                                               <configuration>\r
+                                                       <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}</imageName>\r
+                                                       <dockerDirectory>${docker.location}</dockerDirectory>\r
+                                                       <serverId>${onap.nexus.dockerregistry.daily}</serverId>\r
+                                                       <skipDockerBuild>false</skipDockerBuild>\r
+                                                       <imageTags>\r
+                                                               <imageTag>${project.version}</imageTag>\r
+                                                               <imageTag>latest</imageTag>\r
+                                                       </imageTags>\r
+                                                       <forceTags>true</forceTags>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <targetPath>/</targetPath>\r
+                                                                       <directory>${project.basedir}</directory>\r
+                                                                       <excludes>\r
+                                                                               <exclude>target/**/*</exclude>\r
+                                                                               <exclude>pom.xml</exclude>\r
+                                                                       </excludes>\r
+                                                               </resource>\r
+\r
+                                                               <resource>\r
+                                                                       <targetPath>/</targetPath>\r
+                                                                       <directory>${project.build.directory}</directory>\r
+                                                                       <include>**/**</include>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </plugin>\r
+                               </plugins>\r
+                       </build>\r
                </profile>\r
        </profiles>\r
+\r
        <build>\r
                <finalName>datarouter-node</finalName>\r
                <resources>\r
@@ -329,92 +366,6 @@
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
-                       <plugin>\r
-                               <groupId>com.spotify</groupId>\r
-                               <artifactId>docker-maven-plugin</artifactId>\r
-                               <version>${docker.maven.plugin.version}</version>\r
-                               <configuration>\r
-                                       <skipDockerBuild>false</skipDockerBuild>\r
-                                       <imageName>${datarouter.node.image.name}</imageName>\r
-                                       <dockerDirectory>${docker.location}</dockerDirectory>\r
-                                       <serverId>docker-hub</serverId>\r
-                                       <imageTags>\r
-                                               <imageTag>${project.version}</imageTag>\r
-                                               <imageTag>latest</imageTag>\r
-                                       </imageTags>\r
-                                       <forceTags>true</forceTags>\r
-                                       <resources>\r
-                                               <resource>\r
-                                                       <targetPath>/</targetPath>\r
-                                                       <directory>${docker.location}</directory>\r
-                                                       <include>${project.build.finalName}.jar</include>\r
-                                               </resource>\r
-                                               <resource>\r
-                                                       <targetPath>/</targetPath>\r
-                                                       <directory>${project.build.directory}</directory>\r
-                                                       <include>**/**</include>\r
-                                               </resource>\r
-                                       </resources>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>build-image</id>\r
-                                               <phase>install</phase>\r
-                                               <goals>\r
-                                                       <goal>build</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <skipDockerBuild>${skip.docker.build}</skipDockerBuild>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>tag-image-project-version</id>\r
-                                               <phase>install</phase>\r
-                                               <goals>\r
-                                                       <goal>tag</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <image>${datarouter.node.image.name}</image>\r
-                                                       <newName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:${project.version}</newName>\r
-                                                       <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>tag-image-latest</id>\r
-                                               <phase>install</phase>\r
-                                               <goals>\r
-                                                       <goal>tag</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <image>${datarouter.node.image.name}</image>\r
-                                                       <newName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:latest</newName>\r
-                                                       <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>push-image-latest</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>push</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:${project.version}</imageName>\r
-                                                       <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>push-image</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>push</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:latest</imageName>\r
-                                                       <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-dependency-plugin</artifactId>\r
@@ -546,26 +497,4 @@
                        </plugin>\r
                </plugins>\r
        </build>\r
-       <distributionManagement>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>DR Release Repository</name>\r
-                       <url>${onap.nexus.url}${releaseNexusPath}</url>\r
-               </repository>\r
-               <snapshotRepository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>DR Snapshot Repository</name>\r
-                       <url>${onap.nexus.url}${snapshotNexusPath}</url>\r
-               </snapshotRepository>\r
-               <site>\r
-                       <id>ecomp-site</id>\r
-                       <url>dav:${onap.nexus.url}${sitePath}</url>\r
-               </site>\r
-       </distributionManagement>\r
-       <pluginRepositories>\r
-               <pluginRepository>\r
-                       <id>onap-plugin-snapshots</id>\r
-                       <url>${onap.nexus.url}${snapshotNexusPath}</url>\r
-               </pluginRepository>\r
-       </pluginRepositories>\r
 </project>\r

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index a348c78..2107e9c 100755 (executable)
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -7,9 +7,9 @@
   * Licensed under the Apache License, Version 2.0 (the "License");\r
   * you may not use this file except in compliance with the License.\r
   * You may obtain a copy of the License at\r
-  * \r
+  *\r
    *      http://www.apache.org/licenses/LICENSE-2.0\r
-  * \r
+  *\r
    * Unless required by applicable law or agreed to in writing, software\r
   * distributed under the License is distributed on an "AS IS" BASIS,\r
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -218,18 +218,52 @@
             <scope>compile</scope>\r
         </dependency>\r
     </dependencies>\r
-\r
     <profiles>\r
         <profile>\r
             <id>docker</id>\r
             <properties>\r
-                <skip.docker.build>false</skip.docker.build>\r
-                <skip.docker.tag>false</skip.docker.tag>\r
-                <skip.docker.push>false</skip.docker.push>\r
+                <skipDockerBuild>false</skipDockerBuild>\r
+                <skipDockerTag>false</skipDockerTag>\r
+                <skipTests>true</skipTests>\r
             </properties>\r
+            <build>\r
+                <plugins>\r
+                    <plugin>\r
+                        <groupId>com.spotify</groupId>\r
+                        <artifactId>docker-maven-plugin</artifactId>\r
+                        <version>1.0.0</version>\r
+                        <configuration>\r
+                            <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}</imageName>\r
+                            <dockerDirectory>${docker.location}</dockerDirectory>\r
+                            <serverId>${onap.nexus.dockerregistry.daily}</serverId>\r
+                            <skipDockerBuild>false</skipDockerBuild>\r
+                            <imageTags>\r
+                                <imageTag>${project.version}</imageTag>\r
+                                <imageTag>latest</imageTag>\r
+                            </imageTags>\r
+                            <forceTags>true</forceTags>\r
+                            <resources>\r
+                                <resource>\r
+                                    <targetPath>/</targetPath>\r
+                                    <directory>${project.basedir}</directory>\r
+                                    <excludes>\r
+                                        <exclude>target/**/*</exclude>\r
+                                        <exclude>pom.xml</exclude>\r
+                                    </excludes>\r
+                                </resource>\r
+\r
+                                <resource>\r
+                                    <targetPath>/</targetPath>\r
+                                    <directory>${project.build.directory}</directory>\r
+                                    <include>**/**</include>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </plugin>\r
+                </plugins>\r
+            </build>\r
         </profile>\r
     </profiles>\r
-\r
     <build>\r
         <finalName>datarouter-prov</finalName>\r
         <resources>\r
@@ -300,92 +334,6 @@
                 </configuration>\r
                 <version>3.6.0</version>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>com.spotify</groupId>\r
-                <artifactId>docker-maven-plugin</artifactId>\r
-                <version>${docker.maven.plugin.version}</version>\r
-                <configuration>\r
-                    <skipDockerBuild>false</skipDockerBuild>\r
-                    <imageName>${datarouter.prov.image.name}</imageName>\r
-                    <dockerDirectory>${docker.location}</dockerDirectory>\r
-                    <serverId>docker-hub</serverId>\r
-                    <imageTags>\r
-                        <imageTag>${project.version}</imageTag>\r
-                        <imageTag>latest</imageTag>\r
-                    </imageTags>\r
-                    <forceTags>true</forceTags>\r
-                    <resources>\r
-                        <resource>\r
-                            <targetPath>/</targetPath>\r
-                            <directory>${docker.location}</directory>\r
-                            <include>${project.build.finalName}.jar</include>\r
-                        </resource>\r
-                        <resource>\r
-                            <targetPath>/</targetPath>\r
-                            <directory>${project.build.directory}</directory>\r
-                            <include>**/**</include>\r
-                        </resource>\r
-                    </resources>\r
-                </configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>build-image</id>\r
-                        <phase>install</phase>\r
-                        <goals>\r
-                            <goal>build</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <skipDockerBuild>${skip.docker.build}</skipDockerBuild>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>tag-image-project-version</id>\r
-                        <phase>install</phase>\r
-                        <goals>\r
-                            <goal>tag</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <image>${datarouter.prov.image.name}</image>\r
-                            <newName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version}</newName>\r
-                            <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>tag-image-latest</id>\r
-                        <phase>install</phase>\r
-                        <goals>\r
-                            <goal>tag</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <image>${datarouter.prov.image.name}</image>\r
-                            <newName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:latest</newName>\r
-                            <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>push-image-latest</id>\r
-                        <phase>deploy</phase>\r
-                        <goals>\r
-                            <goal>push</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version}</imageName>\r
-                            <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>push-image</id>\r
-                        <phase>deploy</phase>\r
-                        <goals>\r
-                            <goal>push</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:latest</imageName>\r
-                            <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
             <plugin>\r
                 <artifactId>maven-resources-plugin</artifactId>\r
                 <version>2.7</version>\r
@@ -618,26 +566,4 @@
             </plugin>\r
         </plugins>\r
     </build>\r
-    <distributionManagement>\r
-        <repository>\r
-            <id>ecomp-releases</id>\r
-            <name>DR Release Repository</name>\r
-            <url>${onap.nexus.url}${releaseNexusPath}</url>\r
-        </repository>\r
-        <snapshotRepository>\r
-            <id>ecomp-snapshots</id>\r
-            <name>DR Snapshot Repository</name>\r
-            <url>${onap.nexus.url}${snapshotNexusPath}</url>\r
-        </snapshotRepository>\r
-        <site>\r
-            <id>ecomp-site</id>\r
-            <url>dav:${onap.nexus.url}${sitePath}</url>\r
-        </site>\r
-    </distributionManagement>\r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>${onap.nexus.url}${snapshotNexusPath}</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
 </project>\r