Upgrade version number

[cps.git] / cps-application / pom.xml

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index a159ad8..d725630 100644 (file)
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (c) 2021 Pantheon.tech.
+  Modifications Copyright (C) 2021 Bell Canada.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  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">
@@ -7,14 +26,18 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>cps-application</artifactId>
 
     <properties>
+        <app>org.onap.cps.Application</app>
+        <image.version>${project.version}</image.version>
+        <jib-maven-plugin.version>2.6.0</jib-maven-plugin.version>
         <minimum-coverage>0.0</minimum-coverage>
+        <nexus.repository>nexus3.onap.org:10003/onap/</nexus.repository>
     </properties>
 
     <dependencies>
@@ -44,6 +67,22 @@
                 <plugin>
                     <groupId>com.google.cloud.tools</groupId>
                     <artifactId>jib-maven-plugin</artifactId>
+                    <version>${jib-maven-plugin.version}</version>
+                    <configuration>
+                        <container>
+                            <mainClass>${app}</mainClass>
+                            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+                        </container>
+                        <from>
+                            <image>${base.image}</image>
+                        </from>
+                        <to>
+                            <tags>
+                                <tag>latest</tag>
+                            </tags>
+                            <image>${nexus.repository}${image.name}:${image.version}</image>
+                        </to>
+                    </configuration>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -77,11 +116,18 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
 
+            <properties>
+                <image.name>cps-service</image.name>
+            </properties>
             <dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -99,8 +145,7 @@
             </activation>
 
             <properties>
-                <app>org.onap.cps.Application</app>
-                <repository.name>nexus3.onap.org:10001/onap/cps-nf-proxy</repository.name>
+                <image.name>cps-nf-proxy</image.name>
             </properties>
 
             <dependencies>
@@ -108,6 +153,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-nf-proxy-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -121,12 +170,11 @@
         <profile>
             <id>cps-xnf-docker</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
 
             <properties>
-                <app>org.onap.cps.Application</app>
-                <repository.name>nexus3.onap.org:10001/onap/cps-and-nf-proxy</repository.name><!-- better naming? -->
+                <image.name>cps-and-nf-proxy</image.name>
             </properties>
 
             <dependencies>
@@ -138,6 +186,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-nf-proxy-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>