Roll to Guilin release

Roll to Guilin release versions

Change-Id: I0d9e8d86bf71d0339bc7be4391c69e992b2a509d
Issue-ID: SDNC-1235
Signed-off-by: Dan Timoney <dtimoney@att.com>

8 files changed, 12 insertions, 99 deletions

diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/client/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/client/pom.xml b/client/pom.xml
deleted file mode 100644
index 8a1afe1..0000000
--- a/client/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-
-
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <groupId>org.onap.sdnc.apps</groupId>
-    <artifactId>client</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-
-    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-    <url>http://wiki.onap.org</url>
-    <description>POM to be used for yang2swagger generation of client in SDNC project</description>
-    
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>client-parent</artifactId>
-        <version>1.5.2</version>
-    </parent>
-
-    <properties>
-        <northbound.version>1.4.0</northbound.version>
-    </properties>
-
-    <dependencies>
-        <!-- This is where the yang comes from -->
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>generic-resource-api-model</artifactId>
-            <version>${northbound.version}</version>
-        </dependency>
-        <!-- End this is where the yang comes from -->        
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <includeGroupIds>org.opendaylight.mdsal.model, org.onap.sdnc.northbound</includeGroupIds>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <configOptions>
-                                <java8>true</java8>
-                                <withXml>true</withXml>
-                                <output>${project.build.directory}/generated-sources/swagger</output>
-                                <generateApis>false</generateApis>
-                                <generateApiTests>false</generateApiTests>
-                                <generateModels>true</generateModels>
-                                <generateModelTests>false</generateModelTests>
-                                <generateSupportingFiles>false</generateSupportingFiles>
-                                <apiPackage>org.onap.sdnc.apps.client.handler</apiPackage>
-                                <modelPackage>org.onap.sdnc.apps.client.model</modelPackage>
-                                <invokerPackage>org.onap.sdnc.apps.client.invoker</invokerPackage>
-                                <sourceFolder>src/main/java</sourceFolder>
-                                <useBeanValidation>true</useBeanValidation>
-                                <interfaceOnly>true</interfaceOnly>
-                            </configOptions>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/pom.xml b/pom.xml
index f7a9e28..1862d4a 100644
--- 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.sdnc</groupId>
     <artifactId>apps</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps</name>
diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml
index a60a51d..176e71a 100644
--- a/pomba/network-discovery-api/pom.xml
+++ b/pomba/network-discovery-api/pom.xml
@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 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>
 
@@ -28,7 +29,7 @@ limitations under the License.
 
     <groupId>org.onap.sdnc.apps.pomba</groupId>
     <artifactId>network-discovery-api</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <name>Network Discovery API</name>
 
diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index 616efae..8805c5e 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -16,13 +16,14 @@ See the License for the specific language governing permissions and
 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.sdnc.apps.pomba</groupId>
         <artifactId>pomba</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pomba/pom.xml b/pomba/pom.xml
index 06e6103..dcf7643 100644
--- a/pomba/pom.xml
+++ b/pomba/pom.xml
@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 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>
 
@@ -28,7 +29,7 @@ limitations under the License.
 
     <groupId>org.onap.sdnc.apps.pomba</groupId>
     <artifactId>pomba</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml
index 24a9434..d480119 100644
--- a/pomba/service-decomposition/pom.xml
+++ b/pomba/service-decomposition/pom.xml
@@ -16,13 +16,14 @@ See the License for the specific language governing permissions and
 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.sdnc.apps.pomba</groupId>
         <artifactId>pomba</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/version.properties b/version.properties
index 9a2a5d8..99af217 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # 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}