From c56c9df65a380977ab547057840453f54420b4b9 Mon Sep 17 00:00:00 2001
From: czichy <thoralf.czichy@nokia.com>
Date: Thu, 8 Jun 2023 14:48:50 +0300
Subject: [PATCH] RMR update and H release step 1 of 2

Change-Id: I9443d5dc6434d6988e1bcca72513ffd45751714f
Signed-off-by: czichy <thoralf.czichy@nokia.com>
---
 CHANGES              | 3 +++
 CMakeLists.txt       | 2 +-
 Dockerfile           | 4 ++--
 build_rmr.sh         | 2 +-
 docs/rel-notes.rst   | 4 ++++
 rmr-version.yaml     | 2 +-
 src/model/Dockerfile | 2 +-
 tox.ini              | 6 +++++-
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7b592bf..851447d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 # has several changes.  Multiple blank lines between versions are
 # squished to one.
 
+2023 08 June; version 2.3.8
+	Taking in new RMR version 4.9.1.
+
 2022 14 December; version 2.3.8
         adding support for REST-based E2 subscriptions
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26b429b..9dad6ea 100644
--- 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 "8" )
+set( patch_level "9" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_inc "include/ricxfcpp" )
diff --git a/Dockerfile b/Dockerfile
index e43a578..9ee0577 100644
--- 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.5
+ARG RMR_VER=4.9.1
 
 # if package cloud is actually working, this is preferred
 #
@@ -107,7 +107,7 @@ RUN cp /usr/local/lib/x86_64-linux-gnu/pkgconfig/libpistache.pc /usr/local/lib/p
 RUN git clone https://github.com/nlohmann/json.git && cd json && cmake . && make install
 
 #install json-schema-validator
-RUN git clone https://github.com/pboettch/json-schema-validator.git && cd json-schema-validator &&mkdir build &&cd build && cmake .. && make install
+RUN git clone https://github.com/pboettch/json-schema-validator.git && cd json-schema-validator && git checkout cae6fad80001510077a7f40e68477a31ec443add &&mkdir build &&cd build && cmake .. && make install
 
 #copy the content as git repo inside the container.
 #COPY ${SRC}/CMakeLists.txt /playpen/factory/
diff --git a/build_rmr.sh b/build_rmr.sh
index acdf15c..f1cc321 100755
--- 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.5}
+rmr_ver=${1:-4.9.1}
 
 # assume that we're in the proper directory
 set -e
diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst
index 5927c51..a8b4efe 100644
--- a/docs/rel-notes.rst
+++ b/docs/rel-notes.rst
@@ -17,6 +17,10 @@ xAPP Framework.
 
 
 
+2023 08 June; version 2.3.9
+-------------------------------
+Taking in new RMR version 4.9.1. 
+
 2022 14 December; version 2.3.8
 -------------------------------
 Adding support for REST-based E2 subscriptions
diff --git a/rmr-version.yaml b/rmr-version.yaml
index 81fef81..da7a63b 100644
--- 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.5
+version: 4.9.1
diff --git a/src/model/Dockerfile b/src/model/Dockerfile
index 9b275c4..f574c30 100644
--- a/src/model/Dockerfile
+++ b/src/model/Dockerfile
@@ -12,5 +12,5 @@ RUN git clone https://github.com/Microsoft/cpprestsdk.git casablanca && \
     ninja && \
     ninja install
 RUN git clone https://github.com/nlohmann/json.git && cd json && cmake . && make install
-RUN git clone https://github.com/pboettch/json-schema-validator.git && cd json-schema-validator &&mkdir build &&cd build && cmake .. && make install
+RUN git clone https://github.com/pboettch/json-schema-validator.git && cd json-schema-validator && git checkout cae6fad80001510077a7f40e68477a31ec443add &&mkdir build &&cd build && cmake .. && make install
 COPY . ./
diff --git a/tox.ini b/tox.ini
index 00d06df..1cff55d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,11 +18,13 @@ deps =
     sphinxcontrib-httpdomain
     recommonmark
     lfdocs-conf
+    urllib3~=1.26.15
+
+allowlist_externals = echo
 
 commands =
     sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
-whitelist_externals = echo
 
 [testenv:docs-linkcheck]
 basepython = python3
@@ -31,4 +33,6 @@ deps = sphinx
        sphinxcontrib-httpdomain
        recommonmark
        lfdocs-conf
+       urllib3~=1.26.15
+
 commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
-- 
2.16.6