diff options
| author |   Jim Hahn <jrh3@att.com> | 2021-07-21 12:20:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-07-21 12:20:44 +0000 |
| commit | 2958b5acd966b4a51a907432f9275fff8ab04017 (patch) | |
| tree | 200dc1b9ee06e8e7363d1a95edeb52682b9d978e | |
| parent | aeebc6cafdde85dcd14aef298d1fa9bfb1729096 (diff) | |
| parent | 553ce37dfeac0228ffed81381c89cdbb50b6d2d2 (diff) | |
Merge "Use docker registry properties in docker images"
| -rw-r--r-- | policy-jdk/pom.xml | 4 | ||||
| -rw-r--r-- | policy-jre/pom.xml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/policy-jdk/pom.xml b/policy-jdk/pom.xml index d18eca56..96a3bbf8 100644 --- a/policy-jdk/pom.xml +++ b/policy-jdk/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2019 Ericsson, Tieto. All rights reserved. - Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -38,8 +38,6 @@ <docker.skip>false</docker.skip> <docker.skip.build>false</docker.skip.build> <docker.skip.push>false</docker.skip.push> - <docker.pull.registry>docker.io</docker.pull.registry> - <docker.push.registry>docker.io</docker.push.registry> <docker.build.version>${project.version}</docker.build.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> </properties> diff --git a/policy-jre/pom.xml b/policy-jre/pom.xml index db958c30..5598e940 100644 --- a/policy-jre/pom.xml +++ b/policy-jre/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2019 Ericsson, Tieto. All rights reserved. - Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -38,8 +38,6 @@ <docker.skip>false</docker.skip> <docker.skip.build>false</docker.skip.build> <docker.skip.push>false</docker.skip.push> - <docker.pull.registry>docker.io</docker.pull.registry> - <docker.push.registry>docker.io</docker.push.registry> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> </properties> |