From 2d669cf777cf595b315f9d667a21a2d27084f46c Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 15:20:36 -0700
Subject: 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: I0f54a8a9fb9ce4536c621c81f9c3be54d121a4e1
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 pom.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 2781799b..1ed7329d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,7 @@
   ~ limitations under the License.
   ~ ============LICENSE_END=========================================================
   -->
-<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>
 
@@ -33,7 +32,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -88,7 +87,7 @@
         <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
         <docker-image.namespace>onap</docker-image.namespace>
         <docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name>
-        <docker.http_proxy></docker.http_proxy>
+        <docker.http_proxy/>
 
     </properties>
 
@@ -310,11 +309,7 @@
                         </goals>
                         <configuration>
                             <target name="detekt" unless="${skipAnalysis}">
-                                <java taskname="detekt" dir="${basedir}"
-                                        fork="true"
-                                        failonerror="true"
-                                        classname="io.gitlab.arturbosch.detekt.cli.Main"
-                                        classpathref="maven.plugin.classpath">
+                                <java taskname="detekt" dir="${basedir}" fork="true" failonerror="true" classname="io.gitlab.arturbosch.detekt.cli.Main" classpathref="maven.plugin.classpath">
                                     <arg value="--input"/>
                                     <arg value="${basedir}/src/main/kotlin"/>
                                     <arg value="--config-resource"/>
@@ -500,7 +495,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>25.0-jre</version>
+
                 <exclusions>
                     <exclusion>
                         <groupId>com.google.code.findbugs</groupId>
@@ -666,5 +661,3 @@
         </dependencies>
     </dependencyManagement>
 </project>
-
-
-- 
cgit 1.2.3-korg