X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-bc%2Fpom.xml;h=d5580e4efe5b7f31dfb1c1d134737087be3b51c2;hb=311c7633e06861ab8d93de1738a3d6b3517abfbb;hp=5ad1ad8752458245f787cc5746236113932b3242;hpb=840e077756535ca6591ce893fc21e63e4b8a915e;p=dmaap%2Fbuscontroller.git

diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index 5ad1ad8..d5580e4 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>
@@ -50,6 +50,7 @@
                 <requireReleaseDeps>
                   <message>No Snapshots Allowed!</message>
                   <excludes>
+<!-- for example, these might be needed...
                     <exclude>org.onap.dmaap.dbcapi:dbcapi</exclude>
                     <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
                     <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
@@ -57,6 +58,7 @@
                     <exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
                     <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
                     <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
+-->
                   </excludes>
                 </requireReleaseDeps>
               </rules>
@@ -111,17 +113,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>
@@ -216,9 +207,10 @@
                           <include>logback.xml</include>
                         </includes>
                 </resource>
+
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
-                    <directory>${basedir}</directory>
+                    <directory>${multiproject.basedir}</directory>
                         <includes>
                             <include>version.properties</include>
                         </includes>
@@ -391,6 +383,11 @@
       <artifactId>jetty-server</artifactId>
       <version>${jettyVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jettyVersion}</version>
+    </dependency>
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
@@ -431,7 +428,7 @@
     <dependency>
       <groupId>org.onap.dmaap.dbcapi</groupId>
       <artifactId>dbcapi</artifactId>
-      <version>1.0.27-SNAPSHOT</version>
+      <version>2.0.1</version>
     </dependency>
   </dependencies>
   <reporting>
@@ -464,12 +461,14 @@
   <properties>
     <multiproject.basedir>${basedir}/..</multiproject.basedir>
     <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
-    <jersey.version>2.16</jersey.version>
+    <jersey.version>2.29</jersey.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jettyVersion>9.4.12.RC2</jettyVersion>
+    <jettyVersion>9.4.24.v20191120</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.1.5</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>