From: PatrikBuhr <patrik.buhr@est.tech>
Date: Wed, 12 Jan 2022 15:36:54 +0000 (+0100)
Subject: Uplift of A1 PMS from ONAP
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=75123350d6d40767688079d149d26e866ad3d03a;p=nonrtric.git

Uplift of A1 PMS from ONAP

Removal of using of CBS

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-703
Change-Id: I4e9c717679ec8623ae5881a203226d86b851187d
---

diff --git a/a1-policy-management-service/pom.xml b/a1-policy-management-service/pom.xml
index b90bb886..870874d4 100644
--- a/a1-policy-management-service/pom.xml
+++ b/a1-policy-management-service/pom.xml
@@ -48,8 +48,7 @@
     <properties>
         <java.version>11</java.version>
         <springfox.version>3.0.0</springfox.version>
-        <immutable.version>2.8.2</immutable.version>
-        <sdk.version>1.1.6</sdk.version>
+        <immutable.version>2.8.2</immutable.version>      
         <swagger.version>2.1.12</swagger.version>
         <json.version>20190722</json.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -70,7 +69,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.0-jre</version>
+            <version>31.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -137,11 +136,6 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
-            <artifactId>cbs-client</artifactId>
-            <version>${sdk.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -406,4 +400,4 @@
         <system>JIRA</system>
         <url>https://jira.o-ran-sc.org/</url>
     </issueManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/onap/oran b/onap/oran
index c6cca20e..0f8b2054 160000
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit c6cca20e3fd10842be0ca782d143dfa59d5c086e
+Subproject commit 0f8b20544745afaf9c7b38140b9516667d9c4752