Code Review
/
sdc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update version to 1.13.5
[sdc.git]
/
sdc-os-chef
/
pom.xml
diff --git
a/sdc-os-chef/pom.xml
b/sdc-os-chef/pom.xml
index
f1c1401
..
b67c064
100644
(file)
--- a/
sdc-os-chef/pom.xml
+++ b/
sdc-os-chef/pom.xml
@@
-10,7
+10,7
@@
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.
6.1
-SNAPSHOT</version>
+ <version>1.
13.5
-SNAPSHOT</version>
</parent>
</parent>
@@
-39,6
+39,7
@@
</includes>
</validationSet>
</validationSets>
</includes>
</validationSet>
</validationSets>
+ <skip>${skipYamlJsonValidator}</skip>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
@@
-58,26
+59,30
@@
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
- <apiVersion>1.23</apiVersion>
- <registry>nexus3.onap.org:10001</registry>
+ <verbose>${verbose}</verbose>
+ <apiVersion>${docker.api.version}</apiVersion>
+ <registry>${docker.registry}</registry>
<authConfig>
<pull>
<authConfig>
<pull>
- <username>
docker
</username>
- <password>
docker
</password>
+ <username>
${docker.username}
</username>
+ <password>
${docker.password}
</password>
</pull>
</authConfig>
<images>
<!-- Build cassandra image -->
<image>
</pull>
</authConfig>
<images>
<!-- Build cassandra image -->
<image>
- <name>
onap
/sdc-cassandra</name>
+ <name>
${docker.namespace}
/sdc-cassandra</name>
<alias>sdc-cassandra</alias>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-cassandra</dockerFileDir>
<tags>
<alias>sdc-cassandra</alias>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-cassandra</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
</tags>
</build>
</image>
@@
-93,7
+98,7
@@
</goals>
<configuration>
<removeAll>true</removeAll>
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>
onap
/sdc-cassandra</image>
+ <image>
${docker.namespace}
/sdc-cassandra</image>
</configuration>
</execution>
</configuration>
</execution>
@@
-112,7
+117,7
@@
<goal>push</goal>
</goals>
<configuration>
<goal>push</goal>
</goals>
<configuration>
- <image>
onap
/sdc-cassandra</image>
+ <image>
${docker.namespace}
/sdc-cassandra</image>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>