summaryrefslogtreecommitdiffstats
path: root/ONAP-SDK-APP
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-09-18 00:48:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-18 00:48:59 +0000
commit79cd00fc32b9894672590418a5af9a64929db49d (patch)
treea78660dfa127ccbe753c98144c537e0c76fc4359 /ONAP-SDK-APP
parent8287e34104ce634d2a20c5906ddb53a2a4fe6959 (diff)
parent9efe59e93578e0ee495c85dad691fa9864512113 (diff)
Merge "AAF integration in Policy SDK"
Diffstat (limited to 'ONAP-SDK-APP')
-rw-r--r--ONAP-SDK-APP/pom.xml2
-rw-r--r--ONAP-SDK-APP/src/main/resources/portal.properties10
2 files changed, 10 insertions, 2 deletions
diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index f08b76d76..9e845b964 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -30,7 +30,7 @@
<packaging>war</packaging>
<properties>
<encoding>UTF-8</encoding>
- <epsdk.version>2.3.1</epsdk.version>
+ <epsdk.version>2.4.0</epsdk.version>
<springframework.version>4.2.0.RELEASE</springframework.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties
index 04d39c14f..fd65b3e67 100644
--- a/ONAP-SDK-APP/src/main/resources/portal.properties
+++ b/ONAP-SDK-APP/src/main/resources/portal.properties
@@ -2,7 +2,7 @@
# ================================================================================
# onap Portal SDK
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
+# Copyright (C) 2017-2018 AT&T Intellectual Property
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -50,3 +50,11 @@ ueb_listeners_enable = false
# If key ueb_listeners_enable is set to false,
# then only the ueb_app_key is required.
ueb_app_key = REPLACE-ME-UEB-APP-KEY-EPSDK-APP-OS
+
+#INFO: Once the Roles onboarded by Portal to AAF, we need to enable this property.
+# Use this tag if the app is centralized
+#role_access_centralized = remote
+
+# Connection and Read timeout values
+ext_req_connection_timeout = 15000
+ext_req_read_timeout = 20000 \ No newline at end of file