summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:13:49 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-27 10:24:07 -0700
commit8f91eb4f4cbae2238a23aa578e4b4e2a61229dac (patch)
tree4dfcd5b0714d96c7b97c142068c576faa92f495f
parenta00d81675166c634c0cfe0ad2ffa35a4577557aa (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: Id32111956c2aa54b31f95854117d0ba5d8ba0a41 Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--pom.xml18
1 files changed, 8 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index f8fc53e..0704028 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
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.
-
+
-->
-<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.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.luaplugin</groupId>
@@ -77,7 +75,7 @@
</goals>
<configuration>
<target name="distribution">
- <zip destfile="target/${packageid}-${project.version}.zip" update="true" basedir="target/assembly/" includes="**" />
+ <zip destfile="target/${packageid}-${project.version}.zip" update="true" basedir="target/assembly/" includes="**"/>
<attachartifact file="target/${packageid}-${project.version}.zip" type="zip"/>
</target>
</configuration>