Roll master version for Istanbul

Roll versions of ccskd parent poms to 2.2.0-SNAPSHOT and of ccsdk/oran
to 1.2.0-SNAPSHOT for Istanbul release

Issue-ID: CCSDK-3190
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ib719aa66623af275507edfc646217625d1acc00c

diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml
index 48b597d..4a9b9cc 100644 (file)
--- a/a1-adapter/a1-adapter-api/feature/pom.xml
+++ b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-feature</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 6c1c74c..37dab66 100644 (file)
--- a/a1-adapter/a1-adapter-api/installer/pom.xml
+++ b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-installer</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 ef10e0e..cd1e344 100644 (file)
--- a/a1-adapter/a1-adapter-api/model/pom.xml
+++ b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-model</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 7be8568..c821e41 100644 (file)
--- a/a1-adapter/a1-adapter-api/pom.xml
+++ b/a1-adapter/a1-adapter-api/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-api</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 4050d5b..7625f18 100644 (file)
--- a/a1-adapter/a1-adapter-api/provider/pom.xml
+++ b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-provider</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-oran :: ${project.artifactId}</name>
@@ -41,6 +41,7 @@
         <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
         <junit-jupiter-engine.version>5.6.0</junit-jupiter-engine.version>
         <mockito-junit-jupiter.version>3.5.10</mockito-junit-jupiter.version>
+        <ccsdk.sli.core.version>1.3.0-SNAPSHOT</ccsdk.sli.core.version>
     </properties>
 
     <dependencyManagement>

diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml
index 22e98cb..2391cf7 100644 (file)
--- a/a1-adapter/features/a1-adapter-northbound/pom.xml
+++ b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 18e44ec..850183c 100644 (file)
--- a/a1-adapter/features/installer/pom.xml
+++ b/a1-adapter/features/installer/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-adapter-northbound-installer</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 ab26720..0d51059 100644 (file)
--- a/a1-adapter/features/pom.xml
+++ b/a1-adapter/features/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 fedab41..419f755 100644 (file)
--- a/a1-adapter/pom.xml
+++ b/a1-adapter/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-a1-adapter</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.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 7d61bf9..3d3cbd5 100644 (file)
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -25,12 +25,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>a1-policy-management-service</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>ccsdk-oran :: ${project.artifactId}</name>
     <properties>
         <java.version.source>11</java.version.source>

diff --git a/csit/scripts/healthcheck/docker-compose.yml b/csit/scripts/healthcheck/docker-compose.yml
index 03aa20e..27480ca 100644 (file)
--- a/csit/scripts/healthcheck/docker-compose.yml
+++ b/csit/scripts/healthcheck/docker-compose.yml
@@ -21,7 +21,7 @@ networks:
 
 services:
   policy-agent:
-    image: onap/ccsdk-oran-a1policymanagementservice:1.1.2-SNAPSHOT-latest
+    image: onap/ccsdk-oran-a1policymanagementservice:1.2.0-SNAPSHOT-latest
     container_name: policy-agent
     networks:
       default:

diff --git a/pom.xml b/pom.xml
index 8856c2f..d36666e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.oran</groupId>
     <artifactId>ccsdk-oran</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/version.properties b/version.properties
index 1b443e7..55f9564 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,8 +5,8 @@
 
 
 release_name=1
-sprint_number=1
-feature_revision=2
+sprint_number=2
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}