diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-08-24 15:18:20 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-27 10:26:22 -0700 |
| commit | 3a0d0279416580bff31b85f504e191d34a9eb67b (patch) | |
| tree | a2761303f2acb82e958c9968bd49c2b4362cf315 /pom.xml | |
| parent | 29f6b8a97c35032bfe3809a3dc09e2a097af0997 (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: I1cc02994fb173e2503ab7ce56551ad0e9ad67011
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -20,9 +20,7 @@ ============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> <groupId>org.onap.clamp</groupId> <artifactId>clds</artifactId> @@ -32,7 +30,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> </parent> <description> @@ -85,7 +83,7 @@ <docker.skip.push>true</docker.skip.push> <docker.skip.tag>true</docker.skip.tag> <skip.staging.artifacts>false</skip.staging.artifacts> - <python.http.proxy.param></python.http.proxy.param> + <python.http.proxy.param/> <tomcat.version>8.5.32</tomcat.version> </properties> @@ -545,7 +543,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>25.1-jre</version> + </dependency> <!-- Remove the MYSQL connector and replace it by Mariadb --> <dependency> @@ -711,10 +709,10 @@ <doctype>book</doctype> <toc>left</toc> <toclevels>3</toclevels> - <numbered></numbered> - <hardbreaks></hardbreaks> - <sectlinks></sectlinks> - <sectanchors></sectanchors> + <numbered/> + <hardbreaks/> + <sectlinks/> + <sectanchors/> <generated>${project.build.directory}/asciidoc/generated</generated> </attributes> </configuration> |