Update versions for Oslo

Update versions of ccsdk/apps for Oslo release

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

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index 3d68590..221aae6 100644 (file)
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-cadi</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 5046a05..729f285 100755 (executable)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
            <artifactId>ccsdk-apps</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-cadi</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-apps-cadi</name>

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 83eefa9..3cf23af 100644 (file)
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -18,19 +18,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-ms-neng</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <name>Naming Generation</name>
 

diff --git a/ms/pom.xml b/ms/pom.xml
index ec43bcd..d3f1c36 100644 (file)
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -18,18 +18,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ccsdk-apps-ms</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Micro-services Root</name>

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 418efe3..9df0bfb 100644 (file)
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>sliboot</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-apps :: sliboot :: ${project.artifactId}</name>
@@ -84,38 +84,38 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider-base</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliapi-model-swagger</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>yaml</type>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restapi-call-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>properties-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>

diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 8971e6e..7de7be8 100644 (file)
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps.ms.vlantagapi</groupId>
     <artifactId>vlantag-api</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Vlantag API</name>
@@ -74,13 +74,13 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>resource-assignment-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

diff --git a/pom.xml b/pom.xml
index c4e6cbe..6b4c2b6 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-30-starter-parent</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-apps</name>
@@ -53,8 +53,6 @@
         <gson.version>2.9.0</gson.version>
            <springfox.version>3.0.0</springfox.version>
         <aaf.cadi.version>2.1.21</aaf.cadi.version>
-        <ccsdk.sli.version>1.9.0-SNAPSHOT</ccsdk.sli.version>
-        <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <maven.compiler.source>1.11</maven.compiler.source>
         <maven.compiler.target>1.11</maven.compiler.target>
     </properties>

diff --git a/services/pom.xml b/services/pom.xml
index 4ca0dcf..18709d0 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>services</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-apps :: services :: ${project.artifactId}</name>
@@ -75,17 +75,17 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider-base</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -126,47 +126,47 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>utils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>aai-service-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>mdsal-resource-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
             <artifactId>publisher.provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>netbox-client-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restapi-call-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>properties-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <!-- this jersey jar is needed for rest api call node to function properly -->
         <dependency>

diff --git a/version.properties b/version.properties
index 7a40064..1e23756 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 
-release_name=1
-sprint_number=8
+release_name=2
+sprint_number=0
 feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}