From: Sébastien Determe <sd378r@intl.att.com>
Date: Thu, 14 Jun 2018 15:34:41 +0000 (+0000)
Subject: Merge "Fix the docker push"
X-Git-Tag: 3.0.0~65
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=21ebe86d82cb7e7700e45df9873ef5ca1834fc76;hp=-c;p=clamp.git

Merge "Fix the docker push"
---

21ebe86d82cb7e7700e45df9873ef5ca1834fc76
diff --combined pom.xml
index 6a58cb7b,75f27528..d849473d
--- a/pom.xml
+++ b/pom.xml
@@@ -258,17 -258,6 +258,17 @@@
  				</dependency>
  				<!-- Others dependencies -->
  				<dependency>
 +					<groupId>org.onap.aaf.authz</groupId>
 +					<artifactId>aaf-cadi-aaf</artifactId>
 +					<version>2.1.1</version>
 +					<exclusions>
 +						<exclusion>
 +							<groupId>javax.servlet</groupId>
 +							<artifactId>servlet-api</artifactId>
 +						</exclusion>
 +					</exclusions>
 +				</dependency>
 +				<dependency>
  						<groupId>ch.qos.logback</groupId>
  						<artifactId>logback-core</artifactId>
  						<version>1.2.3</version>
@@@ -918,13 -907,6 +918,6 @@@
  												<goals>
  														<goal>build</goal>
  												</goals>
- 												<configuration>
- 														<images>
- 															<image>
- 																<alias>onap-clamp</alias>
- 															</image>
- 														</images>
- 												</configuration>
  										</execution>
  										<execution>
  												<id>push-images</id>
@@@ -932,13 -914,6 +925,6 @@@
  												<goals>
  														<goal>push</goal>
  												</goals>
- 												<configuration>
- 														<images>
- 															<image>
- 																<alias>onap-clamp</alias>
- 															</image>
- 														</images>
- 												</configuration>
  										</execution>
  										<execution>
  												<id>docker-start-for-it</id>
@@@ -948,14 -923,6 +934,6 @@@
  												</goals>
  												<configuration>
  														<skip>${skipITs}</skip>
- 														<images>
- 															<image>
- 																<alias>mariadb</alias>
- 															</image>
- 															<image>
- 																<alias>python</alias>
- 															</image>
- 														</images>
  												</configuration>
  										</execution>
  										<execution>
@@@ -966,14 -933,6 +944,6 @@@
  												</goals>
  												<configuration>
  														<skip>${skipITs}</skip>
- 														<images>
- 															<image>
- 																<alias>mariadb</alias>
- 															</image>
- 															<image>
- 																<alias>python</alias>
- 															</image>
- 														</images>
  												</configuration>
  										</execution>
  								</executions>