X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dbc-client%2Fpom.xml;h=30940bbf9404b28d7b138b97202b11a5edc8db99;hb=df83df895da136705765ac4301439c7ce4fdf592;hp=7d3652331d11c3ae8cd50f3c1a98a3ada95215dd;hpb=aa3cc0e7cd53265e8c82b56caf2f409ed5612e80;p=dmaap%2Fbuscontroller.git

diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 7d36523..30940bb 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -22,33 +22,31 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>dbc-client</artifactId>
-  <version>${artifact.version}</version>
   <name>dbc-client</name>
   <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>1.2.2</version>
-    <relativePath/>
+    <groupId>org.onap.dmaap.buscontroller</groupId>
+    <artifactId>parent</artifactId>
+    <version>${revision}</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
+  <description>Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning.</description>
+  <properties>
+    <multiproject.basedir>${basedir}/..</multiproject.basedir>
+    <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- docker image -->
+    <docker.image>onap/dmaap/dbc-client</docker.image>
+    <nexusproxy>https://nexus.onap.org</nexusproxy>
+    <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+    <!-- for Distribution Management -->
+    <sitePath>/content/sites/site/org/onap/dmaap/dbc-client/${revision}</sitePath>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+  </properties>
   <build>
     <finalName>dbc-client</finalName>
-
     <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>
         <groupId>org.apache.maven.plugins</groupId>
@@ -112,6 +110,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 +137,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 +148,7 @@
                     <directory>${multiproject.basedir}/misc</directory>
                         <includes>
                             <include>cert-client-init.sh</include>
+                            <include>aaf-ca.crt</include>
                         </includes>
                 </resource>
               </resources>
@@ -202,9 +220,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>
@@ -240,38 +259,4 @@
   </profiles>
   <dependencyManagement>
   </dependencyManagement>
-
-  <properties>
-    <multiproject.basedir>${basedir}/..</multiproject.basedir>
-    <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
-    <jersey.version>2.16</jersey.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jettyVersion>9.4.12.RC2</jettyVersion>
-    <eelf.version>1.0.0</eelf.version>
-    <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.0.3</artifact.version>
-    <!--  SONAR  -->
-    <jacoco.version>0.7.7.201606060606</jacoco.version>
-    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <!-- Default Sonar configuration -->
-    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-
-    <!-- docker image -->
-    <docker.image>onap/dmaap/dbc-client</docker.image>
-
-    <nexusproxy>https://nexus.onap.org</nexusproxy>
-    <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
-
-    <!-- for Distribution Management -->
-    <sitePath>/content/sites/site/org/onap/dmaap/dbc-client/${artifact.version}</sitePath>
-
-    <timestamp>${maven.build.timestamp}</timestamp>
-    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
-  </properties>
-  <description>Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning.</description>
 </project>