Roll master to Guilin

Roll master to new versions for early Guilin developent

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

diff --git a/alpine/pom.xml b/alpine/pom.xml
index 490c2bf..3862692 100644 (file)
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-alpine</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: alpine</name>

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index bb5192e..7d0a3e3 100644 (file)
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -4,14 +4,14 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>2.0.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>ansible-server</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
 
        <name>ccsdk :: distribution :: ${project.artifactId}</name>
        <description>Creates ansible-server Docker container</description>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index da681ba..cbb8319 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>dependencies</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution:: dependencies</name>

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index ec9d15c..f969e5b 100644 (file)
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder-docker</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder-docker</name>

diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 3a1ec4d..5edc91c 100644 (file)
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,12 +5,12 @@
        <parent>
             <groupId>org.onap.ccsdk.distribution</groupId>
             <artifactId>distribution-root</artifactId>
-            <version>0.7.1-SNAPSHOT</version>
+            <version>1.0.0-SNAPSHOT</version>
         </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder</name>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index c3d0f0f..2012877 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index c572198..75343cc 100644 (file)
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli</name>

diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml
index 1dfb3b2..2fb3604 100644 (file)
--- a/opendaylight/neon/neon-alpine/pom.xml
+++ b/opendaylight/neon/neon-alpine/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-odl-neon</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-odl-neon-docker</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: opendaylight :: neon :: docker</name>

diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml
index f179354..caa2282 100644 (file)
--- a/opendaylight/neon/pom.xml
+++ b/opendaylight/neon/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-neon</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: opendaylight</name>

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 4d48f4d..4ed6885 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-opendaylight</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: opendaylight</name>

diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml
index a359dee..e302aa7 100644 (file)
--- a/platform-logic/a1Adapter-api/pom.xml
+++ b/platform-logic/a1Adapter-api/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-a1Adapterapi</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index 0e685c5..eb7a58f 100644 (file)
--- a/platform-logic/asdc-api/pom.xml
+++ b/platform-logic/asdc-api/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-asdcapi</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml
index 426e4ba..46c5b99 100644 (file)
--- a/platform-logic/cMNotify-api/pom.xml
+++ b/platform-logic/cMNotify-api/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-cMNotifyai</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 598c46d..0221bac 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-installer</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml
index 68347f1..e35bf52 100644 (file)
--- a/platform-logic/oofpcipoc-api/pom.xml
+++ b/platform-logic/oofpcipoc-api/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-oofpcipocapi</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 8b243ea..2636232 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-platform-logic</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic</name>

diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index f106308..182cca6 100644 (file)
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,11 +5,11 @@
     <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
     <artifactId>platform-logic-restapi-templates</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index 98440d7..1d286cb 100644 (file)
--- a/platform-logic/sliapi/pom.xml
+++ b/platform-logic/sliapi/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.7.1-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-sliapi</artifactId>
-       <version>0.7.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/pom.xml b/pom.xml
index 3bde37c..10d48a6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-root</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution</name>

diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index 75f0bcc..cd4acee 100644 (file)
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>saltstack-server</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: saltstack-server</name>

diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 31ff010..c81722b 100644 (file)
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-ubuntu</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ubuntu</name>

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