X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=0a2339a9fa40a31b56a66f9b242b3d0f5b97598d;hb=ce3e2816ec3aa034bdef323c1a33b71485e87eb0;hp=34253894083ff267a56114e06200be48f03199b9;hpb=f59a22539d5b372e2425c39963547985379d6990;p=sdc.git
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 3425389408..0a2339a9fa 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -10,88 +10,44 @@
org.openecomp.sdc
sdc-main
- 1.2.0-SNAPSHOT
+ 1.11.4-SNAPSHOT
- maven-clean-plugin
- 3.0.0
+ com.github.sylvainlaurent.maven
+ yaml-json-validator-maven-plugin
- clean.tosca.chef.os.folder
- clean
+ validate
+ validate
- clean
+ validate
-
-
- ${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/
- false
+
+
- **/default.rb
+ **/*.y*ml
-
-
-
- ${project.basedir}/sdc-sanity
- false
+
+
- *.jar
+ **/*.json
-
-
-
- ${project.basedir}/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites
- false
-
-
+
+
+ ${skipYamlJsonValidator}
-
- ru.yaal.maven
- write-text-files-maven-plugin
- 1.1
-
- 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
-
-
-
-
-
- docker-staging
-
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.version}-STAGING-latest
-
-
-
docker
@@ -99,91 +55,38 @@
-
- maven-resources-plugin
- 3.0.2
-
-
-
io.fabric8
docker-maven-plugin
- ${fabric8.version}
-
- true
- 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}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- onap/sdc-elasticsearch
- sdc-elasticsearch
-
- try
- ${project.basedir}/sdc-elasticsearch
-
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- onap/sdc-kibana
- sdc-kibana
-
- try
- ${project.basedir}/sdc-kibana
-
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
- onap/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra
sdc-cassandra
try
${project.basedir}/sdc-cassandra
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ latest
+
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
-
-
@@ -195,7 +98,7 @@
true
- onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra
@@ -214,7 +117,7 @@
push
- onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra