From d815d848cd83cfb9180286af5bc8a7516f4eafe9 Mon Sep 17 00:00:00 2001
From: "Smokowski, Kevin (ks6305)" <kevin.smokowski@att.com>
Date: Mon, 9 Sep 2019 20:55:15 +0000
Subject: update filters

replace legacy filters with common filters

Issue-ID: CCSDK-1698
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Change-Id: Id6b1f003f19105956d221d5bfd31390ac096c9bc
---
 filters/features/ccsdk-filters/pom.xml | 51 +++++++++++++---------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

(limited to 'filters/features/ccsdk-filters/pom.xml')

diff --git a/filters/features/ccsdk-filters/pom.xml b/filters/features/ccsdk-filters/pom.xml
index b1677a7a..ae8f2dfd 100644
--- a/filters/features/ccsdk-filters/pom.xml
+++ b/filters/features/ccsdk-filters/pom.xml
@@ -15,43 +15,32 @@
 	<packaging>feature</packaging>
 
 	<name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
-	<dependencyManagement>
-		<dependencies>
-		
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>sli-common</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>sli-provider</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>dblib-provider</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	
 
 	<dependencies>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>ccsdk-sli</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
-
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>filters-provider</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>
+					<excludedArtifactIds>
+						<!-- let opendaylight start these features/jars to avoid conflicts at runtime -->
+						<excludedArtifactId>slf4j-api</excludedArtifactId>
+						<excludedArtifactId>javax.annotation-api</excludedArtifactId>
+						<excludedArtifactId>javax.servlet-api</excludedArtifactId>
+						<excludedArtifactId>javax.ws.rs-api</excludedArtifactId>
+					</excludedArtifactIds>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
-- 
cgit 1.2.3-korg