From 33e660e21a7cce89210a318c4de80d1f8b4d5f5d Mon Sep 17 00:00:00 2001
From: "Kotta, Shireesha (sk434m)" <sk434m@att.com>
Date: Fri, 28 Dec 2018 10:44:43 -0500
Subject: CADI Integration POM change

Issue-ID: PORTAL-474

Changed POM version to 2.5.0

Change-Id: Ibd72c1c4977f63b5123f76ff6bbb36f2e74172ab
Signed-off-by: Kotta, Shireesha (sk434m) <sk434m@att.com>
---
 ecomp-sdk/epsdk-aaf/pom.xml                        |  4 ++--
 ecomp-sdk/epsdk-analytics/pom.xml                  |  2 +-
 ecomp-sdk/epsdk-app-common/pom.xml                 |  2 +-
 ecomp-sdk/epsdk-app-os/pom.xml                     |  2 +-
 .../epsdk-app-os/src/main/webapp/WEB-INF/web.xml   | 25 +++++++++++++++++++++-
 ecomp-sdk/epsdk-app-overlay/pom.xml                |  2 +-
 ecomp-sdk/epsdk-core/pom.xml                       |  2 +-
 ecomp-sdk/epsdk-domain/pom.xml                     |  4 ++--
 ecomp-sdk/epsdk-fw/pom.xml                         |  4 ++--
 ecomp-sdk/epsdk-logger/pom.xml                     |  6 +++---
 ecomp-sdk/epsdk-music/pom.xml                      |  4 ++--
 ecomp-sdk/epsdk-workflow/pom.xml                   |  2 +-
 ecomp-sdk/pom.xml                                  |  2 +-
 13 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml
index a8c254e1..0ad8ac69 100644
--- a/ecomp-sdk/epsdk-aaf/pom.xml
+++ b/ecomp-sdk/epsdk-aaf/pom.xml
@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 	
 	<groupId>org.onap.portal.sdk</groupId>
 	<artifactId>epsdk-aaf</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.0</version>
 	<packaging>jar</packaging>
 
 	<name>ONAP Portal SDK AAF Authorization</name>
diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml
index 55fb6bfb..8832dc63 100644
--- a/ecomp-sdk/epsdk-analytics/pom.xml
+++ b/ecomp-sdk/epsdk-analytics/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 	
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml
index 7b266e78..07962283 100644
--- a/ecomp-sdk/epsdk-app-common/pom.xml
+++ b/ecomp-sdk/epsdk-app-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 9ca8604b..e16b78d2 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
index a87e478d..56a6edba 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
@@ -56,5 +56,28 @@
 	<error-page>
 		<location>/WEB-INF/jsp/error.jsp</location>
 	</error-page>
-
+   <filter>
+		<filter-name>CadiAuthFilter</filter-name>
+		<filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class>
+		<init-param>
+			<param-name>cadi_prop_files</param-name>
+        <!-- Add Absolute path of cadi.properties -->
+			<param-value>{path}/cadi.properties
+			</param-value>
+		</init-param>
+         <!--Add param values with comma delimited values -->
+         <!-- for example /api/v3/*,/auxapi/*-->
+		<init-param>
+			<param-name>include_url_endpoints</param-name>
+			<param-value>/api/v3/*</param-value>
+		</init-param>
+		<init-param>
+			<param-name>exclude_url_endpoints</param-name>
+			<param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>CadiAuthFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 </web-app>
diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml
index 98143b71..a031711e 100644
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index d75ecbdb..da320242 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-domain/pom.xml b/ecomp-sdk/epsdk-domain/pom.xml
index f0cb1181..e3c1e97a 100644
--- a/ecomp-sdk/epsdk-domain/pom.xml
+++ b/ecomp-sdk/epsdk-domain/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 
 	<groupId>org.onap.portal.sdk</groupId>
 	<artifactId>epsdk-domain</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.0</version>
 	<packaging>jar</packaging>
 	<name>ONAP Portal SDK Domain</name>
 
diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml
index aaf02147..151a01ef 100644
--- a/ecomp-sdk/epsdk-fw/pom.xml
+++ b/ecomp-sdk/epsdk-fw/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
@@ -72,7 +72,7 @@
 	 <dependency>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-logger</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</dependency>
 	<dependency>
 	<groupId>org.onap.aaf.authz</groupId>
diff --git a/ecomp-sdk/epsdk-logger/pom.xml b/ecomp-sdk/epsdk-logger/pom.xml
index 2d3237c6..4d07982c 100644
--- a/ecomp-sdk/epsdk-logger/pom.xml
+++ b/ecomp-sdk/epsdk-logger/pom.xml
@@ -1,15 +1,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.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
   </parent>
   
   <groupId>org.onap.portal.sdk</groupId>
   <artifactId>epsdk-logger</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.5.0</version>
   
   <dependencies>
        <dependency>
diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index dd30cd7e..6dc20dcd 100644
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 	
 	<groupId>org.onap.portal.sdk</groupId>
 	<artifactId>epsdk-music</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.0</version>
 	<packaging>jar</packaging>
 
 	<name>ONAP Portal SDK Music</name>
diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml
index 24d6b650..300ed92d 100644
--- a/ecomp-sdk/epsdk-workflow/pom.xml
+++ b/ecomp-sdk/epsdk-workflow/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.0</version>
 	</parent>
 	
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index bae3090f..178e7894 100644
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -13,7 +13,7 @@
 	<!-- Portal SDK Maven parent project -->
 	<groupId>org.onap.portal.sdk</groupId>
 	<artifactId>epsdk-project</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.0</version>
 	<packaging>pom</packaging>
 	<name>portal-sdk</name>
 	<url>https://wiki.onap.org/display/DW/Portal</url>
-- 
cgit 1.2.3-korg