From 29d2f47efffa73214736ec1a1d74b58f59b5d62a Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Tue, 8 Oct 2024 12:18:26 +0100
Subject: [PATCH] ACM Participants: Upgrade ACM and Spring Boot version

Spring boot and ACM version upgraded.
ACM version upgraded to 8.1.0-SNAPSHOT. This needs to be replaced once release images are available (NONRTRIC-1035).
ACM version 8.0.0 is not compatible with the latest version of Spring Boot
Spring boot upgraded to 3.3.4

Issue-ID: NONRTRIC-1030
Change-Id: Ib8eee96ab5b367d50e30c65b9358f937fea30459
Signed-off-by: aravind.est <aravindhan.a@est.tech>
---
 participants/participant-impl-dme/pom.xml                    | 12 ++++++++++++
 .../participant-impl-dme/src/main/resources/application.yaml | 12 ++++++++++--
 participants/pom.xml                                         |  8 ++++----
 3 files changed, 26 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 participants/participant-impl-dme/src/main/resources/application.yaml

diff --git a/participants/participant-impl-dme/pom.xml b/participants/participant-impl-dme/pom.xml
index 5e0e191..8ff3ee2 100755
--- a/participants/participant-impl-dme/pom.xml
+++ b/participants/participant-impl-dme/pom.xml
@@ -53,14 +53,26 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/participants/participant-impl-dme/src/main/resources/application.yaml b/participants/participant-impl-dme/src/main/resources/application.yaml
old mode 100755
new mode 100644
index cfa06aa..4ce2ec5
--- a/participants/participant-impl-dme/src/main/resources/application.yaml
+++ b/participants/participant-impl-dme/src/main/resources/application.yaml
@@ -17,18 +17,26 @@ dme:
 
 participant:
   intermediaryParameters:
+    topics:
+      operationTopic: policy-acruntime-participant
+      syncTopic: acm-ppnt-sync
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c08
     clampAutomationCompositionTopics:
       topicSources:
-        - topic: policy-acruntime-participant
+        - topic: ${participant.intermediaryParameters.topics.operationTopic}
+          servers:
+            - ${topicServer:kafka.default.svc.cluster.local:9092}
+          topicCommInfrastructure: NOOP
+          fetchTimeout: 15000
+        - topic: ${participant.intermediaryParameters.topics.syncTopic}
           servers:
             - ${topicServer:kafka.default.svc.cluster.local:9092}
           topicCommInfrastructure: NOOP
           fetchTimeout: 15000
       topicSinks:
-        - topic: policy-acruntime-participant
+        - topic: ${participant.intermediaryParameters.topics.operationTopic}
           servers:
             - ${topicServer:kafka.default.svc.cluster.local:9092}
           topicCommInfrastructure: NOOP
diff --git a/participants/pom.xml b/participants/pom.xml
index b4ae178..29c1217 100755
--- a/participants/pom.xml
+++ b/participants/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.5</version>
+        <version>3.3.4</version>
         <relativePath/>
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -52,9 +52,9 @@
     <properties>
         <java.version>17</java.version>
         <openapi.maven.version>7.3.0</openapi.maven.version>
-        <docker-maven-plugin>0.43.4</docker-maven-plugin>
-        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
-        <onap.acm.models.version>7.1.1</onap.acm.models.version>
+        <docker-maven-plugin>0.45.0</docker-maven-plugin>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <onap.acm.models.version>8.0.1-SNAPSHOT</onap.acm.models.version> <!-- This should be updated with release version once available NONRTRIC-1035 -->
         <openapi.jackson.databind.nullable.version>0.2.6</openapi.jackson.databind.nullable.version>
     </properties>
     <build>
-- 
2.16.6