summaryrefslogtreecommitdiffstats
path: root/odlparent/feature-repo-parent/pom.xml
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:17:14 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-27 10:25:46 -0700
commit0cf307476514a2e9d7cac234f5ce057eddb895aa (patch)
treea34385f685eee86c48cf1719423a74f70ecac575 /odlparent/feature-repo-parent/pom.xml
parent868d4600605c2ceabb575c47cfcf620d8bf66a81 (diff)
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>
Diffstat (limited to 'odlparent/feature-repo-parent/pom.xml')
-rwxr-xr-xodlparent/feature-repo-parent/pom.xml47
1 files changed, 14 insertions, 33 deletions
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 61c79c56..fa0db364 100755
--- 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>