diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-08-24 15:33:15 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-24 15:33:18 -0700 |
commit | da8260604a9210f5fcc3f51be5dd90943967d0fd (patch) | |
tree | c878e48b84a7662ec8277889a2fcb75fdd984f93 /docker | |
parent | b4c0dcb82c1054f3aca9e454876de496a859fe33 (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: I8bbe9717ed402e3f350710606d9d241ca4e46c49
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'docker')
-rw-r--r-- | docker/pom.xml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/docker/pom.xml b/docker/pom.xml index 4e5bdea..899033f 100644 --- 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> |