From cfca049dc256437c083c0b6723c1936b24c70e60 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Thu, 9 Aug 2018 13:42:38 -0700
Subject: [PATCH] Karaf 4 for appc-sdc-listener

Change-Id: If3dabdd96403d1d197b0ac021912a8cd2b8ce772
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1138
---
 appc-sdc-listener/appc-sdc-listener-bundle/pom.xml |   8 +-
 .../features-appc-sdc-listener/.gitignore          |   1 +
 .../features-appc-sdc-listener/pom.xml             |  48 +++++++++
 .../onap-appc-sdc-listener/.gitignore              |   1 +
 .../onap-appc-sdc-listener/pom.xml                 |  81 +++++++++++++++
 .../appc-sdc-listener-features/pom.xml             | 111 ++++-----------------
 .../appc-sdc-listener-installer/pom.xml            |  10 +-
 .../appc-yang-generator/dependency-reduced-pom.xml |  86 ++++++++++++++++
 appc-sdc-listener/appc-yang-generator/pom.xml      |  10 +-
 appc-sdc-listener/pom.xml                          |   8 +-
 10 files changed, 260 insertions(+), 104 deletions(-)
 create mode 100644 appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore
 create mode 100644 appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml
 create mode 100644 appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore
 create mode 100644 appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml
 create mode 100644 appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml

diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
index 63d6cd35d..587175801 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
@@ -24,10 +24,12 @@ limitations under the License.
 
 
 	<parent>
-		<artifactId>appc-sdc-listener</artifactId>
-		<groupId>org.onap.appc</groupId>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
+                <relativePath />
 	</parent>
+        <groupId>org.onap.appc</groupId>
 
 	<properties>
 		<jackson-yaml-version>2.8.1</jackson-yaml-version>
@@ -93,7 +95,7 @@ limitations under the License.
 
 		<dependency>
 			<groupId>org.onap.appc</groupId>
-			<artifactId>appc-common</artifactId>
+			<artifactId>appc-common-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml
new file mode 100644
index 000000000..e8247f5e5
--- /dev/null
+++ b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/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-sdc-listener</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-sdc-listener</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml
new file mode 100644
index 000000000..0aa998891
--- /dev/null
+++ b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml
@@ -0,0 +1,81 @@
+<?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-sdc-listener</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.appc</groupId>
+            <artifactId>appc-sdc-listener-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-sdc-listener/appc-sdc-listener-features/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/pom.xml
index 50c3b4cb9..a7d0d75f4 100644
--- a/appc-sdc-listener/appc-sdc-listener-features/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-features/pom.xml
@@ -3,9 +3,7 @@
 ============LICENSE_START=======================================================
 ONAP : APPC
 ================================================================================
-Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-================================================================================
-Copyright (C) 2017 Amdocs
+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.
@@ -18,94 +16,27 @@ 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-sdc-listener</artifactId>
-		<groupId>org.onap.appc</groupId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>appc-sdc-listener-features</artifactId>
-	<name>Event Listener - Features</name>
-
-	<packaging>jar</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.appc</groupId>
-			<artifactId>appc-sdc-listener-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>
-			<groupId>org.opendaylight.yangtools</groupId>
-			<artifactId>features-yangtools</artifactId>
-			<classifier>features</classifier>
-			<type>xml</type>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
-
-	<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>
-				<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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-sdc-listener-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name></name>
+
+    <modules>
+        <module>onap-appc-sdc-listener</module>
+        <module>features-appc-sdc-listener</module>
+    </modules>
 </project>
diff --git a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
index c4cdec68a..0bfbce91a 100644
--- a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
@@ -24,10 +24,12 @@ 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>
-		<artifactId>appc-sdc-listener</artifactId>
-		<groupId>org.onap.appc</groupId>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
+                <relativePath />
 	</parent>
+        <groupId>org.onap.appc</groupId>
 	<artifactId>appc-sdc-listener-installer</artifactId>
 	<name>SDC Listener - Karaf Installer</name>
 	<packaging>pom</packaging>
@@ -35,7 +37,7 @@ limitations under the License.
 	<properties>
 		<application.name>appc-sdc-listener</application.name>
 		<features.boot>appc-sdc-listener</features.boot>
-		<features.repositories>mvn:org.onap.appc/appc-sdc-listener-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/onap-appc-sdc-listener/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
@@ -43,7 +45,7 @@ limitations under the License.
 
 		<dependency>
 			<groupId>org.onap.appc</groupId>
-			<artifactId>appc-sdc-listener-features</artifactId>
+			<artifactId>onap-appc-sdc-listener</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
 			<type>xml</type>
diff --git a/appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml b/appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml
new file mode 100644
index 000000000..fbb0a4fca
--- /dev/null
+++ b/appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml
@@ -0,0 +1,86 @@
+<?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/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>binding-parent</artifactId>
+    <groupId>org.onap.appc.parent</groupId>
+    <version>1.4.0-SNAPSHOT</version>
+    <relativePath>pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.onap.appc</groupId>
+  <artifactId>appc-yang-generator</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <finalName>${artifactId}-${version}</finalName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.25</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jcip-annotations</artifactId>
+          <groupId>net.jcip</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
+      <version>2.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>
+
diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml
index cc0fbbc89..d268ac448 100644
--- a/appc-sdc-listener/appc-yang-generator/pom.xml
+++ b/appc-sdc-listener/appc-yang-generator/pom.xml
@@ -25,11 +25,13 @@ limitations under the License.
          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-sdc-listener</artifactId>
+	<parent>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>1.4.0-SNAPSHOT</version>
+                <relativePath />
+	</parent>
         <groupId>org.onap.appc</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-    </parent>
 
     <artifactId>appc-yang-generator</artifactId>
     <packaging>jar</packaging>
diff --git a/appc-sdc-listener/pom.xml b/appc-sdc-listener/pom.xml
index acc6369f9..438d58ff6 100644
--- a/appc-sdc-listener/pom.xml
+++ b/appc-sdc-listener/pom.xml
@@ -24,10 +24,12 @@ 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/maven-v4_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>
+        <groupId>org.onap.appc</groupId>
 
 	<artifactId>appc-sdc-listener</artifactId>
 	<name>SDC Event Listener</name>
@@ -125,4 +127,4 @@ limitations under the License.
 		<module>appc-sdc-listener-features</module>
 		<module>appc-sdc-listener-installer</module>
 	</modules>
-</project>
\ No newline at end of file
+</project>
-- 
2.16.6