From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 26 Mar 2019 16:44:59 +0000 (-0400)
Subject: Fix cds ui build
X-Git-Tag: 0.4.2~147^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F83387%2F2;p=ccsdk%2Fcds.git

Fix cds ui build

Change-Id: I0ce7472367348f044ef81f49613876083a2332ff
Issue-ID: CCSDK-1177
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---

diff --git a/cds-ui/.dockerignore b/cds-ui/application/.dockerignore
similarity index 100%
rename from cds-ui/.dockerignore
rename to cds-ui/application/.dockerignore
diff --git a/cds-ui/Dockerfile b/cds-ui/application/Dockerfile
similarity index 100%
rename from cds-ui/Dockerfile
rename to cds-ui/application/Dockerfile
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index 842655934..3ab1d338b 100644
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>../TagVersion.groovy</source>
+                            <source>${project.basedir}/../../TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
@@ -80,7 +80,6 @@ limitations under the License.
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>..</dockerFileDir>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
                                             <tag>${project.docker.latestfulltag.version}</tag>
diff --git a/pom.xml b/pom.xml
index e229fa98a..8c989ba09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@ limitations under the License.
     <description>CCSDK Controller Design Studio</description>
 
     <modules>
-        <!--<module>cds-ui</module>-->
-        <module>components</module>
-        <module>ms</module>
+        <module>cds-ui</module>
+        <!--<module>components</module>-->
+        <!--<module>ms</module>-->
     </modules>
 
     <url>https://wiki.onap.org</url>