diff options
| -rw-r--r-- | asdc-tests/pom.xml | 1 | ||||
| -rw-r--r-- | asdctool/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 33 | ||||
| -rw-r--r-- | catalog-ui/pom.xml | 1 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 1 | ||||
| -rw-r--r-- | sdc-os-chef/pom.xml | 33 | ||||
| -rw-r--r-- | security-utils/pom.xml | 1 | ||||
| -rw-r--r-- | test-apis-ci/pom.xml | 1 | ||||
| -rw-r--r-- | 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.5</version> <executions> <execution> <id>create.jar.with.dependencies</id> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> <executions> <execution> <id>create.jar.with.dependencies</id> 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 @@ </configuration> </execution> - <execution> - <id>copy-static-configuration-files</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</outputDirectory> - <resources> - <resource> - <directory>${project.parent.basedir}/catalog-be/src/main/resources/config</directory> - <includes> - <include>Artifact-Generator.properties</include> - <include>error-configuration.yaml</include> - <include>ecomp-error-configuration.yaml</include> - <include>logback.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> <id>copy-tosca-folder</id> <!-- here the phase you need --> @@ -741,16 +719,6 @@ <directory>${project.parent.basedir}/asdctool/tosca</directory> <followSymlinks>false</followSymlinks> </fileset> - <!-- static configuration files --> - <fileset> - <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory> - <includes> - <include>Artifact-Generator.properties</include> - <include>error-configuration.yaml</include> - <include>ecomp-error-configuration.yaml</include> - <include>logback.xml</include> - </includes> - </fileset> </filesets> </configuration> </execution> @@ -760,7 +728,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> <executions> <execution> <id>normatives</id> 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 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc</groupId> <artifactId>catalog-ui</artifactId> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc</groupId> <artifactId>common-app-api</artifactId> <parent> 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 @@ <include>**/default.rb</include> </includes> </fileset> + <!-- static configuration files --> + <fileset> + <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory> + <includes> + <include>Artifact-Generator.properties</include> + <include>error-configuration.yaml</include> + <include>ecomp-error-configuration.yaml</include> + <include>logback.xml</include> + </includes> + </fileset> </filesets> </configuration> </execution> @@ -109,6 +119,29 @@ </resources> </configuration> </execution> + + <execution> + <id>copy-static-configuration-files</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</outputDirectory> + <resources> + <resource> + <directory>${project.parent.basedir}/catalog-be/src/main/resources/config</directory> + <includes> + <include>Artifact-Generator.properties</include> + <include>error-configuration.yaml</include> + <include>ecomp-error-configuration.yaml</include> + <include>logback.xml</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> <id>copy-resources-be</id> <phase>validate</phase> 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 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc</groupId> <artifactId>security-utils</artifactId> <parent> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.5</version> <executions> <execution> <id>create.jar.with.dependencies</id> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.5</version> <executions> <execution> <id>create.jar.with.dependencies</id> |