Karaf 4 for first few features

appc-metric
appc-dmaap-adapter
appc-chef-adapter
appc-netconf-adapter
appc-rest-adapter

Change-Id: I1d5a8e39cac7be74b05a0782f0971f8d08c8162d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1029

6 files changed, 191 insertions, 147 deletions

diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
index 0b5785f61..f87d7d139 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
@@ -22,12 +22,15 @@
 <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.appc</groupId>
-        <artifactId>appc-netconf-adapter</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
         <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
 
     <artifactId>appc-netconf-adapter-bundle</artifactId>
+    <groupId>org.onap.appc</groupId>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>NETCONF Adapter - bundle</name>
     <properties>
@@ -39,7 +42,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -53,12 +56,14 @@
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-common</artifactId>
             <scope>compile</scope>
+            <version>${cdp.pal.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-openstack</artifactId>
             <scope>compile</scope>
+            <version>${cdp.pal.version}</version>
         </dependency>
 
         <dependency>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml
new file mode 100644
index 000000000..89a4df742
--- /dev/null
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 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=========================================================
+-->
+<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.appc.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>features-appc-netconf-adapter</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-netconf-adapter</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml
new file mode 100644
index 000000000..094669389
--- /dev/null
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 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=========================================================
+-->
+<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.appc.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>onap-appc-netconf-adapter</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-dblib</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <version>${ccsdk.sli.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-netconf-adapter-bundle</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                <includeTransitiveDependency>false</includeTransitiveDependency>
+                    <excludedArtifactIds>
+                        <excludedArtifactId>slf4j-api</excludedArtifactId>
+                        <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+                        <excludedArtifactId>tomcat-juli</excludedArtifactId>
+                         <excludedArtifactId>httpcore</excludedArtifactId>
+                         <excludedArtifactId>httpclient</excludedArtifactId>
+                         <excludedArtifactId>org.eclipse.osgi</excludedArtifactId>
+                         
+                    </excludedArtifactIds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
index 78125c283..b64a0d812 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
@@ -1,142 +1,42 @@
 <?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.
-  ============LICENSE_END=========================================================
-  -->
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 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=========================================================
+-->
 <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>appc-netconf-adapter</artifactId>
-        <groupId>org.onap.appc</groupId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
         <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>appc-netconf-adapter-features</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-netconf-adapter-bundle</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <type>zip</type>
-        </dependency>
-
-       <!-- <dependency>-->
-            <!-- Required for launching the feature tests -->
-           <!-- <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-test</artifactId>
-            <scope>test</scope>
-        </dependency>-->
 
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-netconf-adapter-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <build>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- launches the feature test, which validates that your karaf feature
-              can be installed inside of a karaf container. It doesn't validate that your
-              functionality works correctly, just that you have all of the dependent bundles
-              defined correctly. -->
-            <!-- <plugin> -->
-            <!-- <groupId>org.apache.maven.plugins</groupId> -->
-            <!-- <artifactId>maven-surefire-plugin</artifactId> -->
-            <!-- <version>2.16</version> -->
-            <!-- <configuration> -->
-            <!-- <systemPropertyVariables> -->
-            <!-- <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId> -->
-            <!-- <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId> -->
-            <!-- <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version> -->
-            <!-- </systemPropertyVariables> -->
-            <!-- <dependenciesToScan> -->
-            <!-- <dependency>org.opendaylight.yangtools:features-test</dependency> -->
-            <!-- </dependenciesToScan> -->
-            <!-- </configuration> -->
-            <!-- </plugin> -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <name></name>
 
-</project>
\ No newline at end of file
+    <modules>
+        <module>onap-appc-netconf-adapter</module>
+        <module>features-appc-netconf-adapter</module>
+    </modules>
+</project>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
index c6448523f..58f1a625e 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
@@ -22,26 +22,30 @@
 <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>appc-netconf-adapter</artifactId>
-        <groupId>org.onap.appc</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
         <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <artifactId>appc-netconf-adapter-installer</artifactId>
+    <groupId>org.onap.appc</groupId>
+    <version>1.4.0-SNAPSHOT</version>
     <name>NETCONF Adapter - Karaf Installer</name>
     <packaging>pom</packaging>
 
     <properties>
         <application.name>appc-netconf-adapter</application.name>
         <features.boot>appc-netconf-adapter</features.boot>
-        <features.repositories>mvn:org.onap.appc/appc-netconf-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/onap-appc-netconf-adapter/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-netconf-adapter-features</artifactId>
+            <artifactId>onap-appc-netconf-adapter</artifactId>
             <classifier>features</classifier>
+            <version>${project.version}</version>
             <type>xml</type>
             <exclusions>
                 <exclusion>
diff --git a/appc-adapters/appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/pom.xml
index 372df2c87..41191b46d 100644
--- a/appc-adapters/appc-netconf-adapter/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/pom.xml
@@ -21,20 +21,19 @@
   -->
 <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">
     <parent>
-        <artifactId>appc-adapters</artifactId>
-        <groupId>org.onap.appc</groupId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
         <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>appc-netconf-adapter</artifactId>
+    <groupId>org.onap.appc</groupId>
+    <version>1.4.0-SNAPSHOT</version>
     <name>NETCONF adapter</name>
     <packaging>pom</packaging>
 
-    <properties>
-        <feature.netconf.connector.version>1.0.1-Beryllium-SR1</feature.netconf.connector.version>
-    </properties>
-
     <reporting>
         <plugins>
             <plugin>
@@ -144,4 +143,4 @@
     </modules>
 
 
-</project>
\ No newline at end of file
+</project>