diff options
| author |   Huabing Zhao <zhaohuabing@gmail.com> | 2018-09-10 01:56:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-10 01:56:39 +0000 |
| commit | 07c51ccd6ded30e8d5ceba4abaed0c202a183283 (patch) | |
| tree | 75334f42702656ae5a563688905e55893cdb010f | |
| parent | e7e46da2c98d3de51f840793e23f2e5d30cd81ed (diff) | |
| parent | 18463a6698ee3c2a97c1baefa7cb8205043a6c18 (diff) | |
Merge "Use managed guava version"
| -rw-r--r-- | apiroute/pom.xml | 5 | ||||
| -rw-r--r-- | pom.xml | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/apiroute/pom.xml b/apiroute/pom.xml index 5f68963..88d5b66 100644 --- a/apiroute/pom.xml +++ b/apiroute/pom.xml @@ -7,8 +7,7 @@ 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.msb.apigateway</groupId> <artifactId>msb-apigateway-parent</artifactId> @@ -86,7 +85,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + </dependency> <dependency> <groupId>net.sourceforge.argparse4j</groupId> @@ -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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> </parent> <groupId>org.onap.msb.apigateway</groupId> <artifactId>msb-apigateway-parent</artifactId> |