X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=champ-service%2Fpom.xml;h=6a31fb43b86677e1ce1abe0de7cdf88139a2a42f;hb=aa6f9acfc15b8836bc4b50bd6bdfa1b06c49d321;hp=2738dc5f2b2ffab29a020b0b977386f941af8782;hpb=42480c241e5882bd2e6002004e5013a0e1bd7429;p=aai%2Fchamp.git

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 2738dc5..6a31fb4 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -24,26 +24,24 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <groupId>org.onap.aai</groupId>
+        <artifactId>champ</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.aai</groupId>
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service</artifactId>
-    <version>1.2.0-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>
 
-        <version.com.google.guava>18.0</version.com.google.guava>
         <version.org.apache.commons.commons-lang3>3.7</version.org.apache.commons.commons-lang3>
         <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library>
-        <version.org.springframework.boot.spring-boot-dependencies>1.5.12.RELEASE</version.org.springframework.boot.spring-boot-dependencies>
+        <version.org.springframework.boot.spring-boot-dependencies>1.5.15.RELEASE</version.org.springframework.boot.spring-boot-dependencies>
     </properties>
 
     <dependencyManagement>
@@ -55,6 +53,18 @@ limitations under the License.
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient-cache</artifactId>
+                <version>4.5.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -112,7 +122,6 @@ limitations under the License.
          <dependency>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
-          <version>${version.com.google.guava}</version>
         </dependency>
 
         <dependency>
@@ -148,9 +157,9 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -201,28 +210,6 @@ limitations under the License.
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
             <version>1.1.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient-cache</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-cache</artifactId>
-            <version>4.5.3</version>
         </dependency>
     </dependencies>
 
@@ -300,22 +287,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>
@@ -347,7 +318,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>
@@ -355,6 +326,21 @@ limitations under the License.
                     <forceTags>true</forceTags>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>