From b77bf2529f15e60c852cf83d5150e75d30068bb0 Mon Sep 17 00:00:00 2001
From: "Claudio D. Gasparini" <claudio.gasparini@pantheon.tech>
Date: Thu, 28 Jan 2021 15:36:37 +0100
Subject: Decouple configuration from application

- Decouple configuration from application
- Generate all 3 types of docker variations

Issue-ID: CPS-175
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
Change-Id: I1e2e0577c5911f7c79801e4c691d196515dc02a1
---
 cps-nf-proxy-rest/pom.xml | 52 ++++++++++-------------------------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

(limited to 'cps-nf-proxy-rest/pom.xml')

diff --git a/cps-nf-proxy-rest/pom.xml b/cps-nf-proxy-rest/pom.xml
index 7b5601435..ca2cf8345 100755
--- a/cps-nf-proxy-rest/pom.xml
+++ b/cps-nf-proxy-rest/pom.xml
@@ -12,9 +12,7 @@
     <artifactId>cps-nf-proxy-rest</artifactId>
 
     <properties>
-        <app>org.onap.cps.nfproxy.Application</app>
-        <repository.name>nexus3.onap.org:10001/onap/cps-nf-proxy</repository.name>
-        <minimum-coverage>0.44</minimum-coverage>
+        <minimum-coverage>0.0</minimum-coverage>
     </properties>
 
     <dependencies>
@@ -52,6 +50,10 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -92,10 +94,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
             <!-- Swagger code generation. -->
             <plugin>
                 <groupId>io.swagger.codegen.v3</groupId>
@@ -112,44 +110,16 @@
                             <apiPackage>org.onap.cps.nfproxy.rest.api</apiPackage>
                             <language>spring</language>
                             <generateSupportingFiles>false</generateSupportingFiles>
+                            <configOptions>
+                                <sourceFolder>src/gen/java</sourceFolder>
+                                <dateLibrary>java11</dateLibrary>
+                                <interfaceOnly>true</interfaceOnly>
+                                <useTags>true</useTags>
+                            </configOptions>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>docker</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.google.cloud.tools</groupId>
-                        <artifactId>jib-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <id>build</id>
-                                <goals>
-                                    <goal>dockerBuild</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <phase>deploy</phase>
-                                <id>buildAndPush</id>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
-- 
cgit 1.2.3-korg