X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dbc-client%2Fpom.xml;h=a112f592b55e465988b3f26f34838b8a909ea029;hb=647012bb979152fcdefcb87eb4f3b5daa8843d39;hp=80defc54d86805d80bff1eddc57bb597d32e2f4a;hpb=8d21e71c13ab39ec01070fedaa298ff72e62da58;p=dmaap%2Fbuscontroller.git

diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 80defc5..a112f59 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.2.2</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
   <build>
@@ -38,16 +38,6 @@
     <plugins>
 
 
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ecomp-staging</serverId>
-          <nexusUrl>${nexusproxy}</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-        </configuration>
-      </plugin>
 
       <!-- for Distribution management -->
       <plugin>
@@ -112,6 +102,25 @@
                             <include>Dockerfile</include>
                         </includes>
                 </resource>
+                 <resource>
+                    <targetPath>${basedir}/target/docker-stage/opt/app/dbc-client/etc</targetPath>
+                    <directory>${multiproject.basedir}/certs</directory>
+                        <includes>
+                          <include>org.onap.dmaap-bc.cred.props</include>
+                          <include>org.onap.dmaap-bc.crontab.sh</include>
+                          <include>org.onap.dmaap-bc.jks</include>
+                          <include>org.onap.dmaap-bc.keyfile</include>
+                          <include>org.onap.dmaap-bc.location.props</include>
+                          <include>org.onap.dmaap-bc.p12</include>
+                          <include>org.onap.dmaap-bc.props</include>
+                          <include>org.onap.dmaap-bc.showpass</include>
+                          <include>org.onap.dmaap-bc.trust.jks</include>
+			  <include>ca.pem</include>
+                          <include>client.pem</include>
+			  <include>key.pem</include>
+                        </includes>
+                </resource>
+
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dbc-client/bin</targetPath>
                     <directory>${basedir}/misc</directory>
@@ -120,8 +129,8 @@
                         </includes>
                 </resource>
                  <resource>
-                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
-                    <directory>${basedir}</directory>
+                    <targetPath>${basedir}/target/docker-stage/opt/app/dbc-client/etc</targetPath>
+                    <directory>${multiproject.basedir}</directory>
                         <includes>
                             <include>version.properties</include>
                         </includes>
@@ -131,6 +140,7 @@
                     <directory>${multiproject.basedir}/misc</directory>
                         <includes>
                             <include>cert-client-init.sh</include>
+                            <include>aaf-ca.crt</include>
                         </includes>
                 </resource>
               </resources>
@@ -202,9 +212,10 @@
                         <verbose>${docker.verbose}</verbose>
                         <apiVersion>${docker.apiVersion}</apiVersion>
                         <pullRegistry>${docker.pull.registry}</pullRegistry>
+                        <pushRegistry>${docker.push.registry}</pushRegistry>
                         <images>
                             <image>                            
-                                <name>${onap.nexus.dockerregistry.daily}/${docker.image}</name>
+                                <name>${docker.image}</name>
                                 <build>
                                     <cleanup>try</cleanup>
                                     <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
@@ -249,7 +260,7 @@
     <jettyVersion>9.4.12.RC2</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.0.4</artifact.version>
+    <artifact.version>1.1.8</artifact.version>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>