Roll versions after M-Release (m-release branch) >0.4.1

Issue-ID: NONRTRIC-1095
Change-Id: I1132bd869e72d503a8d6cda5e3380c7624fa82f4
Signed-off-by: JohnKeeney <john.keeney@est.tech>
(cherry picked from commit 64e0f5e3a557ac65bcbdfb39260e5a76effd6cb9)

diff --git a/docs/conf.py b/docs/conf.py
index 6b633c6..f167c43 100755 (executable)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,15 +18,20 @@ from docs_conf.conf import *
 
 #branch configuration
 
-branch = 'latest'
+selfbranch = 'm-release'
+participantsbranch = 'latest'      #sometimes this may be different from self.branch, e.g. on first build, it may not exist yet, so linkcheck will fail
+nonrtricbranch = 'm-release'       #sometimes this may be different from self.branch, e.g. on first build, it may not exist yet, so linkcheck will fail
+
 baseurl = 'https://docs.o-ran-sc.org/projects/'
-selfurl = '%s/o-ran-sc-nonrtric-plt-rappmanager/en/%s' %(baseurl, branch)
+selfurl = '%s/o-ran-sc-nonrtric-plt-rappmanager/en/%s' %(baseurl, selfbranch)
+participantsurl = '%s/o-ran-sc-nonrtric-plt-rappmanager/en/%s/participants' %(baseurl, participantsbranch)
+nonrtricurl = '%s/o-ran-sc-nonrtric/en/%s' %(baseurl, nonrtricbranch)
 
 linkcheck_ignore = [
     'http://localhost.*',
     'http://127.0.0.1.*',
     'https://gerrit.o-ran-sc.org.*',
-    './rappmanager-api.html', #Generated file that doesn't exist at link check.
+    './rappmanager-api.html',       #Generated file that doesn't exist at link check.
 ]
 
 extensions = ['sphinxcontrib.redoc', 'sphinx.ext.intersphinx',]
@@ -45,6 +50,6 @@ redoc_uri = 'https://cdn.jsdelivr.net/npm/redoc@2.5.0/bundles/redoc.standalone.j
 #intershpinx mapping with other projects
 intersphinx_mapping = {}
 
-intersphinx_mapping['nonrtric'] = ('%s/o-ran-sc-nonrtric/en/%s' %(baseurl, branch), None)
-intersphinx_mapping['participants'] = ('%s/participants' % selfurl, None)
+intersphinx_mapping['nonrtric'] = ('%s' %(nonrtricurl), None)
+intersphinx_mapping['participants'] = ('%s' %(participantsurl), None)
 intersphinx_disabled_reftypes = ["*"]

diff --git a/participants/docs/conf.py b/participants/docs/conf.py
index fb77eb7..35310b9 100755 (executable)
--- a/participants/docs/conf.py
+++ b/participants/docs/conf.py
@@ -18,7 +18,7 @@ from docs_conf.conf import *
 
 #branch configuration
 
-branch = 'latest'
+branch = 'm-release'
 
 linkcheck_ignore = [
     'http://localhost.*',

diff --git a/participants/participant-impl-dme/pom.xml b/participants/participant-impl-dme/pom.xml
index 31c7d5d..db99b9c 100755 (executable)
--- a/participants/participant-impl-dme/pom.xml
+++ b/participants/participant-impl-dme/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>participants</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.participants</groupId>

diff --git a/participants/pom.xml b/participants/pom.xml
index 5b52de9..66398bd 100755 (executable)
--- a/participants/pom.xml
+++ b/participants/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
     <artifactId>participants</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>NONRTRIC ACM Participants</name>
     <description>O-RAN SC ACM Participants.</description>

diff --git a/pom.xml b/pom.xml
index b9a15a6..2facbef 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
     <artifactId>rappmanager</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>NONRTRIC rAppmanager</name>
     <description>O-RAN SC rApp Management function.</description>

diff --git a/rapp-manager-acm/pom.xml b/rapp-manager-acm/pom.xml
index c0582b2..c336b73 100755 (executable)
--- a/rapp-manager-acm/pom.xml
+++ b/rapp-manager-acm/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-application/pom.xml b/rapp-manager-application/pom.xml
index cc571f9..76fecbe 100755 (executable)
--- a/rapp-manager-application/pom.xml
+++ b/rapp-manager-application/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-dme/pom.xml b/rapp-manager-dme/pom.xml
index 5de51a2..c891b62 100755 (executable)
--- a/rapp-manager-dme/pom.xml
+++ b/rapp-manager-dme/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-models/pom.xml b/rapp-manager-models/pom.xml
index f300495..931b7aa 100755 (executable)
--- a/rapp-manager-models/pom.xml
+++ b/rapp-manager-models/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml
index f90b69d..be5af1f 100755 (executable)
--- a/rapp-manager-sme/pom.xml
+++ b/rapp-manager-sme/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>