Merge "Fixed project structure errors that broke build"
diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml
index cd9a21d..573ab1f 100644
--- a/cds-ui/client/pom.xml
+++ b/cds-ui/client/pom.xml
@@ -21,9 +21,17 @@
<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 @@
<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 8b9c421..bac8b03 100644
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -21,9 +21,17 @@
<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 @@
<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 609dbbe..5286e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,20 @@
<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 @@
<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 0000000..1da7b9a
--- /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
+