summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:33:06 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-24 15:33:09 -0700
commit85612e39b38e9409f81a51f2e8d54d207e283128 (patch)
treea7670d35238b26006ed5ba9588bf92cf03037d8f
parent5e5e493a5ec5048c0a340e2acd72f52869779fdf (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: Ibf39768764a30e1b33f3353d5485512e385b4edd Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--.gitreview3
-rw-r--r--pom.xml4
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitreview b/.gitreview
index 9cd5d22..089b0c3 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
[gerrit]
host=gerrit.onap.org
port=29418
-project=vnfsdk/dovetail-integration
+project=vnfsdk/dovetail-integration.git
+defaultbranch=master
diff --git a/pom.xml b/pom.xml
index 474e7f7..c317632 100644
--- 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>
</parent>
<groupId>org.onap.vnfsdk.dovetail-integration</groupId>
@@ -38,7 +38,7 @@ under the License.
<sonar.exclusions>version.py,setup.py</sonar.exclusions>
<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>