From a76ceb4fec109c0dc238fb552f03999829d19540 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 24 Jan 2019 09:53:56 -0500
Subject: Fixed project structure errors that broke build

Fixed errors in pom.xml that broke build, mostly having to do with
parent tags (or lack thereof).

Change-Id: I8563bbe14e304cd22562b6ea52cc4df2bca0bff1
Issue-ID: CCSDK-1002
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 cds-ui/client/pom.xml | 27 ++++++++++-----------------
 cds-ui/server/pom.xml | 25 +++++++++----------------
 pom.xml               | 25 ++++++++++---------------
 version.properties    | 15 +++++++++++++++
 4 files changed, 44 insertions(+), 48 deletions(-)
 create mode 100644 version.properties

diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml
index cd9a21d45..573ab1fbb 100644
--- a/cds-ui/client/pom.xml
+++ b/cds-ui/client/pom.xml
@@ -21,9 +21,17 @@ limitations under the License.
 <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.cds</groupId>
+        <artifactId>controller-design-studio</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    
     <groupId>org.onap.ccsdk.cds</groupId>
-    <artifactId>controller-design-studio</artifactId>
-    <version>1.0.0</version>
+    <artifactId>controller-design-studio-client</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>cds-ui</name>
@@ -34,21 +42,6 @@ limitations under the License.
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>
 
-    <!-- ================================================================================== -->
-    <!-- Distribution Management Sites -->
-    <!-- ================================================================================== -->
-    <distributionManagement>        
-        <repository>
-            <id>ecomp-releases</id>
-            <name>openecomp-repository-releases</name>
-            <url>${onap.nexus.url}/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>openecomp-repository-snapshots</name>
-            <url>${onap.nexus.url}/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
 
 
     <build>
diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml
index 8b9c4218b..bac8b03d2 100644
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -21,9 +21,17 @@ limitations under the License.
 <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.cds</groupId>
+        <artifactId>controller-design-studio</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    
     <groupId>org.onap.ccsdk.cds.server</groupId>
     <artifactId>controller-design-studio-server</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>cds-ui-server</name>
@@ -34,21 +42,6 @@ limitations under the License.
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>
 
-    <!-- ================================================================================== -->
-    <!-- Distribution Management Sites -->
-    <!-- ================================================================================== -->
-    <distributionManagement>        
-        <repository>
-            <id>ecomp-releases</id>
-            <name>openecomp-repository-releases</name>
-            <url>${onap.nexus.url}/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>openecomp-repository-snapshots</name>
-            <url>${onap.nexus.url}/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
 
 
     <build>
diff --git a/pom.xml b/pom.xml
index 609dbbe15..5286e6374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,20 @@ limitations under the License.
 <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>spring-boot-starter-parent</artifactId>
+		<version>1.2.1-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+    
     <groupId>org.onap.ccsdk.cds</groupId>
     <artifactId>controller-design-studio</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
+    
+    
 
     <name>controller-design-studio</name>
 	
@@ -39,21 +49,6 @@ limitations under the License.
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>
 
-    <!-- ================================================================================== -->
-    <!-- Distribution Management Sites -->
-    <!-- ================================================================================== -->
-    <distributionManagement>        
-        <repository>
-            <id>ecomp-releases</id>
-            <name>openecomp-repository-releases</name>
-            <url>${onap.nexus.url}/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>openecomp-repository-snapshots</name>
-            <url>${onap.nexus.url}/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
 
 
   
diff --git a/version.properties b/version.properties
new file mode 100644
index 000000000..1da7b9a35
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,15 @@
+###########################################################
+# Versioning variables
+# 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=0
+feature_revision=0
+
+base_version=${release_name}.${sprint_number}.${feature_revision}
+
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
+
-- 
cgit 1.2.3-korg