summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:33:45 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-24 15:33:48 -0700
commit6da9a8a7b815a29e15dba2864ab3a5d1b02f27b3 (patch)
treeca27ca61598a557b2923c5515d76801bf1cccd84
parenta91ddad4ea939a49f0b5477d846ef549307eb0e1 (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: If4de93a99ba9f684decaf20fb98ce203359ddb7c Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--.gitreview3
-rw-r--r--veslibrary/ves_clibrary/VESreporting_vFW/pom.xml7
-rw-r--r--veslibrary/ves_clibrary/VESreporting_vLB/pom.xml5
-rw-r--r--veslibrary/ves_javalibrary/evel_javalib2/pom.xml3
4 files changed, 7 insertions, 11 deletions
diff --git a/.gitreview b/.gitreview
index 59d5642..99f7217 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
[gerrit]
host=gerrit.onap.org
port=29418
-project=vnfsdk/ves-agent
+project=vnfsdk/ves-agent.git
+defaultbranch=master
diff --git a/veslibrary/ves_clibrary/VESreporting_vFW/pom.xml b/veslibrary/ves_clibrary/VESreporting_vFW/pom.xml
index 2e0df62..f9f42eb 100644
--- a/veslibrary/ves_clibrary/VESreporting_vFW/pom.xml
+++ b/veslibrary/ves_clibrary/VESreporting_vFW/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
============LICENSE_START==========================================
===================================================================
@@ -21,9 +20,7 @@
ECOMP and OpenECOMP are trademarks
and service marks of AT&T Intellectual Property.
-->
-
-<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">
<parent>
<groupId>org.onap.demo.vnf</groupId>
@@ -83,4 +80,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml b/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml
index 70c906c..d0af18f 100644
--- a/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml
+++ b/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
============LICENSE_START==========================================
===================================================================
@@ -21,9 +20,7 @@
ECOMP and OpenECOMP are trademarks
and service marks of AT&T Intellectual Property.
-->
-
-<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">
<parent>
<groupId>org.onap.demo.vnf</groupId>
diff --git a/veslibrary/ves_javalibrary/evel_javalib2/pom.xml b/veslibrary/ves_javalibrary/evel_javalib2/pom.xml
index 5484ffb..04af481 100644
--- a/veslibrary/ves_javalibrary/evel_javalib2/pom.xml
+++ b/veslibrary/ves_javalibrary/evel_javalib2/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
================================================================================
Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -23,7 +24,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
</parent>
<groupId>org.onap.vnfsdk.ves-agent</groupId>