From 004829c34aaf326bc3a7307a94cd058018d45a25 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 10 Sep 2017 20:06:45 +0300 Subject: pom.xml fixes for entire SDC Change-Id: Ia4db900502b27e162fd9c6e69a797082a8c240f7 Issue-ID:SDC-273 Signed-off-by: Tal Gitelman --- asdc-tests/pom.xml | 1 - asdctool/pom.xml | 1 - catalog-be/pom.xml | 33 --------------------------------- catalog-ui/pom.xml | 1 - common-app-api/pom.xml | 1 - sdc-os-chef/pom.xml | 33 +++++++++++++++++++++++++++++++++ security-utils/pom.xml | 1 - test-apis-ci/pom.xml | 1 - ui-ci/pom.xml | 1 - 9 files changed, 33 insertions(+), 40 deletions(-) diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 7e7476253a..de800cfcf7 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -306,7 +306,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.5.5 create.jar.with.dependencies diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 88031c8e44..633360d8f8 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -539,7 +539,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 create.jar.with.dependencies diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 870bf09be6..6d34402ac5 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -682,28 +682,6 @@ - - copy-static-configuration-files - install - - 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-tosca-folder @@ -741,16 +719,6 @@ ${project.parent.basedir}/asdctool/tosca false - - - ${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default - - Artifact-Generator.properties - error-configuration.yaml - ecomp-error-configuration.yaml - logback.xml - - @@ -760,7 +728,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 normatives diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml index 80d534c669..8d93c4bd50 100644 --- a/catalog-ui/pom.xml +++ b/catalog-ui/pom.xml @@ -3,7 +3,6 @@ 4.0.0 - org.openecomp.sdc catalog-ui pom diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 70ddd5cfee..d7e3f5beb2 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -3,7 +3,6 @@ 4.0.0 - org.openecomp.sdc common-app-api diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index d0131e4e55..79eab3502a 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -38,6 +38,16 @@ **/default.rb + + + ${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default + + Artifact-Generator.properties + error-configuration.yaml + ecomp-error-configuration.yaml + logback.xml + + @@ -109,6 +119,29 @@ + + + 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 diff --git a/security-utils/pom.xml b/security-utils/pom.xml index 3e3c9fad76..5928020a2f 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -3,7 +3,6 @@ 4.0.0 - org.openecomp.sdc security-utils diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 0059e23de1..7184c8b06f 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -329,7 +329,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.5.5 create.jar.with.dependencies diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 06e3be24ff..9206348c3b 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -277,7 +277,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.5.5 create.jar.with.dependencies -- cgit 1.2.3-korg