Roll to initial Honolulu version

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

diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml
index d0fc421..c485cb2 100644 (file)
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 ============LICENSE_START==========================================
 ===================================================================
 Copyright (C) 2018-19 IBM Intellectual Property. All rights reserved.
@@ -18,31 +18,26 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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.ccsdk.cds</groupId>
-        <artifactId>ui</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <artifactId>cds-ui</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
-    <artifactId>ui-server</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <artifactId>cds-ui-server</artifactId>
     <packaging>pom</packaging>
 
-    <name>cds-ui-server</name>
+    <name>UI Server</name>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <npm.executable>npm</npm.executable>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <image.name>onap/ccsdk-cds-ui-server</image.name>
-        <docker.push.phase>deploy</docker.push.phase>
     </properties>
 
-
     <build>
         <plugins>
             <plugin>
@@ -59,9 +54,9 @@ limitations under the License.
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.onap.ccsdk.cds.components</groupId>
-                                    <artifactId>proto-definition</artifactId>
-                                    <version>${project.version}</version>
+                                    <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
+                                    <artifactId>blueprint-proto</artifactId>
+                                    <version>${ccsdk.cds.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.build.directory}/generated/proto-definition/proto</outputDirectory>
@@ -139,8 +134,8 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-    
-        <profiles>
+
+    <profiles>
         <profile>
             <id>docker</id>
             <build>
@@ -148,7 +143,7 @@ limitations under the License.
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.26.1</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -165,18 +160,12 @@ limitations under the License.
                                     </build>
                                 </image>
                             </images>
-                            <verbose>true</verbose>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>generate-images</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>push-images</id>
+                                <id>build-push-images</id>
                                 <phase>${docker.push.phase}</phase>
                                 <goals>
                                     <goal>build</goal>