diff options
Diffstat (limited to 'adaptors')
50 files changed, 1350 insertions, 1340 deletions
diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 49db131eb..37e21fc40 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-aai-service</application.name> @@ -45,7 +45,6 @@ <version>${project.version}</version> </dependency> - </dependencies> <build> diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index f6fbe63be..4def1b073 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: aai-service</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <description>The AAI Interface service exposes an interface to AAI as an OSGi service</description> <modules> diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index 617d4ff4e..e1b1cabcf 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <dependencyManagement> <dependencies> @@ -48,7 +48,7 @@ <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-filter-base</artifactId> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> @@ -98,7 +98,7 @@ </dependency> <dependency> <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <artifactId>jaxb-api</artifactId> </dependency> <dependency> <groupId>javax.annotation</groupId> diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml index b47eaa643..acf220396 100644 --- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ============LICENSE_START======================================================= - ONAP : APPC ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. - ================================================================================ - Copyright (C) 2017 Amdocs ============================================================================= - Licensed under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. You may obtain a copy - of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. ECOMP is +<!-- ============LICENSE_START======================================================= + ONAP : APPC ================================================================================ + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + ================================================================================ + Copyright (C) 2017 Amdocs ============================================================================= + Licensed under the Apache License, Version 2.0 (the "License"); you may not + use this file except in compliance with the License. You may obtain a copy + of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> <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"> @@ -28,7 +28,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <dependencyManagement> <dependencies> @@ -60,7 +60,6 @@ <artifactId>httpclient</artifactId> </dependency> - <!-- Needed to run test cases --> <dependency> <groupId>org.glassfish.jersey.core</groupId> @@ -116,12 +115,10 @@ <artifactId>json</artifactId> </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - </dependencies> </project> diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml index f393ede76..13fe78edb 100644 --- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml @@ -38,7 +38,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-ansible-adapter</application.name> @@ -55,7 +55,6 @@ <version>${project.version}</version> </dependency> - </dependencies> <build> @@ -70,7 +69,7 @@ </goals> <phase>package</phase> <configuration> - <appendAssemblyId>true</appendAssemblyId> + <appendAssemblyId>true</appendAssemblyId> <attach>true</attach> <finalName>stage/${application.name}-${project.version}</finalName> <descriptors> @@ -85,7 +84,7 @@ </goals> <phase>package</phase> <configuration> - <appendAssemblyId>false</appendAssemblyId> + <appendAssemblyId>false</appendAssemblyId> <attach>true</attach> <finalName>${application.name}-${project.version}</finalName> <descriptors> diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml index 65fd5de0c..8d8f85720 100644 --- a/adaptors/ansible-adapter/pom.xml +++ b/adaptors/ansible-adapter/pom.xml @@ -24,168 +24,166 @@ --> <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> - - <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>ansible-adaptor</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-adaptors :: ansible-adapter</name> - <description>Abstractions to interact with Ansible server via REST</description> - - <modules> - <module>ansible-adapter-bundle</module> - <module>ansible-adapter-installer</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>ansible-adapter-features</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>ansible-adapter-provider</artifactId> - <version>${project.version}</version> - </dependency> - - - </dependencies> - - - </dependencyManagement> - - <pluginRepositories> - <!-- Black Duck plugin dependencies --> + <modelVersion>4.0.0</modelVersion> + + <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>ansible-adaptor</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + <description>Abstractions to interact with Ansible server via REST</description> + + <modules> + <module>ansible-adapter-bundle</module> + <module>ansible-adapter-installer</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>ansible-adapter-features</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>ansible-adapter-provider</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> + + </dependencyManagement> + + <pluginRepositories> + <!-- Black Duck plugin dependencies --> <pluginRepository> <id>JCenter</id> <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - </pluginRepositories> - - <build> - <plugins> - - <!-- Black duck plugin Not required for regular builds - <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> - </configuration> <extensions>true</extensions> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - - </plugin> - --> - - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>4.3</version> - </additionalDependency> - </additionalDependencies> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc-no-fork</report> - <report>test-javadoc-no-fork</report> - </reports> - </reportSet> - <reportSet> - <id>aggregate</id> - <reports> - <report>aggregate</report> - <report>test-aggregate</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - <reportSets> - <reportSet> - <id>aggregate</id> - <reports> - <report>aggregate</report> - <report>test-aggregate</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.3</version> - <reportSets> - <reportSet> - <id>dual-report</id> - <configuration> - <type>range</type> - <range>30</range> - </configuration> - <reports> - <report>changelog</report> - <report>file-activity</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> - </plugin> - </plugins> - - </reporting> + </pluginRepositories> + + <build> + <plugins> + + <!-- Black duck plugin Not required for regular builds + <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> + </configuration> <extensions>true</extensions> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + + </plugin> + --> + + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <additionalDependencies> + <additionalDependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>4.3</version> + </additionalDependency> + </additionalDependencies> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc-no-fork</report> + <report>test-javadoc-no-fork</report> + </reports> + </reportSet> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + <report>test-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + <report>test-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <id>dual-report</id> + <configuration> + <type>range</type> + <range>30</range> + </configuration> + <reports> + <report>changelog</report> + <report>file-activity</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> + </plugin> + </plugins> + + </reporting> </project> diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index a0473197b..7be30447e 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -1,147 +1,147 @@ <?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>sli-adaptors-artifacts</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sli-adaptors-artifacts</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: sli-adaptors-artifacts</name> - <description>CCSDK adaptors components Bill of Materials (BOM)</description> - <url>https://wiki.onap.org</url> - <organization> - <name>ONAP</name> - </organization> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + <description>CCSDK adaptors components Bill of Materials (BOM)</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-aai-service</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-ansible-adapter</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-mdsal-resource</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-netbox-client</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-resource-management</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-saltstack-adapter</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-sql-resource</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>feature</classifier> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>aai-service-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>aai-service-installer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter-installer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>mdsal-resource-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>mdsal-resource-installer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>netbox-client-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>netbox-client-installer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>resource-assignment-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>resource-assignment-installer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adapter-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adapter-installer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sql-resource-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sql-resource-installer</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-aai-service</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-ansible-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-mdsal-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-netbox-client</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-resource-management</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-saltstack-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-sql-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>feature</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>aai-service-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>aai-service-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ansible-adapter-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ansible-adapter-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>mdsal-resource-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>mdsal-resource-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>netbox-client-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>netbox-client-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>resource-assignment-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>resource-assignment-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>saltstack-adapter-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>saltstack-adapter-installer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sql-resource-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sql-resource-installer</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> </project> diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index b0f69b966..199bf1a61 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -1,127 +1,127 @@ <?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>base-http-installer</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-installer</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> - <properties> - <application.name>ccsdk-base-http</application.name> - <features.boot>${application.name}</features.boot> + <properties> + <application.name>ccsdk-base-http</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> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <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> - <includeArtifactIds>ccsdk-base-http,base-http-provider</includeArtifactIds> - <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> + <version>2.6</version> + <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> + <includeArtifactIds>ccsdk-base-http,base-http-provider</includeArtifactIds> + <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/base/http/pom.xml b/adaptors/base/http/pom.xml index ea77acb69..60e9a2407 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -14,6 +14,8 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>ccsdk-sli-adaptors :: base-${project.artifactId}</name> + <modules> <module>provider</module> <module>installer</module> diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 49fee0cec..daa9dd9e7 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -1,39 +1,41 @@ <?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>binding-parent</artifactId> - <version>2.1.1</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>bundle</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-provider</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>bundle</packaging> - <dependencies> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.onap.logging-analytics</groupId> - <artifactId>logging-filter-base</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + + <dependencies> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </project> diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 6ab8e4f1a..3320f9358 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -7,13 +7,15 @@ <artifactId>odlparent-lite</artifactId> <version>2.1.1</version> <relativePath/> - </parent> + </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-parent</artifactId> <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + <modules> <module>http</module> </modules> 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> diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index e6a7c05ff..ec934544b 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-mdsal-resource</application.name> diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index 76013e27a..7f88cbcff 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: mdsal-resource</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <description>The MD-SAL resource adaptor allows service logic to access persistent data from MD-SAL config and operational trees</description> <modules> diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 27dd12390..b7c6abd37 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <url>http://maven.apache.org</url> <properties> @@ -22,15 +22,15 @@ </properties> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> @@ -50,10 +50,10 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> diff --git a/adaptors/message-router/consumer/api/pom.xml b/adaptors/message-router/consumer/api/pom.xml index 20e1b9204..504e2e631 100755 --- a/adaptors/message-router/consumer/api/pom.xml +++ b/adaptors/message-router/consumer/api/pom.xml @@ -1,27 +1,29 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>consumer.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>consumer.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>consumer.api</artifactId> - <packaging>bundle</packaging> + <artifactId>consumer.api</artifactId> + <packaging>bundle</packaging> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.onap.ccsdk.sli.adaptors.messagerouter.consumer.api</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <name>ccsdk-sli-adaptors :: message-router :: ${project.artifactId}</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package>org.onap.ccsdk.sli.adaptors.messagerouter.consumer.api</Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/adaptors/message-router/consumer/installer/pom.xml b/adaptors/message-router/consumer/installer/pom.xml index 3e044c5b8..03eeb0fc0 100755 --- a/adaptors/message-router/consumer/installer/pom.xml +++ b/adaptors/message-router/consumer/installer/pom.xml @@ -1,128 +1,130 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>consumer.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>consumer.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>consumer.installer</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>consumer.installer</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <properties> - <application.name>messagerouter-consumer</application.name> - <features.boot>messagerouter-consumer</features.boot> - <features.repositories>mvn:${project.groupId}/consumer.features/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <name>ccsdk-sli-adaptors :: message-router :: ${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> + <properties> + <application.name>messagerouter-consumer</application.name> + <features.boot>messagerouter-consumer</features.boot> + <features.repositories>mvn:${project.groupId}/consumer.features/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <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>${project.groupId}</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> + <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> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <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>${project.groupId}</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> - </plugins> - </build> + </executions> + </plugin> + + </plugins> + </build> </project> diff --git a/adaptors/message-router/consumer/pom.xml b/adaptors/message-router/consumer/pom.xml index d99511d48..7afd84fb4 100755 --- a/adaptors/message-router/consumer/pom.xml +++ b/adaptors/message-router/consumer/pom.xml @@ -1,19 +1,21 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>messagerouter-root</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>messagerouter-root</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>consumer.aggregate</artifactId> - <packaging>pom</packaging> + <artifactId>consumer.aggregate</artifactId> + <packaging>pom</packaging> - <modules> - <module>api</module> - <module>provider</module> - <module>installer</module> - </modules> + <name>ccsdk-sli-adaptors :: message-router :: ${project.artifactId}</name> + + <modules> + <module>api</module> + <module>provider</module> + <module>installer</module> + </modules> </project> diff --git a/adaptors/message-router/consumer/provider/pom.xml b/adaptors/message-router/consumer/provider/pom.xml index 4279d1e8b..3cc97d48d 100755 --- a/adaptors/message-router/consumer/provider/pom.xml +++ b/adaptors/message-router/consumer/provider/pom.xml @@ -1,43 +1,45 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>consumer.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>consumer.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>consumer.provider</artifactId> - <packaging>bundle</packaging> + <artifactId>consumer.provider</artifactId> + <packaging>bundle</packaging> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>consumer.api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: message-router :: ${project.artifactId}</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>${project.groupId}.consumer.provider.impl</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>consumer.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package>${project.groupId}.consumer.provider.impl</Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 4ccc56e1a..3b924d645 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -1,33 +1,35 @@ <?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> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.1.1</version> <relativePath/> </parent> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>messagerouter-root</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>messagerouter-root</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>publisher</module> - <module>consumer</module> - </modules> + <name>ccsdk-sli-adaptors :: message-router</name> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </pluginManagement> - </build> + <modules> + <module>publisher</module> + <module>consumer</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/adaptors/message-router/publisher/api/pom.xml b/adaptors/message-router/publisher/api/pom.xml index 30f4b7688..f229c2ba5 100755 --- a/adaptors/message-router/publisher/api/pom.xml +++ b/adaptors/message-router/publisher/api/pom.xml @@ -1,27 +1,29 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>publisher.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>publisher.api</artifactId> - <packaging>bundle</packaging> + <artifactId>publisher.api</artifactId> + <packaging>bundle</packaging> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <name>ccsdk-sli-adaptors :: message-router :: ${project.artifactId}</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package>org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api</Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/adaptors/message-router/publisher/installer/pom.xml b/adaptors/message-router/publisher/installer/pom.xml index f715b7824..728670260 100644 --- a/adaptors/message-router/publisher/installer/pom.xml +++ b/adaptors/message-router/publisher/installer/pom.xml @@ -1,133 +1,135 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>publisher.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>publisher.installer</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.installer</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <properties> - <application.name>messagerouter-publisher</application.name> - <features.boot>messagerouter-publisher</features.boot> - <features.repositories>mvn:${project.groupId}/publisher.features/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <name>ccsdk-sli-adaptors :: message-router :: ${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> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sample.client</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <properties> + <application.name>messagerouter-publisher</application.name> + <features.boot>messagerouter-publisher</features.boot> + <features.repositories>mvn:${project.groupId}/publisher.features/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <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>${project.groupId}</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> + <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> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sample.client</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <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>${project.groupId}</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> - </plugins> - </build> + </executions> + </plugin> + + </plugins> + </build> </project> diff --git a/adaptors/message-router/publisher/pom.xml b/adaptors/message-router/publisher/pom.xml index a415ab661..22d420b5c 100755 --- a/adaptors/message-router/publisher/pom.xml +++ b/adaptors/message-router/publisher/pom.xml @@ -1,20 +1,22 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>messagerouter-root</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>messagerouter-root</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>publisher.aggregate</artifactId> - <packaging>pom</packaging> + <artifactId>publisher.aggregate</artifactId> + <packaging>pom</packaging> - <modules> - <module>api</module> - <module>provider</module> - <module>sample.client</module> - <module>installer</module> - </modules> + <name>ccsdk-sli-adaptors :: message-router :: ${project.artifactId}</name> + + <modules> + <module>api</module> + <module>provider</module> + <module>sample.client</module> + <module>installer</module> + </modules> </project> diff --git a/adaptors/message-router/publisher/provider/pom.xml b/adaptors/message-router/publisher/provider/pom.xml index 42cf0e00e..f6606e768 100755 --- a/adaptors/message-router/publisher/provider/pom.xml +++ b/adaptors/message-router/publisher/provider/pom.xml @@ -1,39 +1,41 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>publisher.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>publisher.provider</artifactId> - <packaging>bundle</packaging> + <artifactId>publisher.provider</artifactId> + <packaging>bundle</packaging> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>publisher.api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: message-router :: ${project.artifactId}</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Private-Package>${project.groupId}.publisher.provider.impl</Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>publisher.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Private-Package>${project.groupId}.publisher.provider.impl</Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/adaptors/message-router/publisher/sample.client/pom.xml b/adaptors/message-router/publisher/sample.client/pom.xml index cbcfd0bb8..0313c7383 100755 --- a/adaptors/message-router/publisher/sample.client/pom.xml +++ b/adaptors/message-router/publisher/sample.client/pom.xml @@ -1,39 +1,41 @@ <?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.sli.adaptors.messagerouter</groupId> - <artifactId>publisher.aggregate</artifactId> - <version>1.2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.aggregate</artifactId> + <version>1.2.1-SNAPSHOT</version> + </parent> - <artifactId>sample.client</artifactId> - <packaging>bundle</packaging> + <artifactId>sample.client</artifactId> + <packaging>bundle</packaging> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>publisher.api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: message-router :: publisher.${project.artifactId}</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Private-Package>${project.groupId}.publisher.client.impl</Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>publisher.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Private-Package>${project.groupId}.publisher.client.impl</Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index 4849c1198..015e8af05 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -30,7 +30,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-netbox-client</application.name> @@ -41,8 +41,6 @@ <dependencies> - - <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client-provider</artifactId> diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index c9eb49227..1cf6c3bc5 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -30,7 +30,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: netbox-client</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <description>The SDNC Adaptors for netbox IPAM as an OSGi service</description> <modules> diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index 5e74cde33..faadcefc1 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -30,7 +30,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <dependencyManagement> <dependencies> diff --git a/adaptors/pom.xml b/adaptors/pom.xml index 5f47db833..950756987 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -13,7 +13,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors</name> + <name>${project.artifactId}</name> <description>The CCSDK core components contains the SLI, dblib and root pom</description> <url>https://wiki.onap.org</url> <organization> @@ -24,11 +24,11 @@ <module>aai-service</module> <module>ansible-adapter</module> <module>saltstack-adapter</module> - <module>netbox-client</module> + <module>netbox-client</module> <module>mdsal-resource</module> <module>resource-assignment</module> <module>sql-resource</module> - <module>base</module> + <module>base</module> <module>message-router</module> <module>features</module> <module>artifacts</module> @@ -101,7 +101,6 @@ </plugin> </plugins> - </build> </profile> diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index eaa8bb51d..77414792a 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-resource-assignment</application.name> diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index 1f42d5afb..ad321d438 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: resource-assignment</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <description>The resource assignment adaptor allows service logic to check and allocate network capacity</description> <modules> diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index 196296447..3c92d31fd 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <url>http://maven.apache.org</url> <properties> @@ -22,15 +22,15 @@ </properties> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> diff --git a/adaptors/saltstack-adapter/pom.xml b/adaptors/saltstack-adapter/pom.xml index 6bf150700..0a0a99d49 100644 --- a/adaptors/saltstack-adapter/pom.xml +++ b/adaptors/saltstack-adapter/pom.xml @@ -38,7 +38,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: saltstack-adapter</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <description>Abstractions to interact with Saltstack server via REST </description> @@ -71,10 +71,8 @@ <scope>test</scope> </dependency> - </dependencies> - </dependencyManagement> <pluginRepositories> diff --git a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml index bc9ad139a..5588770a8 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -38,8 +38,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} - </name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-saltstack-adapter</application.name> diff --git a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml index 994776668..65e288517 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ============LICENSE_START======================================================= +<!-- ============LICENSE_START======================================================= ONAP : CCSDK ================================================================================ Copyright (C) 2017-2018 Samsung Electronics. All rights reserved. - ================================================================================ + ================================================================================ ============================================================================= - Licensed under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. You may obtain a copy - of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific + Licensed under the Apache License, Version 2.0 (the "License"); you may not + use this file except in compliance with the License. You may obtain a copy + of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> <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"> @@ -27,19 +27,18 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} - </name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index 3eef0b309..d5238c2f2 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-sql-resource</application.name> diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index d8cfc01ac..811d327bd 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: sql-resource</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <description>The Sql resource adaptor allows service logic to read/write data from a local database using direct SQL statements</description> <modules> diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index fd32383a0..7d57f4735 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -14,7 +14,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <url>http://maven.apache.org</url> <properties> @@ -22,15 +22,15 @@ </properties> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> @@ -59,10 +59,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -73,10 +73,10 @@ <artifactId>dblib-provider</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> |