From 1edc6ccafd76ba80e03ae764ac1c5d6cbb0c4b4a Mon Sep 17 00:00:00 2001
From: Michael Arrastia <MArrasti@amdocs.com>
Date: Thu, 17 May 2018 17:52:08 +0100
Subject: [PATCH] Update poms to upload champ-service jar

The intention is to additionally resolve the build of the
release-version-java-daily job.

Change-Id: I39af216e187245a845cc1f4921a02c21b4728884
Issue-ID: AAI-1146
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
---
 champ-service/pom.xml | 20 ++------------------
 pom.xml               | 12 ++++++++++++
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 5648834..b3859df 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -32,10 +32,10 @@ limitations under the License.
     <groupId>org.onap.aai</groupId>
     <artifactId>champ-service</artifactId>
     <version>1.2.1-SNAPSHOT</version>
-    <name>champ</name>
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
+        <docker.name>champ</docker.name>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid>
         <common.logging.version>1.2.2</common.logging.version>
@@ -290,22 +290,6 @@ limitations under the License.
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                 <groupId>org.sonatype.plugins</groupId>
-                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                 <configuration>
-                     <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                 </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -337,7 +321,7 @@ limitations under the License.
                 <configuration>
                     <verbose>true</verbose>
                     <serverId>docker-hub</serverId>
-                    <imageName>${docker.push.registry}/onap/${project.name}</imageName>
+                    <imageName>${docker.push.registry}/onap/${docker.name}</imageName>
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
diff --git a/pom.xml b/pom.xml
index 4629aee..07c283a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,18 @@ limitations under the License.
         <module>champ-service</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencyManagement>
         <dependencies>
 
-- 
2.16.6