From: Patrik Buhr <patrik.buhr@est.tech>
Date: Thu, 28 Apr 2022 04:48:28 +0000 (+0000)
Subject: Merge "Uplift from ONAP."
X-Git-Tag: 2.4.0~5
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a1124947e62ef6bb710a777b67d463617b6a7d85;hp=e5312aee7325d380aa8ed9799ab58b7a046c1979;p=nonrtric%2Fplt%2Fa1policymanagementservice.git

Merge "Uplift from ONAP."
---

diff --git a/config/application.yaml b/config/application.yaml
index 5684c46..54f47e0 100644
--- a/config/application.yaml
+++ b/config/application.yaml
@@ -77,4 +77,7 @@ app:
   # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing, 
   # no schema validation will be executed. 
   config-file-schema-path: /application_configuration_schema.json
+  # A file containing an authorization token, which shall be inserted in each HTTP header (authorization).
+  # If the file name is empty, no authorization token is sent.
+  auth-token-file:
 
diff --git a/onap/oran b/onap/oran
index 4b62052..e9ddfb1 160000
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit 4b6205245fd4839e4449e26aa4e3000ddb30ecc1
+Subproject commit e9ddfb1e0e0b256986d24aa02129e2e3850bb480
diff --git a/pom.xml b/pom.xml
index 60dc16b..905a56c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <properties>
         <java.version>11</java.version>
         <springfox.version>3.0.0</springfox.version>
-        <immutable.version>2.8.2</immutable.version>
+        <immutable.version>2.8.8</immutable.version>
         <swagger.version>2.1.13</swagger.version>
         <json.version>20211205</json.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>