Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
RFC-8040 migration
[sdnc/oam.git]
/
installation
/
ansible-server
/
pom.xml
diff --git
a/installation/ansible-server/pom.xml
b/installation/ansible-server/pom.xml
index
b4f9d0d
..
5f17029
100644
(file)
--- a/
installation/ansible-server/pom.xml
+++ b/
installation/ansible-server/pom.xml
@@
-5,12
+5,10
@@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.
2
.0-SNAPSHOT</version>
+ <version>2.
8
.0-SNAPSHOT</version>
</parent>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ansible-server</artifactId>
<artifactId>installation-ansible-server</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
@@
-31,8
+29,9
@@
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>
<executions>
<execution>
<phase>validate</phase>
@@
-64,7
+63,7
@@
<includes>
<include>**/*</include>
</includes>
<includes>
<include>**/*</include>
</includes>
- <filtering>
fals
e</filtering>
+ <filtering>
tru
e</filtering>
</resource>
</resources>
</configuration>
</resource>
</resources>
</configuration>
@@
-82,7
+81,7
@@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.
28
.0</version>
+ <version>0.
34
.0</version>
<inherited>false</inherited>
<configuration>
<images>
<inherited>false</inherited>
<configuration>
<images>
@@
-90,7
+89,8
@@
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
@@
-100,19
+100,12
@@
</build>
</image>
</images>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
<goals>
<goal>build</goal>
<goal>push</goal>