X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-bc%2Fpom.xml;h=3c953a803de33f18d9b7c6ed44dfacd0c62a3b8c;hb=507672403b6afe9e340585ab0757af2300c0435b;hp=0a77b8d2258fa3e160ed20b3c44b3e1368d502ee;hpb=ff7ac524776b850b0054026566d4d1026067896d;p=dmaap%2Fbuscontroller.git

diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index 0a77b8d..3c953a8 100644
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.2.2</version>
+    <version>2.1.0</version>
     <relativePath/>
   </parent>
   <build>
@@ -111,17 +111,6 @@
         </executions>
       </plugin>
 
-      <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>
@@ -187,10 +176,8 @@
                 </resource>
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
-                    <directory>${basedir}/misc</directory>
+                    <directory>${multiproject.basedir}/certs</directory>
                         <includes>
-                          <include>LocalKey</include>
-                          <include>logback.xml</include>
                           <include>org.onap.dmaap-bc.cred.props</include>
                           <include>org.onap.dmaap-bc.crontab.sh</include>
                           <include>org.onap.dmaap-bc.jks</include>
@@ -203,25 +190,35 @@
                         </includes>
                 </resource>
                  <resource>
-                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
-                    <directory>${basedir}</directory>
+                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/misc</targetPath>
+                    <directory>${multiproject.basedir}/misc</directory>
                         <includes>
-                            <include>version.properties</include>
+                            <include>cert-client-init.sh</include>
+                            <include>aaf-ca.crt</include>
                         </includes>
                 </resource>
                  <resource>
-                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/misc</targetPath>
+                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
                     <directory>${basedir}/misc</directory>
                         <includes>
-                            <include>opensource.env</include>
-                            <include>*.tmpl</include>
+                          <include>LocalKey</include>
+                          <include>logback.xml</include>
+                        </includes>
+                </resource>
+
+                 <resource>
+                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
+                    <directory>${multiproject.basedir}</directory>
+                        <includes>
+                            <include>version.properties</include>
                         </includes>
                 </resource>
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/misc</targetPath>
-                    <directory>${multiproject.basedir}/misc</directory>
+                    <directory>${basedir}/misc</directory>
                         <includes>
-                            <include>cert-client-init.sh</include>
+                            <include>opensource.env</include>
+                            <include>*.tmpl</include>
                         </includes>
                 </resource>
                  <resource>
@@ -424,7 +421,7 @@
     <dependency>
       <groupId>org.onap.dmaap.dbcapi</groupId>
       <artifactId>dbcapi</artifactId>
-      <version>1.0.24-SNAPSHOT</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <reporting>
@@ -462,7 +459,9 @@
     <jettyVersion>9.4.12.RC2</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.1.2</artifact.version>
+    <artifact.version>2.0.2-SNAPSHOT</artifact.version>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>