diff options
| author |   David Stilwell <stilwelld@att.com> | 2018-08-30 16:40:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-30 16:40:03 +0000 |
| commit | 7e2b9328e9d142be03824075384e9ab59c74ed7f (patch) | |
| tree | ba72954d4f6fce4113de73f08d56d658ca103967 | |
| parent | 6124f4f4b8cafa2947f85beb9df1a2c0ac0de314 (diff) | |
| parent | e6a0204220df69c099f3535774b7a04d88b59d2b (diff) | |
Merge "Use managed guava version"
| -rw-r--r-- | pomba/network-discovery-api/pom.xml | 9 | ||||
| -rw-r--r-- | pomba/network-discovery/pom.xml | 5 | ||||
| -rw-r--r-- | pomba/pom.xml | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml index 706e240..1d00d9d 100644 --- a/pomba/network-discovery-api/pom.xml +++ b/pomba/network-discovery-api/pom.xml @@ -16,15 +16,14 @@ 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> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.1</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <groupId>org.onap.sdnc.apps.pomba</groupId> @@ -52,4 +51,4 @@ limitations under the License. </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml index 85f3a84..00af026 100644 --- a/pomba/network-discovery/pom.xml +++ b/pomba/network-discovery/pom.xml @@ -16,8 +16,7 @@ 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> <parent> @@ -110,7 +109,7 @@ limitations under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>23.0</version> + </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> diff --git a/pomba/pom.xml b/pomba/pom.xml index cdec575..0854bc6 100644 --- a/pomba/pom.xml +++ b/pomba/pom.xml @@ -16,15 +16,14 @@ 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> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.1</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <groupId>org.onap.sdnc.apps.pomba</groupId> |