Merge "Fix docker image name"

diff --combined champ-service/pom.xml
index 6ca7d00,2bf1ed8..cb2848f
--- 1/champ-service/pom.xml
--- 2/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@@ -32,6 -32,7 +32,7 @@@ limitations under the License
      <groupId>org.onap.aai</groupId>
      <artifactId>champ-service</artifactId>
      <version>1.2.0-SNAPSHOT</version>
+     <name>champ</name>
  
      <properties>
          <runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
@@@ -61,13 -62,13 +62,13 @@@
              <version>1.18.6</version>
          </dependency>
  
 -        <!-- AJSC Dependencies -->
          <dependency>
              <groupId>dom4j</groupId>
              <artifactId>dom4j</artifactId>
              <version>1.6.1</version>
              <scope>provided</scope>
          </dependency>
 +
          <dependency>
              <groupId>com.att.aft</groupId>
              <artifactId>dme2</artifactId>
@@@ -75,6 -76,7 +76,6 @@@
              <scope>provided</scope>
          </dependency>
  
 -        <!--Adding this dependency explicit.-->
          <dependency>
              <groupId>org.json</groupId>
              <artifactId>json</artifactId>
@@@ -123,6 -125,7 +124,6 @@@
              <version>${org.apache.httpcomponents.httpclient.version}</version>
          </dependency>
  
 -        <!-- Champ graph database library. -->
          <dependency>
              <groupId>org.onap.aai</groupId>
              <artifactId>champ-core</artifactId>
@@@ -189,13 -192,7 +190,13 @@@
                      </execution>
                  </executions>
              </plugin>
 -
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-deploy-plugin</artifactId>
 +                <configuration>
 +                    <skip>true</skip>
 +                </configuration>
 +            </plugin>
                        <!--
              <plugin>
                  <groupId>com.mycila</groupId>
@@@ -224,7 -221,7 +225,7 @@@
                  <configuration>
                      <verbose>true</verbose>
                      <serverId>docker-hub</serverId>
-                     <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                     <imageName>${docker.push.registry}/onap/${project.name}</imageName>
                      <dockerDirectory>${docker.location}</dockerDirectory>
                      <imageTags>
                          <imageTag>latest</imageTag>
@@@ -232,6 -229,7 +233,6 @@@
                      <forceTags>true</forceTags>
                  </configuration>
              </plugin>
 -
              <plugin>
                  <groupId>org.jacoco</groupId>
                  <artifactId>jacoco-maven-plugin</artifactId>