X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=cc37a2ab61be68702ec64ba7030521738f0cd115;hb=HEAD;hp=fa535ea52feefdef1b709bcb4d754e7cf7f1efbc;hpb=04a5bef1c0c8ac2bd22c416ef224d968279550ee;p=sdc.git
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index fa535ea52f..cc37a2ab61 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -10,75 +10,12 @@
org.openecomp.sdc
sdc-main
- 1.3.1-SNAPSHOT
+ 1.13.7-SNAPSHOT
-
- org.apache.maven.plugins
- maven-clean-plugin
-
-
- clean.tosca.chef.os.folder
- clean
-
- clean
-
-
-
-
- ${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/
- false
-
- **/default.rb
-
-
-
-
- ${project.basedir}/sdc-sanity
- false
-
- *.jar
-
-
-
-
- ${project.basedir}/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites
- false
-
-
-
-
-
-
-
- ru.yaal.maven
- write-text-files-maven-plugin
-
- UTF-8
-
-
-
- ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb
-
-
- normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
-
-
-
-
-
-
- write-text-files
- prepare-package
-
- write-text-files
-
-
-
-
com.github.sylvainlaurent.maven
yaml-json-validator-maven-plugin
@@ -102,6 +39,7 @@
+ ${skipYamlJsonValidator}
@@ -121,74 +59,34 @@
io.fabric8
docker-maven-plugin
- 1.23
- nexus3.onap.org:10001
+ ${verbose}
+ ${docker.api.version}
+ ${docker.registry}
- docker
- docker
+ ${docker.username}
+ ${docker.password}
-
-
- onap/sdc-init-elasticsearch
- sdc-init-elasticsearch
-
- try
- ${project.basedir}/sdc-init-elasticsearch
-
- ${docker.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- onap/sdc-elasticsearch
- sdc-elasticsearch
-
- try
- ${project.basedir}/sdc-elasticsearch
-
- ${docker.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- onap/sdc-kibana
- sdc-kibana
-
- try
- ${project.basedir}/sdc-kibana
-
- ${docker.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
- onap/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra
sdc-cassandra
try
${project.basedir}/sdc-cassandra
- ${docker.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ latest
+
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
-
-
@@ -200,7 +98,7 @@
true
- onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra
@@ -219,7 +117,7 @@
push
- onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra