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: I8bbe9717ed402e3f350710606d9d241ca4e46c49
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/.gitreview b/.gitreview
index 17ce1b8..374170e 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
-[gerrit]\r
-host=gerrit.onap.org\r
-port=29418\r
-project=vnfsdk/ice\r
+[gerrit]
+host=gerrit.onap.org
+port=29418
+project=vnfsdk/ice.git
+defaultbranch=master

diff --git a/docker/pom.xml b/docker/pom.xml
index 4e5bdea..899033f 100644 (file)
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -13,16 +13,14 @@ 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>
         <relativePath>../../oparent</relativePath>
     </parent>
 
@@ -35,7 +33,7 @@ under the License.
 
     <properties>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <docker.push.registry></docker.push.registry>
+        <docker.push.registry/>
         <skip.docker.build>true</skip.docker.build>
         <skip.docker.tag>true</skip.docker.tag>
         <skip.docker.push>true</skip.docker.push>
@@ -67,9 +65,7 @@ under the License.
                                         <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
                                         <assembly>
                                             <mode>dir</mode>
-                                            <inline xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-                                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                                                    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+                                            <inline xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
                                                 <id>middleware-rest</id>
                                                 <fileSet>
                                                     <directory>${project.basedir}/../ice-server</directory>

diff --git a/ice-server/pom.xml b/ice-server/pom.xml
index e5a6263..c9c80bb 100644 (file)
--- a/ice-server/pom.xml
+++ b/ice-server/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../../oparent</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 0006066..aa1b57b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../oparent</relativePath>
     </parent>
 

diff --git a/validation-scripts/pom.xml b/validation-scripts/pom.xml
index 7038a53..aeba15b 100644 (file)
--- a/validation-scripts/pom.xml
+++ b/validation-scripts/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../../oparent</relativePath>
     </parent>