diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-13 12:42:39 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-13 12:42:39 -0500 |
commit | bc18e2c019f4b16752ae25fa50b436e7cd65c8e8 (patch) | |
tree | 7e1c5f91d12f8fc854105d888938e572e3c76737 /netbox-client | |
parent | 9ed4144aa7a72da788306a420b8a9a26fd0d4401 (diff) |
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer
Change-Id: I4dc4ad3c139522b12f41f1786ef16bfdd556f2b9
Issue-ID: CCSDK-1754
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'netbox-client')
-rw-r--r-- | netbox-client/features/ccsdk-netbox-client/pom.xml | 67 | ||||
-rwxr-xr-x | netbox-client/features/features-netbox-client/pom.xml | 48 | ||||
-rwxr-xr-x | netbox-client/features/pom.xml | 38 | ||||
-rwxr-xr-x | netbox-client/installer/pom.xml | 14 | ||||
-rw-r--r-- | netbox-client/pom.xml | 1 |
5 files changed, 1 insertions, 167 deletions
diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml deleted file mode 100644 index 0b03d275..00000000 --- a/netbox-client/features/ccsdk-netbox-client/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2018 AT&T, Bell Canada - - 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. - --> -<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>single-feature-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-netbox-client</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> - - - <properties> - <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version> - </properties> - - - <dependencies> - - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-sli</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>xml</type> - <classifier>features</classifier> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-dblib</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>xml</type> - <classifier>features</classifier> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>netbox-client-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml deleted file mode 100755 index 4cd3a3bc..00000000 --- a/netbox-client/features/features-netbox-client/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2018 AT&T, Bell Canada - - 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. - --> -<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>feature-repo-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>features-netbox-client</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> - - <properties> - <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version> - </properties> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-netbox-client</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/netbox-client/features/pom.xml b/netbox-client/features/pom.xml deleted file mode 100755 index a8b8cd72..00000000 --- a/netbox-client/features/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2018 AT&T, Bell Canada - - 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. - --> -<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>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>netbox-client-features</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> - - <modules> - <module>ccsdk-netbox-client</module> - <module>features-netbox-client</module> - </modules> -</project> diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml index e9f437e1..ae25dadf 100755 --- a/netbox-client/installer/pom.xml +++ b/netbox-client/installer/pom.xml @@ -40,19 +40,7 @@ <dependencies> - <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> diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml index 88e37a1a..010ba044 100644 --- a/netbox-client/pom.xml +++ b/netbox-client/pom.xml @@ -34,7 +34,6 @@ <modules> <module>provider</module> - <module>features</module> <module>installer</module> </modules> </project> |