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>

diff --git a/aai-service/features/features-aai-service/pom.xml b/aai-service/features/features-aai-service/pom.xml
deleted file mode 100755 (executable)
index 6bd97ef..0000000
--- a/aai-service/features/features-aai-service/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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-aai-service</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-aai-service</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/aai-service/features/pom.xml b/aai-service/features/pom.xml
deleted file mode 100755 (executable)
index 68dc26f..0000000
--- a/aai-service/features/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-
-    <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>aai-service-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-aai-service</module>
-        <module>features-aai-service</module>
-    </modules>
-</project>

diff --git a/aai-service/pom.xml b/aai-service/pom.xml
index 5c92bd4..71ad8ad 100755 (executable)
--- a/aai-service/pom.xml
+++ b/aai-service/pom.xml
@@ -19,7 +19,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 </project>

diff --git a/ansible-adapter/ansible-adapter-features/.gitignore b/ansible-adapter/ansible-adapter-features/.gitignore
deleted file mode 100644 (file)
index 8820cee..0000000
--- a/ansible-adapter/ansible-adapter-features/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# ============LICENSE_START==========================================
-# ONAP : APPC
-# ===================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the License);
-# you may not use this software 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============================================
-/target/
-/target-ide/
-/bin/
-/classes/
-/.settings/

diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
deleted file mode 100755 (executable)
index 91a6fc9..0000000
--- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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-ansible-adapter</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-ansible-adapter</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml
deleted file mode 100644 (file)
index 9d9f088..0000000
--- a/ansible-adapter/ansible-adapter-features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
-    ONAP : APPC ================================================================================
-    Copyright (C) 2017 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>odlparent-lite</artifactId>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.5.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-    <artifactId>ansible-adapter-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-ansible-adapter</module>
-        <module>features-ansible-adapter</module>
-    </modules>
-</project>

diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index f4eee6e..82a9a08 100644 (file)
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -42,19 +42,7 @@
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>${application.name}</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>ansible-adapter-bundle</artifactId>

diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml
index 68ffdce..cf3667d 100644 (file)
--- a/ansible-adapter/pom.xml
+++ b/ansible-adapter/pom.xml
@@ -183,7 +183,6 @@
 
   <modules>
     <module>ansible-adapter-bundle</module>
-    <module>ansible-adapter-features</module>
     <module>ansible-adapter-installer</module>
   </modules>
 </project>

diff --git a/base/http/features/features-base-http/pom.xml b/base/http/features/features-base-http/pom.xml
deleted file mode 100644 (file)
index 4a038f9..0000000
--- a/base/http/features/features-base-http/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>
-
-       <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-base-http</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
-
-       <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
-
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-base-http</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-
-       </dependencies>
-</project>

diff --git a/base/http/features/pom.xml b/base/http/features/pom.xml
deleted file mode 100644 (file)
index ef98e53..0000000
--- a/base/http/features/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-
-    <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>base-http-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-base-http</module>
-        <module>features-base-http</module>
-    </modules>
-</project>

diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml
index 7f8d3e8..a974d82 100644 (file)
--- a/base/http/installer/pom.xml
+++ b/base/http/installer/pom.xml
@@ -25,20 +25,6 @@
 
        <dependencies>
 
-               <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>
-
                <dependency>
                        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                        <artifactId>base-http-provider</artifactId>

diff --git a/base/http/pom.xml b/base/http/pom.xml
index 2ec2032..013f77e 100644 (file)
--- a/base/http/pom.xml
+++ b/base/http/pom.xml
@@ -16,7 +16,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 </project>

diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/features/ccsdk-aai-service/pom.xml
similarity index 100%
rename from aai-service/features/ccsdk-aai-service/pom.xml
rename to features/ccsdk-aai-service/pom.xml

diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/features/ccsdk-ansible-adapter/pom.xml
similarity index 100%
rename from ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
rename to features/ccsdk-ansible-adapter/pom.xml

diff --git a/base/http/features/ccsdk-base-http/pom.xml b/features/ccsdk-base-http/pom.xml
similarity index 100%
rename from base/http/features/ccsdk-base-http/pom.xml
rename to features/ccsdk-base-http/pom.xml

diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/features/ccsdk-mdsal-resource/pom.xml
similarity index 100%
rename from mdsal-resource/features/ccsdk-mdsal-resource/pom.xml
rename to features/ccsdk-mdsal-resource/pom.xml

diff --git a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml b/features/ccsdk-messagerouter-consumer/pom.xml
similarity index 100%
rename from message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
rename to features/ccsdk-messagerouter-consumer/pom.xml

diff --git a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml b/features/ccsdk-messagerouter-publisher/pom.xml
similarity index 100%
rename from message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
rename to features/ccsdk-messagerouter-publisher/pom.xml

diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/features/ccsdk-netbox-client/pom.xml
similarity index 100%
rename from netbox-client/features/ccsdk-netbox-client/pom.xml
rename to features/ccsdk-netbox-client/pom.xml

diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/features/ccsdk-resource-assignment/pom.xml
similarity index 100%
rename from resource-assignment/features/ccsdk-resource-assignment/pom.xml
rename to features/ccsdk-resource-assignment/pom.xml

diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
similarity index 100%
rename from saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
rename to features/ccsdk-saltstack-adapter/pom.xml

diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/features/ccsdk-sql-resource/pom.xml
similarity index 100%
rename from sql-resource/features/ccsdk-sql-resource/pom.xml
rename to features/ccsdk-sql-resource/pom.xml

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 30174b0..2956c94 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -24,7 +24,136 @@
        </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>

diff --git a/features/pom.xml b/features/pom.xml
index 17fbcf2..ce33f8d 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,6 +17,16 @@
        <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>
         <module>ccsdk-sli-adaptors-all</module>
         <module>features-sli-adaptors</module>
         <module>installer</module>

diff --git a/mdsal-resource/features/features-mdsal-resource/pom.xml b/mdsal-resource/features/features-mdsal-resource/pom.xml
deleted file mode 100755 (executable)
index 96c2589..0000000
--- a/mdsal-resource/features/features-mdsal-resource/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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-mdsal-resource</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-mdsal-resource</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml
deleted file mode 100755 (executable)
index e1c15e4..0000000
--- a/mdsal-resource/features/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-
-    <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>mdsal-resource-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-mdsal-resource</module>
-        <module>features-mdsal-resource</module>
-    </modules>
-</project>

diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml
index 4c5472c..0202ce4 100755 (executable)
--- a/mdsal-resource/installer/pom.xml
+++ b/mdsal-resource/installer/pom.xml
@@ -24,21 +24,6 @@
     </properties>
 
     <dependencies>
-
-        <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</groupId>
             <artifactId>mdsal-resource-provider</artifactId>

diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index f190647..6e41a2c 100755 (executable)
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/pom.xml
@@ -19,7 +19,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 

diff --git a/message-router/consumer/features/features-messagerouter-consumer/pom.xml b/message-router/consumer/features/features-messagerouter-consumer/pom.xml
deleted file mode 100755 (executable)
index f90de46..0000000
--- a/message-router/consumer/features/features-messagerouter-consumer/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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.messagerouter</groupId>
-    <artifactId>features-messagerouter-consumer</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-messagerouter-consumer</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/message-router/consumer/features/pom.xml b/message-router/consumer/features/pom.xml
deleted file mode 100755 (executable)
index 46e289a..0000000
--- a/message-router/consumer/features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
-    ONAP : APPC ================================================================================
-    Copyright (C) 2017 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>odlparent-lite</artifactId>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.5.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
-    <artifactId>consumer.features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-messagerouter-consumer</module>
-        <module>features-messagerouter-consumer</module>
-    </modules>
-</project>

diff --git a/message-router/consumer/features/src/main/feature/feature.xml b/message-router/consumer/features/src/main/feature/feature.xml
deleted file mode 100755 (executable)
index 3541270..0000000
--- a/message-router/consumer/features/src/main/feature/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="messagerouter-consumer-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">     
-    
-    <feature name='messagerouter-consumer' description="exposes message router consumer" version='${project.version}'>
-        <bundle>mvn:${project.groupId}/consumer.api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/consumer.provider/${project.version}</bundle>
-    </feature>
-
-</features>

diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml
index 876232b..a301506 100755 (executable)
--- a/message-router/consumer/installer/pom.xml
+++ b/message-router/consumer/installer/pom.xml
@@ -21,13 +21,6 @@
        </properties>
 
        <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-messagerouter-consumer</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>consumer.api</artifactId>

diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml
index 0960b8f..5b7984a 100755 (executable)
--- a/message-router/consumer/pom.xml
+++ b/message-router/consumer/pom.xml
@@ -13,7 +13,6 @@
 
        <modules>
                <module>api</module>
-               <module>features</module>
                <module>provider</module>
                <module>installer</module>
        </modules>

diff --git a/message-router/publisher/features/features-messagerouter-publisher/pom.xml b/message-router/publisher/features/features-messagerouter-publisher/pom.xml
deleted file mode 100755 (executable)
index 860b46c..0000000
--- a/message-router/publisher/features/features-messagerouter-publisher/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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.messagerouter</groupId>
-    <artifactId>features-messagerouter-publisher</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-messagerouter-publisher</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml
deleted file mode 100644 (file)
index 38ad37c..0000000
--- a/message-router/publisher/features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
-    ONAP : APPC ================================================================================
-    Copyright (C) 2017 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>odlparent-lite</artifactId>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.5.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
-    <artifactId>publisher.features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-messagerouter-publisher</module>
-        <module>features-messagerouter-publisher</module>
-    </modules>
-</project>

diff --git a/message-router/publisher/features/src/main/feature/feature.xml b/message-router/publisher/features/src/main/feature/feature.xml
deleted file mode 100755 (executable)
index b533235..0000000
--- a/message-router/publisher/features/src/main/feature/feature.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="messagerouter-publisher-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">     
-    
-    <feature name='messagerouter-publisher' description="exposes message router publisher service" version='${project.version}'>
-        <bundle>mvn:${project.groupId}/publisher.api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/publisher.provider/${project.version}</bundle>
-    </feature>
-
-    <feature name='sample-client' description="initializes a dummy client" version='${project.version}'>
-        <bundle>mvn:${project.groupId}/sample.client/${project.version}</bundle>
-    </feature>
-
-</features>

diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml
index b6fb5b0..5f48906 100644 (file)
--- a/message-router/publisher/installer/pom.xml
+++ b/message-router/publisher/installer/pom.xml
@@ -21,13 +21,6 @@
        </properties>
 
        <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-messagerouter-publisher</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>publisher.api</artifactId>

diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml
index daad364..be5207e 100755 (executable)
--- a/message-router/publisher/pom.xml
+++ b/message-router/publisher/pom.xml
@@ -13,7 +13,6 @@
 
        <modules>
                <module>api</module>
-               <module>features</module>
                <module>provider</module>
                <module>sample.client</module>
                <module>installer</module>

diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml
deleted file mode 100755 (executable)
index 4cd3a3b..0000000
--- 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 (executable)
index a8b8cd7..0000000
--- 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 e9f437e..ae25dad 100755 (executable)
--- 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 88e37a1..010ba04 100644 (file)
--- 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>

diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml
deleted file mode 100755 (executable)
index 6919271..0000000
--- a/resource-assignment/features/features-resource-assignment/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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-resource-assignment</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-resource-assignment</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml
deleted file mode 100755 (executable)
index 94a45aa..0000000
--- a/resource-assignment/features/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-
-    <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>resource-assignment-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-resource-assignment</module>
-        <module>features-resource-assignment</module>
-    </modules>
-</project>

diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 7055ebf..6a24ba5 100755 (executable)
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -25,20 +25,6 @@
 
     <dependencies>
 
-        <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>resource-assignment-provider</artifactId>

diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index b03a658..2046c1b 100755 (executable)
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -19,7 +19,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 

diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml
index 21a6b88..4bed5f7 100644 (file)
--- a/saltstack-adapter/pom.xml
+++ b/saltstack-adapter/pom.xml
@@ -191,7 +191,6 @@
 
     <modules>
         <module>saltstack-adapter-provider</module>
-        <module>saltstack-adapter-features</module>
         <module>saltstack-adapter-installer</module>
     </modules>
 </project>

diff --git a/saltstack-adapter/saltstack-adapter-features/.gitignore b/saltstack-adapter/saltstack-adapter-features/.gitignore
deleted file mode 100644 (file)
index e1ca0de..0000000
--- a/saltstack-adapter/saltstack-adapter-features/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# ============LICENSE_START==========================================
-# ONAP : CCSDK
-# ===================================================================
-# Copyright (C) 2017-2018 Samsung Electronics. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the License);
-# you may not use this software 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============================================
-/target/
-/target-ide/
-/bin/
-/classes/
-/.settings/

diff --git a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
deleted file mode 100755 (executable)
index a792f8f..0000000
--- a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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-saltstack-adapter</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
-    </name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-saltstack-adapter</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml
deleted file mode 100644 (file)
index 1b5e61c..0000000
--- a/saltstack-adapter/saltstack-adapter-features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
-    ONAP : CCSDK ================================================================================
-    Copyright (C) 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
-    language governing permissions and limitations under the License. ============LICENSE_END========================================================= -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
-        <artifactId>odlparent-lite</artifactId>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.5.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-    <artifactId>saltstack-adapter-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
-    </name>
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-saltstack-adapter</module>
-        <module>features-saltstack-adapter</module>
-    </modules>
-</project>

diff --git a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
deleted file mode 100644 (file)
index d92aa49..0000000
--- a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ONAP : CCSDK
-  ================================================================================
-  Copyright (C) 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 language governing permissions and
-  limitations under the License.
-  
-
-  ============LICENSE_END=========================================================
-  -->
-
-
-<features name="ccsdk-saltstack-adapter-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
-
-    <feature name='ccsdk-saltstack-adapter'
-             description="ccsdk-saltstack-adapter" version='${project.version}'>
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <bundle dependency="true">mvn:org.apache.sshd/sshd-core/0.12.0</bundle>
-        <bundle dependency="true">mvn:org.apache.commons/commons-io/1.3.2</bundle>
-        <bundle>mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}</bundle>
-    </feature>
-
-</features>

diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index 96c59a0..5951b61 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -45,19 +45,7 @@
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>${application.name}</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>saltstack-adapter-provider</artifactId>

diff --git a/sql-resource/features/features-sql-resource/pom.xml b/sql-resource/features/features-sql-resource/pom.xml
deleted file mode 100755 (executable)
index a85ff70..0000000
--- a/sql-resource/features/features-sql-resource/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-
-    <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-sql-resource</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-sql-resource</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/sql-resource/features/pom.xml b/sql-resource/features/pom.xml
deleted file mode 100755 (executable)
index 5046316..0000000
--- a/sql-resource/features/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-
-    <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>sql-resource-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-sql-resource</module>
-        <module>features-sql-resource</module>
-    </modules>
-</project>

diff --git a/sql-resource/features/src/main/resources/features.xml b/sql-resource/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 5cf1d9c..0000000
--- a/sql-resource/features/src/main/resources/features.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. 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 language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-
-<features name="sdnc-sql-resource-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
-
-
-    <feature name='sdnc-sql-resource' description="sdnc-sql-resource" version='${project.version}'>
-        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <feature version="${sdnctl.dblib.version}">sdnc-dblib</feature>
-        <bundle>mvn:org.onap.ccsdk.sli.adaptors/sql-resource-provider/${project.version}</bundle>
-    </feature>
-
-</features>

diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml
index ffff87c..f3dd45b 100755 (executable)
--- a/sql-resource/installer/pom.xml
+++ b/sql-resource/installer/pom.xml
@@ -25,20 +25,6 @@
 
     <dependencies>
 
-        <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>sql-resource-provider</artifactId>

diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml
index a08406b..689c343 100755 (executable)
--- a/sql-resource/pom.xml
+++ b/sql-resource/pom.xml
@@ -19,7 +19,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>