Merge "ResourceResolution should fail if required resource did not resolve -edge...

[ccsdk/cds.git] / cds-ui / pom.xml

diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml
index 6d54732..cf70f5e 100644 (file)
--- a/cds-ui/pom.xml
+++ b/cds-ui/pom.xml
@@ -23,15 +23,13 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.cds</groupId>
+        <artifactId>cds-aggregator</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
-    <groupId>org.onap.ccsdk.cds</groupId>
     <artifactId>cds-ui</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>UI Parent</name>
@@ -46,14 +44,5 @@ limitations under the License.
 
     <properties>
         <npm.executable>npm</npm.executable>
-        <image.name>onap/ccsdk-cds-ui</image.name>
-        <ccsdk.cds.version>${project.version}</ccsdk.cds.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
-        <!-- docker related properties -->
-        <docker.verbose>true</docker.verbose>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.push.phase>deploy</docker.push.phase>
     </properties>
 </project>