Step version to 2.1.0 on master

Step new version on master after Bronze maintenance release.

Change-Id: If09f874b5cbd0bb12c5e2013375f80b65fb2c697
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>

diff --git a/docker-compose/nosdnc/docker-compose.yml b/docker-compose/nosdnc/docker-compose.yml
index aa83c7a..27e073c 100644 (file)
--- a/docker-compose/nosdnc/docker-compose.yml
+++ b/docker-compose/nosdnc/docker-compose.yml
@@ -16,7 +16,7 @@
 version: '3.0'
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0
     container_name: policy-agent
     networks:
       default:

diff --git a/docker-compose/sdnc/docker-compose.yml b/docker-compose/sdnc/docker-compose.yml
index 1b5a296..3bb0bd8 100644 (file)
--- a/docker-compose/sdnc/docker-compose.yml
+++ b/docker-compose/sdnc/docker-compose.yml
@@ -16,7 +16,7 @@
 version: '3.0'
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0
     container_name: policy-agent
     networks:
       default:
@@ -85,7 +85,7 @@ services:
         max-file: "5"
 
   a1-controller:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller:2.1.0
     depends_on :
       - db
     container_name: a1-controller

diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index 8abc92c..b5fedc3 100644 (file)
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -120,7 +120,7 @@ The target paths in the container should not be modified.
 
 Example docker run command for mounting new files (assuming they are located in the current directory):
 
-`docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.0.0-SNAPSHOT`
+`docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.1.0-SNAPSHOT`
 
 End-to-end call
 ===============

diff --git a/policy-agent/README.md b/policy-agent/README.md
index 649a2b5..490a94f 100644 (file)
--- a/policy-agent/README.md
+++ b/policy-agent/README.md
@@ -34,7 +34,7 @@ volumes:
 The target paths in the container should not be modified.
 
 Example docker run command for mounting new files (assuming they are located in the current directory):
-docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.0.0-SNAPSHOT
+docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.1.0-SNAPSHOT
 
 
 To Run Policy Agent in Local:

diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index 0dd6d03..e1884fc 100644 (file)
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -31,7 +31,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>policy-agent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>

diff --git a/pom.xml b/pom.xml
index 4cb5edf..f7c5053 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.o-ran-sc</groupId>
     <artifactId>nonrtric</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>nonrtric</name>

diff --git a/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
index 042e481..3e112f0 100644 (file)
--- a/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
+++ b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>features-sdnc-a1-northbound</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/features/installer/pom.xml b/sdnc-a1-controller/northbound/features/installer/pom.xml
index 75e41f6..44c2dca 100755 (executable)
--- a/sdnc-a1-controller/northbound/features/installer/pom.xml
+++ b/sdnc-a1-controller/northbound/features/installer/pom.xml
@@ -30,7 +30,7 @@ limitations under the License.
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-a1-northbound-features-installer</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/features/pom.xml b/sdnc-a1-controller/northbound/features/pom.xml
index 3986363..b9fda71 100755 (executable)
--- a/sdnc-a1-controller/northbound/features/pom.xml
+++ b/sdnc-a1-controller/northbound/features/pom.xml
@@ -30,7 +30,7 @@ limitations under the License.
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-northbound-feature-aggregator</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: features</name>

diff --git a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
index 3a4d11a..e4f0fc7 100644 (file)
--- a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
+++ b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-a1-northbound-all</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
index 4ec9ab6..87b05af 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
@@ -30,7 +30,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>features-nonrt-ric-api</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
index 09ce581..7ff8e6b 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-features</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
index 895766d..07d3787 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>sdnc-nonrt-ric-api</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
index 3a70a34..3913f5e 100755 (executable)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
@@ -30,7 +30,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>nonrt-ric-api-installer</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
index 08fd479..4403d42 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
@@ -38,7 +38,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-model</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
index c24857f..f4bf81c 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
@@ -32,7 +32,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>nonrt-ric-api</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: nonrt-ric-api</name>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
index 8fa19ac..88acea6 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
@@ -40,7 +40,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-provider</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/northbound/pom.xml b/sdnc-a1-controller/northbound/pom.xml
index 1f95097..4589d0c 100644 (file)
--- a/sdnc-a1-controller/northbound/pom.xml
+++ b/sdnc-a1-controller/northbound/pom.xml
@@ -38,7 +38,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-a1-northbound</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <properties>

diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml
index 6cdf04f..11b2bb8 100644 (file)
--- a/sdnc-a1-controller/oam/installation/pom.xml
+++ b/sdnc-a1-controller/oam/installation/pom.xml
@@ -30,7 +30,7 @@
     <packaging>pom</packaging>
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <name>sdnc-a1-oam :: installation</name>
     <description>Installs SDN-C on local file system</description>

diff --git a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
index 2169344..18d94cd 100644 (file)
--- a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
@@ -30,17 +30,17 @@
     <packaging>pom</packaging>
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>installation-sdnc-a1</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <name>sdnc-a1-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
 
     <properties>
      <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
-     <standalone.image.version>2.0.0-SNAPSHOT</standalone.image.version>
+     <standalone.image.version>2.1.0-SNAPSHOT</standalone.image.version>
      <sdnc.project.version>${project.version}</sdnc.project.version>
      <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-     <sdnc.northbound.version>2.0.0-SNAPSHOT</sdnc.northbound.version>
+     <sdnc.northbound.version>2.1.0-SNAPSHOT</sdnc.northbound.version>
      <ccsdk.docker.version>0.7.0</ccsdk.docker.version>
      <docker.push.phase>deploy</docker.push.phase>
     </properties>

diff --git a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
index 93121a7..3e754a0 100644 (file)
--- a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
+++ b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
@@ -38,7 +38,7 @@ services:
         max-file: "5"
 
   a1-controller:
-    image: o-ran-sc/nonrtric-a1-controller:2.0.0-SNAPSHOT
+    image: o-ran-sc/nonrtric-a1-controller:2.1.0-SNAPSHOT
     depends_on :
       - db
     container_name: a1-controller-container

diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
index 7e9030c..ad28356 100644 (file)
--- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
@@ -30,7 +30,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
        <artifactId>platform-logic-installer</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml
index a9d8ca9..ceb3742 100644 (file)
--- a/sdnc-a1-controller/oam/platform-logic/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>platform-logic</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-a1-oam :: platform-logic</name>

diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
index f4c62c5..b3f6741 100644 (file)
--- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
        <artifactId>platform-logic-setup</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml
index 45105e6..d66503c 100755 (executable)
--- a/sdnc-a1-controller/oam/pom.xml
+++ b/sdnc-a1-controller/oam/pom.xml
@@ -29,7 +29,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
        <artifactId>sdnc-a1-oam</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-oam</name>

diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml
index e15d7ef..6f08d25 100644 (file)
--- a/sdnc-a1-controller/pom.xml
+++ b/sdnc-a1-controller/pom.xml
@@ -25,7 +25,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1</groupId>
        <artifactId>sdnc-a1</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1</name>

diff --git a/test/common/test_env.sh b/test/common/test_env.sh
index a06efe2..623bc24 100755 (executable)
--- a/test/common/test_env.sh
+++ b/test/common/test_env.sh
@@ -25,10 +25,10 @@
 
 # Local Policy Agent image and tag
 POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent"
-POLICY_AGENT_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT"
+POLICY_AGENT_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT"
 # Remote Policy Agent image and tag
 POLICY_AGENT_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent"
-POLICY_AGENT_REMOTE_IMAGE_TAG="2.0.0"
+POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0"
 
 
 # Control Panel local image and tag
@@ -41,10 +41,10 @@ CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0"
 
 # SDNC A1 Controller local image and tag
 SDNC_A1_CONTROLLER_LOCAL_IMAGE="o-ran-sc/nonrtric-a1-controller"
-SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT"
+SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT"
 # SDNC A1 Controller remote image and tag
 SDNC_A1_CONTROLLER_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller"
-SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.0.0"
+SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.1.0"
 
 
 #SDNC DB remote image and tag