diff options
| author |   Michael Lando <ml636r@att.com> | 2018-05-03 18:05:37 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-05-03 18:05:37 +0300 |
| commit | c789e6fd5aaf3316ce640bbdeabcfcec6db84624 (patch) | |
| tree | 72bb0fd1f718c42c45846467b8d5bdab6701f8f8 /pom.xml | |
| parent | 59d7583ae891fd9989b33c1f830da2a9c5befecc (diff) | |
fix merge failure
set all versions in the bases
Change-Id: I9e54a5b391c97c261045d8e6fca02aa84f926478
Issue-ID: SDC-1222
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 176 |
1 files changed, 88 insertions, 88 deletions
@@ -5,7 +5,7 @@ <groupId>org.onap.sdc.sdc-docker-base</groupId> <artifactId>sdc-docker-base</artifactId> <packaging>pom</packaging> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <name>sdc-sdc-docker-base</name> <properties> @@ -39,96 +39,96 @@ <configuration> <images> <!-- base_sdc-jetty for backend and frontend --> - <image> - <name>onap/base_sdc-jetty</name> - <alias>base_sdc-jetty</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-jetty</dockerFileDir> - </build> - </image> + <!--<image>--> + <!--<name>onap/base_sdc-jetty</name>--> + <!--<alias>base_sdc-jetty</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-jetty</dockerFileDir>--> + <!--</build>--> + <!--</image>--> <!-- base_sdc-kibana --> - <image> - <name>onap/base_sdc-kibana</name> - <alias>base_sdc-kibana</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-kibana</dockerFileDir> - </build> - </image> + <!--<image>--> + <!--<name>onap/base_sdc-kibana</name>--> + <!--<alias>base_sdc-kibana</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-kibana</dockerFileDir>--> + <!--</build>--> + <!--</image>--> <!-- base_sdc-cassandra --> - <image> - <name>onap/base_sdc-cassandra</name> - <alias>base_sdc-cassandra</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir> - </build> - </image> - <!-- base_sdc-cqlsh --> - <image> - <name>onap/base_sdc-cqlsh</name> - <alias>base_sdc-cqlsh</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir> - </build> - </image> - <!-- base_sdc-python --> - <image> - <name>onap/base_sdc-python</name> - <alias>base_sdc-python</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir> - </build> - </image> - <!-- base_sdc-elasticsearch --> - <image> - <name>onap/base_sdc-elasticsearch</name> - <alias>base_sdc-elasticsearch</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir> - </build> - </image> + <!--<image>--> + <!--<name>onap/base_sdc-cassandra</name>--> + <!--<alias>base_sdc-cassandra</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir>--> + <!--</build>--> + <!--</image>--> + <!--<!– base_sdc-cqlsh –>--> + <!--<image>--> + <!--<name>onap/base_sdc-cqlsh</name>--> + <!--<alias>base_sdc-cqlsh</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir>--> + <!--</build>--> + <!--</image>--> + <!--base_sdc-python--> + <!--<image>--> + <!--<name>onap/base_sdc-python</name>--> + <!--<alias>base_sdc-python</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir>--> + <!--</build>--> + <!--</image>--> + <!--base_sdc-elasticsearch--> + <!--<image>--> + <!--<name>onap/base_sdc-elasticsearch</name>--> + <!--<alias>base_sdc-elasticsearch</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir>--> + <!--</build>--> + <!--</image>--> <!-- base_sdc-sanity --> - <image> - <name>onap/base_sdc-sanity</name> - <alias>base_sdc-sanity</alias> - <build> - <cleanup>true</cleanup> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - </tags> - <dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir> - </build> - </image> + <!--<image>--> + <!--<name>onap/base_sdc-sanity</name>--> + <!--<alias>base_sdc-sanity</alias>--> + <!--<build>--> + <!--<cleanup>true</cleanup>--> + <!--<tags>--> + <!--<tag>${docker.tag}</tag>--> + <!--<tag>${docker.latest.tag}</tag>--> + <!--</tags>--> + <!--<dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir>--> + <!--</build>--> + <!--</image>--> <!-- base_sdc-vnc --> <image> <name>onap/base_sdc-vnc</name> |