diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-03-02 20:00:49 -0500 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2021-03-09 15:45:05 +0000 |
commit | 0190b382e4b37854c4461bfcfce594c20f5dd8a8 (patch) | |
tree | a269b56f643b30b6f9d0c3e264ab6a49a11447bd /adaptors/features | |
parent | 3f3e689bb5940b93d52fe543d9cc0a814c576475 (diff) |
Refactoring pom's name tag
Indenting pom's and running mvn tidy:pom to rearrange items
Issue-ID: CCSDK-3198
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735
Diffstat (limited to 'adaptors/features')
-rw-r--r-- | adaptors/features/ccsdk-aai-service/pom.xml | 3 | ||||
-rw-r--r-- | adaptors/features/ccsdk-ansible-adapter/pom.xml | 5 | ||||
-rw-r--r-- | adaptors/features/ccsdk-base-http/pom.xml | 38 | ||||
-rw-r--r-- | adaptors/features/ccsdk-mdsal-resource/pom.xml | 2 | ||||
-rwxr-xr-x | adaptors/features/ccsdk-messagerouter-consumer/pom.xml | 46 | ||||
-rwxr-xr-x | adaptors/features/ccsdk-messagerouter-publisher/pom.xml | 46 | ||||
-rw-r--r-- | adaptors/features/ccsdk-netbox-client/pom.xml | 2 | ||||
-rw-r--r-- | adaptors/features/ccsdk-resource-assignment/pom.xml | 3 | ||||
-rw-r--r-- | adaptors/features/ccsdk-saltstack-adapter/pom.xml | 5 | ||||
-rw-r--r-- | adaptors/features/ccsdk-sli-adaptors-all/pom.xml | 4 | ||||
-rw-r--r-- | adaptors/features/ccsdk-sql-resource/pom.xml | 3 | ||||
-rwxr-xr-x | adaptors/features/installer/pom.xml | 505 | ||||
-rwxr-xr-x | adaptors/features/pom.xml | 46 |
13 files changed, 353 insertions, 355 deletions
diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 6f0f48e78..4f4266b3b 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> @@ -33,6 +33,5 @@ <version>${project.version}</version> </dependency> - </dependencies> </project> diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml index 8ee2bf432..4bc368f9e 100644 --- a/adaptors/features/ccsdk-ansible-adapter/pom.xml +++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> @@ -33,12 +33,11 @@ <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>powermock-api-mockito</artifactId> <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> </exclusion> </exclusions> </dependency> - </dependencies> </project> diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 9c94a38d5..0a656829c 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.1</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-base-http</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-base-http</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>base-http-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>base-http-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index 55ec57081..123f1b755 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 30bdcaa9b..d066340e8 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -1,28 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.1</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1</version> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>ccsdk-messagerouter-consumer</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>ccsdk-messagerouter-consumer</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>feature</packaging> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>consumer.api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>consumer.provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>consumer.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>consumer.provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index 0a0d5aec5..fff3ae3c5 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -1,28 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.1</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1</version> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>ccsdk-messagerouter-publisher</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>ccsdk-messagerouter-publisher</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>feature</packaging> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>publisher.api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>publisher.provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>publisher.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>publisher.provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index cd489761a..5258b53f5 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -30,7 +30,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index c5de29079..5b80354a8 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> @@ -42,6 +42,5 @@ <version>${project.version}</version> </dependency> - </dependencies> </project> diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml index c83577f8c..ae97470a9 100644 --- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> <dependency> @@ -28,11 +28,10 @@ <groupId>${project.groupId}</groupId> <artifactId>saltstack-adapter-provider</artifactId> <version>${project.version}</version> - <exclusions> <exclusion> - <artifactId>powermock-api-mockito</artifactId> <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> </exclusion> </exclusions> </dependency> diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 3fc7de1ae..7bf434323 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -31,7 +31,7 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <!-- saltstack-adapter needs to be changed to remove dependency on app-c code + <!-- saltstack-adapter needs to be changed to remove dependency on app-c code <dependency> <groupId>${project.groupId}</groupId> <artifactId>ccsdk-saltstack-adapter</artifactId> @@ -76,5 +76,5 @@ <type>xml</type> <classifier>features</classifier> </dependency> - </dependencies> + </dependencies> </project> diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index 329675105..a26adf16d 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -14,8 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name> - + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> <dependencies> diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index d4ad2242d..6f102b369 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -1,265 +1,264 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.1</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-features-installer</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-features-installer</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> - <properties> - <application.name>ccsdk-sli-adaptors-all</application.name> - <features.boot>${application.name}</features.boot> - <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <properties> + <application.name>ccsdk-sli-adaptors-all</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-aai-service</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-ansible-adapter</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-base-http</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-mdsal-resource</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>ccsdk-messagerouter-consumer</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>ccsdk-messagerouter-publisher</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-netbox-client</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-resource-assignment</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-saltstack-adapter</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-sql-resource</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>${application.name}</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-aai-service</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-ansible-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-base-http</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-mdsal-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>ccsdk-messagerouter-consumer</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>ccsdk-messagerouter-publisher</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-netbox-client</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-resource-assignment</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-saltstack-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-sql-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>${application.name}</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> - </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>maven-repo-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>stage/${application.name}-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>installer-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>${application.name}-${project.version}-installer</finalName> + <descriptors> + <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <transitive>false</transitive> + <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <useRepositoryLayout>true</useRepositoryLayout> + <addParentPoms>false</addParentPoms> + <copyPom>false</copyPom> + <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds> + <scope>provided</scope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/stage</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/scripts</directory> + <includes> + <include>install-feature.sh</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>maven-repo-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>stage/${application.name}-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>true</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>installer-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>${application.name}-${project.version}-installer</finalName> - <descriptors> - <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <transitive>false</transitive> - <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <useRepositoryLayout>true</useRepositoryLayout> - <addParentPoms>false</addParentPoms> - <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/stage</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/scripts</directory> - <includes> - <include>install-feature.sh</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> + </executions> + </plugin> - </executions> - </plugin> - - </plugins> - </build> + </plugins> + </build> </project> diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index 4ffc35be9..a09179d9d 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.1</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: features</name> + <name>ccsdk-sli-adaptors :: features</name> - <modules> - <module>ccsdk-aai-service</module> - <module>ccsdk-ansible-adapter</module> - <module>ccsdk-base-http</module> - <module>ccsdk-mdsal-resource</module> - <module>ccsdk-messagerouter-consumer</module> - <module>ccsdk-messagerouter-publisher</module> - <module>ccsdk-netbox-client</module> - <module>ccsdk-resource-assignment</module> - <module>ccsdk-saltstack-adapter</module> - <module>ccsdk-sql-resource</module> + <modules> + <module>ccsdk-aai-service</module> + <module>ccsdk-ansible-adapter</module> + <module>ccsdk-base-http</module> + <module>ccsdk-mdsal-resource</module> + <module>ccsdk-messagerouter-consumer</module> + <module>ccsdk-messagerouter-publisher</module> + <module>ccsdk-netbox-client</module> + <module>ccsdk-resource-assignment</module> + <module>ccsdk-saltstack-adapter</module> + <module>ccsdk-sql-resource</module> <module>ccsdk-sli-adaptors-all</module> <module>features-sli-adaptors</module> <module>installer</module> |