From 9605fee3d50a5436e7395604d05af9a9b3a72adc Mon Sep 17 00:00:00 2001
From: JohnKeeney <john.keeney@est.tech>
Date: Tue, 13 Jun 2023 20:30:27 +0100
Subject: Update dependecies to address vulnerabilities

org.json.json 20220924 -> 20230227
  CVE-2022-45688

org.onap.ccsdk.parent.spring-boot-30-starter-parent 2.5.4 ->2.5.5
  org.springframework.boot.* 3.0.3 -> 3.0.6
    CVE-2023-28867
    CVE-2023-20873
    CVE-2023-1370
    CVE-2022-4492

  org.springframework.* 6.0.4 -> 6.0.8
    CVE-2023-20863
    CVE-2023-20861

  ch.qos.logback.* 1.4.5 -> 1.4.7

Issue-ID: CCSDK-3841
Change-Id: Ie458a6270aa68aeea36f5b56054603548265c97c
Signed-off-by: JohnKeeney <john.keeney@est.tech>
---
 a1-policy-management/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 1c26e94b..d1bf04f3 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-30-starter-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.5.5</version>
         <relativePath />
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
@@ -37,7 +37,7 @@
         <java.version.source>17</java.version.source>
         <java.version.target>17</java.version.target>
         <gson.version>2.10.1</gson.version>
-        <json.version>20220924</json.version>
+        <json.version>20230227</json.version>
         <formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>2.35.0</spotless-maven-plugin.version>
         <commons-io.version>2.11.0</commons-io.version>
-- 
cgit 1.2.3-korg


From 68e2a7fc04c4c2bfd95241eeb1ba105097448f33 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 26 Jun 2023 14:20:26 +0200
Subject: Set Python and Ubuntu versions in .readthedocs.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It now follows the ONAP gate configurations.
It also fixes the settings and formats it.

Issue-ID: DOC-811
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I78e3d69010e840665756e2b39411b5bcbbbcb106
---
 .readthedocs.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 3797dc8b..f56b3b71 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -3,18 +3,16 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 # Required
-version: 2
-
-formats:
-  - htmlzip
 
+version: 2
 build:
-  image: latest
+  os: ubuntu-20.04
+  tools:
+    python: "3.8"
 
 python:
-  version: 3.7
   install:
-    - requirements: docs/requirements-docs.txt
+  - requirements: docs/requirements-docs.txt
 
 sphinx:
   configuration: docs/conf.py
-- 
cgit 1.2.3-korg