Roll master branch versions to 1.8.0 after New Delhi release

Issue-ID: CCSDK-4020
Change-Id: I06ba58fc333c8a2d2670a2e88529dc39bdc61a2c
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 00952bb..13a2c69 100644 (file)
--- a/a1-adapter/a1-adapter-api/feature/pom.xml
+++ b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-feature</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 c848702..44c1db0 100644 (file)
--- a/a1-adapter/a1-adapter-api/installer/pom.xml
+++ b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-installer</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 dd7dbfe..13a94d6 100644 (file)
--- a/a1-adapter/a1-adapter-api/model/pom.xml
+++ b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-model</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 24e0ffb..2b3d321 100644 (file)
--- a/a1-adapter/a1-adapter-api/pom.xml
+++ b/a1-adapter/a1-adapter-api/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -30,7 +31,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-api</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 43077ca..a8655cc 100644 (file)
--- a/a1-adapter/a1-adapter-api/provider/pom.xml
+++ b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-provider</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 2c02f05..8f73555 100644 (file)
--- a/a1-adapter/features/a1-adapter-northbound/pom.xml
+++ b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -30,7 +31,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 e137037..a123a6c 100644 (file)
--- a/a1-adapter/features/installer/pom.xml
+++ b/a1-adapter/features/installer/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound-installer</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 7b8fb31..554275b 100644 (file)
--- a/a1-adapter/features/pom.xml
+++ b/a1-adapter/features/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>

diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml
index 9b4168f..b69e1da 100644 (file)
--- a/a1-adapter/pom.xml
+++ b/a1-adapter/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 0d53b90..46e0ec3 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.7.0-SNAPSHOT</version>
+    <version>1.8.0-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 727d933..c9b3561 100644 (file)
--- a/csit/scripts/healthcheck/.env
+++ b/csit/scripts/healthcheck/.env
@@ -1,5 +1,6 @@
 #  ============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.
@@ -17,11 +18,11 @@
 
 #PMS
 PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice"
-PMS_IMAGE_TAG="1.7.0-SNAPSHOT-latest"
+PMS_IMAGE_TAG="1.8.0-SNAPSHOT-latest"
 
 #A1_SIM
 A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator"
-A1_SIM_IMAGE_TAG="2.1.0"
+A1_SIM_IMAGE_TAG="2.7.0"
 
 #DB
 DB_IMAGE_BASE="mariadb"
@@ -29,4 +30,4 @@ DB_IMAGE_TAG="10.5"
 
 #A1CONTROLLER
 A1CONTROLLER_IMAGE_BASE="nexus3.onap.org:10002/onap/sdnc-image"
-A1CONTROLLER_IMAGE_TAG="2.3.0"
+A1CONTROLLER_IMAGE_TAG="2.6.1"

diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
index 6513f78..79c08b6 100755 (executable)
--- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
+++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
@@ -45,6 +45,8 @@ checkStatus(){
         fi
     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 
     exit -1
 }
 
@@ -71,7 +73,7 @@ curl -sSkw %{http_code}   http://localhost:8081/actuator/loggers/org.onap.ccsdk.
 
 # check SDNC status
 echo "check SDNC status:"
-checkStatus 300 "curl -sS -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/ " "200" "SDNC"
+checkStatus 300 "curl -sS -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/index.html " "200" "SDNC"
 
 cd ${SHELL_FOLDER}/../data
 ./preparePmsData.sh

diff --git a/pom.xml b/pom.xml
index f9b56dd..c2cd223 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~ ONAP : ccsdk oran
   ~ ================================================================================
-  ~ Copyright (C) 2020 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2020-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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-oran</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

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