summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:25:35 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-27 10:29:49 -0700
commit3114ee5fee806e3c44e12525f6a0b24c0eaa1fc9 (patch)
treec28542ee4e6b889299faccc58f41ddc3d9dc382c /pom.xml
parent0d2f003049e562354fda88729dbab70f46daa25f (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: I32d49c89aa250e155a66d1302c16893f27803997 Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'pom.xml')
-rwxr-xr-xpom.xml24
1 files changed, 12 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index 657973f6..15533ef2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
============LICENSE_START==========================================
org.onap.music
@@ -7,20 +8,19 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
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>
<groupId>org.onap.music</groupId>
<artifactId>MUSIC</artifactId>
@@ -33,8 +33,8 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>0.1.1</version>
- <relativePath />
+ <version>1.2.0</version>
+ <relativePath/>
</parent>
<properties>
@@ -219,7 +219,7 @@
<version>1.0.1-oss</version>
</dependency>
<!-- End Logging -->
-
+
<!-- Cassandra -->
<dependency>
<groupId>com.datastax.cassandra</groupId>
@@ -227,7 +227,7 @@
<version>${cassandra.version}</version>
</dependency>
<!-- /Cassandra -->
-
+
<!-- Zookeeper -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -241,7 +241,7 @@
</exclusions>
</dependency>
<!-- /Zookeeper -->
-
+
<!-- Jersey -->
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -335,7 +335,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+
</dependency>
<dependency>
<groupId>org.mindrot</groupId>