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

8 files changed, 180 insertions, 153 deletions

diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index da92c7d85..97bd7d013 100644
--- a/appc-metric/appc-metric-bundle/pom.xml
+++ b/appc-metric/appc-metric-bundle/pom.xml
@@ -21,11 +21,12 @@
   -->
 <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-metric</artifactId>
-	    <version>1.4.0-SNAPSHOT</version>
-	  </parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
     <groupId>org.onap.appc</groupId>
     <artifactId>appc-metric-bundle</artifactId>
     <packaging>bundle</packaging>
@@ -41,9 +42,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-        	<groupId>org.onap.appc</groupId>
-        	<artifactId>appc-common</artifactId>
-        	<version>${project.version}</version>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-common-bundle</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/appc-metric/appc-metric-features/features-appc-metric/.gitignore b/appc-metric/appc-metric-features/features-appc-metric/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-metric/appc-metric-features/features-appc-metric/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-metric/appc-metric-features/features-appc-metric/pom.xml b/appc-metric/appc-metric-features/features-appc-metric/pom.xml
new file mode 100644
index 000000000..103f489d6
--- /dev/null
+++ b/appc-metric/appc-metric-features/features-appc-metric/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-metric</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-metric</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-metric/appc-metric-features/onap-appc-metric/.gitignore b/appc-metric/appc-metric-features/onap-appc-metric/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-metric/appc-metric-features/onap-appc-metric/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-metric/appc-metric-features/onap-appc-metric/pom.xml b/appc-metric/appc-metric-features/onap-appc-metric/pom.xml
new file mode 100644
index 000000000..4b986eb0c
--- /dev/null
+++ b/appc-metric/appc-metric-features/onap-appc-metric/pom.xml
@@ -0,0 +1,74 @@
+<?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-metric</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-metric-bundle</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <excludedArtifactIds>
+                        <excludedArtifactId>slf4j-api</excludedArtifactId>
+                        <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+                        <excludedArtifactId>tomcat-juli</excludedArtifactId>
+                        <excludedArtifactId>org.eclipse.osgi</excludedArtifactId>
+                        <excludedArtifactId>httpcore</excludedArtifactId>
+                        <excludedArtifactId>httpclient</excludedArtifactId>
+                        <excludedArtifactId>appc-common</excludedArtifactId>
+                    </excludedArtifactIds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appc-metric/appc-metric-features/pom.xml b/appc-metric/appc-metric-features/pom.xml
index 0e703b96a..e96757ca4 100644
--- a/appc-metric/appc-metric-features/pom.xml
+++ b/appc-metric/appc-metric-features/pom.xml
@@ -1,145 +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-metric</artifactId>
-    <groupId>org.onap.appc</groupId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-  <name>appc-metric-features</name>
-  <artifactId>appc-metric-features</artifactId>
-
-  <packaging>jar</packaging>
-
-  <dependencies>
-     <dependency>
-      <groupId>org.onap.appc</groupId>
-      <artifactId>appc-metric-bundle</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-   <!-- <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-
-      <scope>runtime</scope>
-    </dependency>-->
-
+    <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
-    <!-- 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>
-      <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-metric-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>
-      <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. -->
-        <!-- Skipping ODL feature test -->
-        <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>
-          <classpathDependencyExcludes>
-            <!-- The dependencies which bring in AbstractDataBrokerTest class
-              brings in a second PaxExam container which results in the feature tests failing
-              with a message similar to: "ERROR o.ops4j.pax.exam.spi.PaxExamRuntime - Ambiguous
-              TestContainer ..." This excludes the container we don't want to use. -->
-            <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes>
-          </classpathDependencyExcludes>
-          <skipTests>true</skipTests>
-        </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>
+    <name></name>
 
-    </plugins>
-  </build>
+    <modules>
+        <module>onap-appc-metric</module>
+        <module>features-appc-metric</module>
+    </modules>
 </project>
diff --git a/appc-metric/appc-metric-installer/pom.xml b/appc-metric/appc-metric-installer/pom.xml
index de7c2faa6..d54d83235 100644
--- a/appc-metric/appc-metric-installer/pom.xml
+++ b/appc-metric/appc-metric-installer/pom.xml
@@ -22,10 +22,12 @@
 <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-metric</artifactId>
-    <groupId>org.onap.appc</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <groupId>org.onap.appc.parent</groupId>
     <version>1.4.0-SNAPSHOT</version>
+    <relativePath />
   </parent>
+  <groupId>org.onap.appc</groupId>
   <artifactId>appc-metric-installer</artifactId>
   <name>APPC Metric - Karaf Installer</name>
   <packaging>pom</packaging>
@@ -33,7 +35,7 @@
   <properties>
     <application.name>appc-metric</application.name>
     <features.boot>appc-metric</features.boot>
-    <features.repositories>mvn:org.onap.appc/appc-metric-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/onap-appc-metric/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
@@ -41,7 +43,7 @@
 
     <dependency>
       <groupId>org.onap.appc</groupId>
-      <artifactId>appc-metric-features</artifactId>
+      <artifactId>onap-appc-metric</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
diff --git a/appc-metric/pom.xml b/appc-metric/pom.xml
index 69165f673..244f19fe7 100644
--- a/appc-metric/pom.xml
+++ b/appc-metric/pom.xml
@@ -21,11 +21,14 @@
 <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</artifactId>
+    <groupId>org.onap.appc.parent</groupId>
+    <artifactId>odlparent-lite</artifactId>
     <version>1.4.0-SNAPSHOT</version>
+    <relativePath />
   </parent>
-  <artifactId>appc-metric</artifactId>
+
+  <groupId>org.onap.appc</groupId>
+  <artifactId>appc-metric-aggregator</artifactId>
   <packaging>pom</packaging>
   <name>APPC Metric</name>
   <description>APPC Metric</description>
@@ -39,4 +42,4 @@
 		<module>appc-metric-installer</module>
 	</modules>
   
-</project>
\ No newline at end of file
+</project>