X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=b67c064ffefc347b28b7ac2110e38aa626ad3997;hb=84d1ddc355acf519c165551d759bc00af12084c9;hp=f0bf6ec9ff405e6078cb5da886de616193ff1b83;hpb=441449536eac7a790f8ff184edcde740559b7d1a;p=sdc.git
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index f0bf6ec9ff..b67c064ffe 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -5,132 +5,49 @@
sdc-os-chef
pom
-
+
org.openecomp.sdc
sdc-main
- 1.2.0-SNAPSHOT
+ 1.13.5-SNAPSHOT
-
- ${project.version}-${maven.build.timestamp}
- ${project.version}-latest
-
-
- 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.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
- false
-
- Artifact-Generator.properties
- error-configuration.yaml
- ecomp-error-configuration.yaml
- logback.xml
-
-
-
-
- ${project.parent.basedir}/sdc-os-chef/sdc-backend
- false
-
- *.war
-
-
-
-
- ${project.parent.basedir}/sdc-os-chef/sdc-frontend/
- false
+
+
- *.war
-
-
-
- ${project.basedir}/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default
- false
-
- normatives.tar.gz
-
-
-
-
- ${project.basedir}/sdc-sanity
- false
-
- *.jar
-
-
-
-
- ${project.basedir}/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites
- false
-
-
+ **/*.json
+
+
+
+ ${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
@@ -138,267 +55,34 @@
-
- maven-resources-plugin
- 3.0.2
-
-
- copy-resources-apidocs
- validate
-
- copy-resources
-
-
- ${basedir}/sdc-backend
-
-
-
- ${project.parent.basedir}/openecomp-be/tools/swagger-ui/api-docs
-
-
- api-docs.war
-
-
-
-
-
-
-
- copy-static-configuration-files
- validate
-
- copy-resources
-
-
- ${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
-
-
- ${project.parent.basedir}/catalog-be/src/main/resources/config
-
- Artifact-Generator.properties
- error-configuration.yaml
- ecomp-error-configuration.yaml
- logback.xml
-
-
-
-
-
-
-
- copy-resources-be
- validate
-
- copy-resources
-
-
- ${basedir}/sdc-backend
-
-
- ${project.parent.basedir}/catalog-be/target
-
- catalog-be-${project.version}.war
-
-
-
-
- ${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target
-
-
- onboarding-be-${project.version}.war
-
-
-
-
-
-
-
- copy-resources-fe
- validate
-
- copy-resources
-
-
- ${basedir}/sdc-frontend
-
-
- ${project.parent.basedir}/catalog-fe/target
-
- catalog-fe-${project.version}.war
-
-
-
- ${project.parent.basedir}/openecomp-ui/target
-
- onboarding-fe-${project.version}.war
-
-
-
-
-
-
-
- copy-tests-suites
- validate
-
- copy-resources
-
-
- sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites
-
-
- ${project.parent.basedir}/test-apis-ci/src/main/resources/ci/testSuites
-
- *
-
-
-
-
-
-
- copy-resources-test-apis-ci
- validate
-
- copy-resources
-
-
- ${basedir}/sdc-sanity
-
-
- ${project.parent.basedir}/test-apis-ci/target
-
- test-apis-ci-${project.version}-jar-with-dependencies.jar
-
-
-
-
-
-
- copy-normatives
- validate
-
- copy-resources
-
-
- ${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default
-
-
- ${project.parent.basedir}/catalog-be/target
-
- normatives.tar.gz
-
-
-
-
-
-
-
-
-
io.fabric8
docker-maven-plugin
- 0.23.0
-
- true
- 1.23
- nexus3.onap.org:10001
+ ${verbose}
+ ${docker.api.version}
+ ${docker.registry}
- docker
- docker
-
-
-
+ ${docker.username}
+ ${docker.password}
+
+
-
-
- openecomp/sdc-backend
- sdc-backend
-
- try
- ${project.basedir}/sdc-backend
-
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- openecomp/sdc-frontend
- sdc-frontend
-
- try
- ${project.basedir}/sdc-frontend
-
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- openecomp/sdc-elasticsearch
- sdc-elasticsearch
-
- try
- ${project.basedir}/sdc-elasticsearch
-
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- openecomp/sdc-kibana
- sdc-kibana
-
- try
- ${project.basedir}/sdc-kibana
-
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
- openecomp/sdc-cassandra
+ ${docker.namespace}/sdc-cassandra
sdc-cassandra
try
${project.basedir}/sdc-cassandra
- ${docker.tag}
- ${docker.latest.tag}
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-
-
-
-
-
-
- openecomp/sdc-sanity
- sdc-sanity
-
- try
- ${project.basedir}/sdc-sanity
-
- ${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}
@@ -414,7 +98,7 @@
true
- openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity
+ ${docker.namespace}/sdc-cassandra
@@ -433,8 +117,7 @@
push
-
- openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity
+ ${docker.namespace}/sdc-cassandra