From 67124a6da72c48db84449747446eeee3decd3c05 Mon Sep 17 00:00:00 2001
From: JohnKeeney <john.keeney@est.tech>
Date: Fri, 16 Jun 2023 01:17:35 +0100
Subject: [PATCH] Roll versions after release

Issue-ID: NONRTRIC-883
Change-Id: I605c8e39c579dda78b97c6946666e012aae84df1
Signed-off-by: JohnKeeney <john.keeney@est.tech>
---
 .readthedocs.yaml                  | 2 +-
 docker-compose/.env                | 4 ++--
 docs/conf.py                       | 2 +-
 docs/requirements-docs.txt         | 1 +
 nonrtric-gateway/pom.xml           | 2 +-
 pom.xml                            | 2 +-
 webapp-frontend/container-tag.yaml | 2 +-
 webapp-frontend/pom.xml            | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 30f3f56..0693439 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -22,7 +22,7 @@ formats:
   - htmlzip
 
 build:
-  image: latest
+  image: h-release
 
 python:
   version: 3.7
diff --git a/docker-compose/.env b/docker-compose/.env
index 6c9743b..69fdd12 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -17,8 +17,8 @@
 
 #CONTROL_PANEL
 CONTROL_PANEL_IMAGE_BASE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel"
-CONTROL_PANEL_IMAGE_TAG="2.3.0"
+CONTROL_PANEL_IMAGE_TAG="2.5.0"
 
 #NONRTRIC_GATEWAY
 NONRTRIC_GATEWAY_IMAGE_BASE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-gateway"
-NONRTRIC_GATEWAY_IMAGE_TAG="1.1.0"
\ No newline at end of file
+NONRTRIC_GATEWAY_IMAGE_TAG="1.2.0"
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index 021eb04..b2dd686 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,7 +23,7 @@ linkcheck_ignore = [
     'https://gerrit.o-ran-sc.org.*'
 ]
 
-branch = 'latest'
+branch = 'h-release'
 
 extensions = [
     'sphinx.ext.intersphinx',
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 09a0c1c..ba20050 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -3,3 +3,4 @@ sphinx-rtd-theme
 sphinxcontrib-httpdomain
 recommonmark
 lfdocs-conf
+urllib3~=1.26.15
diff --git a/nonrtric-gateway/pom.xml b/nonrtric-gateway/pom.xml
index 96a050c..2ae9330 100644
--- a/nonrtric-gateway/pom.xml
+++ b/nonrtric-gateway/pom.xml
@@ -29,7 +29,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>nonrtric-gateway</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>Nonrtric Gateway</name>
     <description>Nonrtric Gateway</description>
 
diff --git a/pom.xml b/pom.xml
index 633db5c..5b3c9ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>nonrtric-controlpanel-root</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>nonrtric-gateway</module>
diff --git a/webapp-frontend/container-tag.yaml b/webapp-frontend/container-tag.yaml
index 009ab55..254711a 100644
--- a/webapp-frontend/container-tag.yaml
+++ b/webapp-frontend/container-tag.yaml
@@ -16,4 +16,4 @@
 #
 
 ---
-tag: 2.5.0
+tag: 2.5.1
diff --git a/webapp-frontend/pom.xml b/webapp-frontend/pom.xml
index 13d2900..08ade34 100644
--- a/webapp-frontend/pom.xml
+++ b/webapp-frontend/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>nonrtric-controlpanel</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.1-SNAPSHOT</version>
     <name>Nonrtric Controlpanel</name>
     <description>NonRTRIC Controlpanel</description>
 
-- 
2.16.6