Manually reset versions for newdelhi branch - avoid conflict

Keeps most changes since New Delhi Release - easier than rebase & cherry pick
Also update Docs for New Delhi

Issue-ID: CCSDK-4020
Change-Id: Id04a61c0ba1bdb69fa8752446eadb110ebf69f19
Signed-off-by: JohnKeeney <john.keeney@est.tech>

diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml
index 13a2c69..292f8ab 100644 (file)
--- a/a1-adapter/a1-adapter-api/feature/pom.xml
+++ b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-feature</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml
index 44c1db0..a17f525 100644 (file)
--- a/a1-adapter/a1-adapter-api/installer/pom.xml
+++ b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-installer</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml
index 13a94d6..0a479d7 100644 (file)
--- a/a1-adapter/a1-adapter-api/model/pom.xml
+++ b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-model</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml
index 2b3d321..50bdac8 100644 (file)
--- a/a1-adapter/a1-adapter-api/pom.xml
+++ b/a1-adapter/a1-adapter-api/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-api</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml
index a8655cc..da908d3 100644 (file)
--- a/a1-adapter/a1-adapter-api/provider/pom.xml
+++ b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-provider</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml
index 8f73555..6271ccc 100644 (file)
--- a/a1-adapter/features/a1-adapter-northbound/pom.xml
+++ b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml
index a123a6c..e79e2fa 100644 (file)
--- a/a1-adapter/features/installer/pom.xml
+++ b/a1-adapter/features/installer/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound-installer</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml
index 554275b..a993b8a 100644 (file)
--- a/a1-adapter/features/pom.xml
+++ b/a1-adapter/features/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml
index b69e1da..b7f6807 100644 (file)
--- a/a1-adapter/pom.xml
+++ b/a1-adapter/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 46e0ec3..2c13d39 100644 (file)
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-policy-management-service</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <name>ccsdk-oran :: ${project.artifactId}</name>
     <properties>
         <java.version.source>17</java.version.source>

diff --git a/csit/scripts/healthcheck/.env b/csit/scripts/healthcheck/.env
index c9b3561..9545a7e 100644 (file)
--- a/csit/scripts/healthcheck/.env
+++ b/csit/scripts/healthcheck/.env
@@ -18,7 +18,7 @@
 
 #PMS
 PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice"
-PMS_IMAGE_TAG="1.8.0-SNAPSHOT-latest"
+PMS_IMAGE_TAG="1.7.1-SNAPSHOT-latest"
 
 #A1_SIM
 A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator"

diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
index 79c08b6..7b8aca7 100755 (executable)
--- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
+++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2021-2023 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -46,7 +47,7 @@ checkStatus(){
     done
     echo -e "$i sec: $4 is NOT alive!\n"
     echo "Capturing docker logs (before exiting) ..."
-    docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml logs 
+    docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml logs
     exit -1
 }
 

diff --git a/docs/conf.py b/docs/conf.py
index 07f9c67..52b3401 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,11 +17,11 @@
 #
 
 project = "onap"
-release = "master"
-version = "master"
+release = "newdelhi"
+version = "newdelhi"
 # Map to 'latest' if this file is used in 'latest' (master) 'doc' branch.
 # Change to {releasename} after you have created the new 'doc' branch.
-branch = 'latest'
+branch = 'newdelhi'
 
 
 author = "Open Network Automation Platform"

diff --git a/docs/guide/developer-guide.rst b/docs/guide/developer-guide.rst
index bb73744..d689687 100644 (file)
--- a/docs/guide/developer-guide.rst
+++ b/docs/guide/developer-guide.rst
@@ -10,7 +10,7 @@ Developer Guide
 
 This document provides a quickstart for developers of the CCSDK functions for O-RAN A1 Policies.
 
-.. image:: ../media/ONAP-A1ControllerArchitecture-Montreal.png
+.. image:: ../media/ONAP-A1ControllerArchitecture-NewDelhi.png
    :width: 500pt
 
 Source tree

diff --git a/docs/humaninterfaces/humaninterfaces.rst b/docs/humaninterfaces/humaninterfaces.rst
index a68962b..780f820 100644 (file)
--- a/docs/humaninterfaces/humaninterfaces.rst
+++ b/docs/humaninterfaces/humaninterfaces.rst
@@ -7,6 +7,6 @@ Human Interfaces
 ================
 
 The NON-RT RIC Control Panel in O-RAN-SC can be used to interact with the Policy Management Service.
-See `NON-RT RIC Control Panel repo <https://gerrit.o-ran-sc.org/r/admin/repos/portal/nonrtric-controlpanel>`_ from the `O-RAN-SC NONRTRIC Project <https://wiki.o-ran-sc.org/display/RICNR>`_.
+See `NON-RT RIC Control Panel repo <https://gerrit.o-ran-sc.org/r/admin/repos/portal/nonrtric-controlpanel>`_ from the `O-RAN-SC NONRTRIC Project <https://lf-o-ran-sc.atlassian.net/wiki/spaces/RICNR>`_.
 
 Any "REST Client" application may be used (Postman, ...) to interact with the Policy Management Service application via the :ref:`pms_api`

diff --git a/docs/media/ONAP-A1ControllerArchitecture-NewDelhi.png b/docs/media/ONAP-A1ControllerArchitecture-NewDelhi.png
new file mode 100644 (file)
index 0000000..15580c8
Binary files /dev/null and b/docs/media/ONAP-A1ControllerArchitecture-NewDelhi.png differ

diff --git a/pom.xml b/pom.xml
index c2cd223..7dcafa3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-oran</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -52,7 +52,7 @@
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
                 <version>${sonar-maven-plugin.version}</version>
-            </plugin>           
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/version.properties b/version.properties
index 553bda2..1f39477 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,8 +5,8 @@
 
 
 release_name=1
-sprint_number=8
-feature_revision=0
+sprint_number=7
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}