Updating RMR version to 4.8.5

Signed-off-by: czichy <thoralf.czichy@nokia.com>
Change-Id: I81f79b40a4d53dc3a0afe43e0b09472486ea4c4c

diff --git a/CHANGES b/CHANGES
index 5d6ee6e..532e3bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 # has several changes.  Multiple blank lines between versions are
 # squished to one.
 
+2022 08 December; version 2.3.7
+       Taking in new RMR version 4.8.5.
+
 2022 05 February; version 2.3.6
        Fixed bug on XAPP_DESCRIPTOR_PATH parser.
        Add test cases for XAPP_DESCRIPTOR_PATH parser.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089fe95..01f8da0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ cmake_minimum_required( VERSION 3.5 )
 
 set( major_version "2" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
 set( minor_version "3" )
-set( patch_level "6" )
+set( patch_level "7" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_inc "include/ricxfcpp" )

diff --git a/Dockerfile b/Dockerfile
index 7cee0fe..b979228 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ ARG SRC=.
 
 WORKDIR /playpen
 # Install RMr (runtime and dev) from debian package cached on packagecloud.io
-ARG RMR_VER=4.8.0
+ARG RMR_VER=4.8.5
 
 # if package cloud is actually working, this is preferred
 #

diff --git a/build_rmr.sh b/build_rmr.sh
index 71e9bb9..acdf15c 100755 (executable)
--- a/build_rmr.sh
+++ b/build_rmr.sh
@@ -6,7 +6,7 @@
 #                              repo and installing it.  The package method is preferred
 #                              but if that breaks this can be used in place of it.
 
-rmr_ver=${1:-4.8.0}
+rmr_ver=${1:-4.8.5}
 
 # assume that we're in the proper directory
 set -e

diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst
index bc62520..fd1988a 100644 (file)
--- a/docs/rel-notes.rst
+++ b/docs/rel-notes.rst
@@ -15,7 +15,14 @@ C++ Framework Release Notes
 The following is a list of release highlights for the C++
 xAPP Framework.
 
+
+
+2022 08 December; version 2.3.7
+-------------------------------
+Taking in new RMR version 4.8.5. 
+
 2022 05 February; version 2.3.6
+-------------------------------
        Fixed bug on XAPP_DESCRIPTOR_PATH parser.
        Add test cases for XAPP_DESCRIPTOR_PATH parser.
 

diff --git a/rmr-version.yaml b/rmr-version.yaml
index f78e960..81fef81 100644 (file)
--- a/rmr-version.yaml
+++ b/rmr-version.yaml
@@ -1,3 +1,3 @@
 # Communicate to CI which version of RMR to install in the build/vet environment
 ---
-version: 4.8.0
+version: 4.8.5