summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManoop Talasila <talasila@research.att.com>2018-09-13 21:01:24 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-13 21:01:24 +0000
commite36cebe93604db3b30617c8d56811596c0a1ded2 (patch)
tree5a2e1b1db32b8883012db79517775f5d8d567812
parentc7810657f088814052a8ed90fd0c4e08dd14a211 (diff)
parent364a7e1fb71415a749e024a3e90766762db16c67 (diff)
Merge "Use managed guava version"
-rw-r--r--ecomp-portal-widget-ms/widget-ms/pom.xml5
-rw-r--r--pom.xml9
2 files changed, 6 insertions, 8 deletions
diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 91dc4fd6..7c5a40e6 100644
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<!-- This project must name Spring as parent; cannot name Portal -->
@@ -8,7 +7,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.2.RELEASE</version>
- <relativePath /> <!-- lookup parent from repository -->
+ <relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.onap.portal</groupId>
diff --git a/pom.xml b/pom.xml
index aef19caa..3986bf4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <relativePath />
+ <version>1.2.0</version>
+ <relativePath/>
</parent>
<groupId>org.onap.portal</groupId>
@@ -125,7 +124,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>