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>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index f2c01eb..cf98fb7 100755 (executable)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.mdsal</groupId>
                <artifactId>binding-parent</artifactId>
                <version>0.12.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -297,42 +295,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -896,7 +877,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 59bdde7..8a4ebcc 100755 (executable)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>bundle-parent</artifactId>
                <version>3.1.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -296,42 +294,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -793,7 +774,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 51ba507..deb0bcf 100644 (file)
--- 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>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 61c79c5..fa0db36 100755 (executable)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>feature-repo-parent</artifactId>
                <version>3.1.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -296,42 +294,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -793,7 +774,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 3ec5629..511d881 100755 (executable)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>karaf4-parent</artifactId>
                <version>3.1.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -294,42 +292,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -791,7 +772,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 621b1fb..d18af97 100755 (executable)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.controller</groupId>
                <artifactId>mdsal-it-parent</artifactId>
                <version>1.7.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -296,42 +294,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -794,7 +775,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 65ec036..d87ddad 100755 (executable)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>odlparent-lite</artifactId>
                <version>3.1.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -302,42 +300,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -826,7 +807,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index ba034d7..904eee7 100755 (executable)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>odlparent</artifactId>
                <version>3.1.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -296,42 +294,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -793,7 +774,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>
 

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index bbb4cb1..5fda8d3 100755 (executable)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-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>
@@ -14,7 +12,7 @@
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>single-feature-parent</artifactId>
                <version>3.1.3</version>
-               <relativePath />
+               <relativePath/>
        </parent>
 
 
@@ -300,42 +298,25 @@
                                                                        <exportAntProperties>true</exportAntProperties>
                                                                        <tasks>
 
-                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml"
-                                                                                       classpathref="maven.plugin.classpath" />
+                                                                               <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
                                                                                <condition property="is_windows" value="true">
-                                                                                       <os family="windows" />
+                                                                                       <os family="windows"/>
                                                                                </condition>
                                                                                <condition property="isLinux" value="true">
-                                                                                       <os family="unix" />
+                                                                                       <os family="unix"/>
                                                                                </condition>
                                                                                <if>
-                                                                                       <equals arg1="${is_windows}" arg2="true" />
+                                                                                       <equals arg1="${is_windows}" arg2="true"/>
                                                                                        <then>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.bat" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
                                                                                        </then>
                                                                                        <else>
-                                                                                               <property name="swagger.sdk.script.file"
-                                                                                                       value="generated-source-script.sh" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                                                                               <echo
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       append="true"
-                                                                                                       message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                                                                               <chmod
-                                                                                                       file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                                                                                       perm="755" />
+                                                                                               <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                                                               <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                                                               <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
                                                                                        </else>
                                                                                </if>
                                                                        </tasks>
@@ -829,7 +810,7 @@
                                        <!-- This version supports the "deployAtEnd" parameter -->
                                        <version>2.8</version>
                                        <configuration>
-                                               <skip />
+                                               <skip/>
                                        </configuration>
                                </plugin>