From: Ram Koya <rk541m@att.com>
Date: Wed, 19 Sep 2018 02:28:11 +0000 (+0000)
Subject: Merge "Use managed guava version"
X-Git-Tag: 1.0.22~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=commitdiff_plain;h=0f62fd58cfab28353a911bd24e5df5874e3b5b58;hp=-c

Merge "Use managed guava version"
---

0f62fd58cfab28353a911bd24e5df5874e3b5b58
diff --combined pom.xml
index 25827bd,9db0726..9c4c155
--- a/pom.xml
+++ b/pom.xml
@@@ -8,9 -8,9 +8,9 @@@
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
-  
+ 
           http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@@ -28,7 -28,7 +28,7 @@@
    <parent>
      <groupId>org.onap.oparent</groupId>
      <artifactId>oparent</artifactId>
-     <version>1.1.0</version>
+     <version>1.2.0</version>
      <relativePath/>
    </parent>
      <build>
@@@ -211,7 -211,7 +211,7 @@@
  	</profiles>
    <dependencyManagement>
      <dependencies>
-  
+ 
        <dependency>
          <groupId>org.glassfish.jersey</groupId>
          <artifactId>jersey-bom</artifactId>
@@@ -301,7 -301,7 +301,7 @@@
  	<dependency>
  		<groupId>org.onap.dmaap.dbcapi</groupId>
  		<artifactId>dbcapi</artifactId>
 -		<version>1.0.14-SNAPSHOT</version>
 +		<version>1.0.15-SNAPSHOT</version>
  	</dependency>
    </dependencies>
    <reporting>
@@@ -334,9 -334,9 +334,9 @@@
    <properties>
      <jersey.version>2.16</jersey.version>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    <jettyVersion>9.3.7.v20160115</jettyVersion>
 +    <jettyVersion>9.3.8.RC0</jettyVersion>
      <eelf.version>0.0.1</eelf.version>
 -    <artifact.version>1.0.16</artifact.version>
 +    <artifact.version>1.0.18</artifact.version>
  		<!--  SONAR  -->
  		 <jacoco.version>0.7.7.201606060606</jacoco.version>
  	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>