From 0cf307476514a2e9d7cac234f5ce057eddb895aa Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 24 Aug 2018 15:17:14 -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: I825720dacc4cf2ea124e2e22ab552dc5394ad0ed
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 odlparent/client-parent/pom.xml | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'odlparent/client-parent')

diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 51ba5074..deb0bcf0 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_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/maven-v4_0_0.xsd">
 
 
 	<modelVersion>4.0.0</modelVersion>
@@ -408,24 +406,19 @@
 					<configuration>
 						<tasks>
 							<!-- flatten out structure -->
-							<move todir="${project.build.directory}/dependency"
-								failonerror="false">
-								<fileset dir="${project.build.directory}/dependency" />
-								<mapper type="flatten" />
+							<move todir="${project.build.directory}/dependency" failonerror="false">
+								<fileset dir="${project.build.directory}/dependency"/>
+								<mapper type="flatten"/>
 							</move>
 							<!-- move to yang folder -->
-							<copy todir="${project.build.directory}/yang"
-								failonerror="false">
-								<fileset dir="${project.build.directory}/dependency"
-									includes="**/*.yang" />
-								<mapper type="flatten" />
+							<copy todir="${project.build.directory}/yang" failonerror="false">
+								<fileset dir="${project.build.directory}/dependency" includes="**/*.yang"/>
+								<mapper type="flatten"/>
 							</copy>
 							<!-- add in hard coded items from src/main/yang -->
-							<copy todir="${project.build.directory}/yang"
-								failonerror="false">
-								<fileset dir="${project.basedir}/src/main/yang"
-									includes="**/*.yang" />
-								<mapper type="flatten" />
+							<copy todir="${project.build.directory}/yang" failonerror="false">
+								<fileset dir="${project.basedir}/src/main/yang" includes="**/*.yang"/>
+								<mapper type="flatten"/>
 							</copy>
 						</tasks>
 					</configuration>
-- 
cgit 1.2.3-korg