From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 22:26:48 +0000 (-0700)
Subject: Use managed guava version
X-Git-Tag: 1.2.1~6^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=253e7fe07de68cd87df12778e094be35ca209748;hp=44795f01bc3c53875a759dd6043d25b237362fad;p=optf%2Fosdf.git

Use managed guava version

Use centrally managed guava version specified in
oparent.  Includes upgrade to oparent 1.2.0.

This change was submitted by script and may include
additional whitespace or formatting changes.

Change-Id: I7fa03f06ae6662d6d658f97d96344d512c24a5ad
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/pom.xml b/pom.xml
index 0c9d589..9f05f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,7 @@
     License for the specific language governing permissions and limitations
     under the License.
 -->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>