Code Review
/
ccsdk
/
cds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use released Oslo/Potassium parent poms
[ccsdk/cds.git]
/
ms
/
py-executor
/
pom.xml
diff --git
a/ms/py-executor/pom.xml
b/ms/py-executor/pom.xml
index
9839c71
..
891bd8b
100644
(file)
--- a/
ms/py-executor/pom.xml
+++ b/
ms/py-executor/pom.xml
@@
-21,21
+21,16
@@
<parent>
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>cds-ms</artifactId>
<parent>
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>cds-ms</artifactId>
- <version>1.
0
.0-SNAPSHOT</version>
+ <version>1.
7
.0-SNAPSHOT</version>
</parent>
<artifactId>py-executor</artifactId>
</parent>
<artifactId>py-executor</artifactId>
- <name>MS Python
Script
Executor</name>
+ <name>MS Python Executor</name>
<description>Micro-service providing python environment with gRPC binding for python script execution</description>
<properties>
<description>Micro-service providing python environment with gRPC binding for python script execution</description>
<properties>
- <assembly.id>maven</assembly.id>
<image.name>onap/ccsdk-py-executor</image.name>
<image.name>onap/ccsdk-py-executor</image.name>
- <docker.push.phase>deploy</docker.push.phase>
- <docker.verbose>true</docker.verbose>
- <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<sonar.skip>true</sonar.skip>
</properties>
<sonar.skip>true</sonar.skip>
</properties>
@@
-88,9
+83,9
@@
</executions>
</plugin>
<plugin>
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.g
roovy.
maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>
1.0
</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>g
roovy-
maven-plugin</artifactId>
+ <version>
2.1.1
</version>
<executions>
<execution>
<phase>validate</phase>
<executions>
<execution>
<phase>validate</phase>
@@
-114,7
+109,7
@@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.
26.1
</version>
+ <version>0.
34.0
</version>
<inherited>false</inherited>
<configuration>
<images>
<inherited>false</inherited>
<configuration>
<images>
@@
-122,6
+117,7
@@
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
+ <noCache>true</noCache>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
@@
-131,19
+127,12
@@
</build>
</image>
</images>
</build>
</image>
</images>
- <verbose>true</verbose>
+ <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>${docker.push.phase}</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
<goals>
<goal>build</goal>
<goal>push</goal>