Merge "Uplift from ONAP"

diff --git a/Dockerfile b/Dockerfile
index 6f8387e..784664c 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM openjdk:11-jre-slim
+FROM openjdk:17-jdk-slim
 
 ARG JAR
 

diff --git a/INFO.yaml b/INFO.yaml
index 9ddbf5d..b7baece 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -33,11 +33,6 @@ repositories:
     - 'nonrtric/plt/a1policymanagementservice'
 committers:
     - <<: *oran_nonrtric_ptl
-    - name: 'Henrik Andersson'
-      email: 'henrik.b.andersson@est.tech'
-      company: 'Ericsson Software Technology'
-      id: 'elinuxhenrik'
-      timezone: 'Sweden/Stockholm'
     - name: 'Patrik Buhr'
       email: 'patrik.buhr@est.tech'
       company: 'Ericsson Software Technology'

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index b643337..7141ad2 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -56,6 +56,9 @@ Version history A1 Policy Management Service (A1 Policy Agent)
 | 2022-12-12 | 2.5.0    | Henrik Andersson | G Release          |
 |            |          |                  |                    |
 +------------+----------+------------------+--------------------+
+| 2023-02-10 | 2.5.1    | Yennifer Chacon  | G Maintenance      |
+|            |          |                  | Release            |
++------------+----------+------------------+--------------------+
 
 Release Data
 ============
@@ -252,3 +255,22 @@ G Release
 |                             |                                                   |
 +-----------------------------+---------------------------------------------------+
 
+G Maintenance Release
+---------------------
++-----------------------------+---------------------------------------------------+
+| **Project**                 | Non-RT RIC A1 Policy Management Service           |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Repo/commit-ID**          | nonrtric/plt/a1policymanagementservice            |
+|                             | a88e7e03d172d1f1fb39be2c8f958eaf4ee50c30          |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release designation**     | G                                                 |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release date**            | 2023-02-10                                        |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Purpose of the delivery** | Update springboot version                         |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
\ No newline at end of file