From 3c2766d8a64d21f402b5234e33419a8aed14d7ea Mon Sep 17 00:00:00 2001
From: Piotr Bochenski <piotr.bochenski@nokia.com>
Date: Fri, 31 Aug 2018 11:49:21 +0200
Subject: Refactor Docker image building process

Align Docker image building process to VES project.
Also refactor all Maven configurations.

Change-Id: I3856bb75f41247f5ce7f17fb813aa2ab692e4def
Issue-ID: DCAEGEN2-737
Signed-off-by: Piotr Bochenski <piotr.bochenski@nokia.com>
---
 prh-aai-client/pom.xml | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

(limited to 'prh-aai-client/pom.xml')

diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml
index cbd6c868..7edf1b6c 100644
--- a/prh-aai-client/pom.xml
+++ b/prh-aai-client/pom.xml
@@ -18,29 +18,22 @@
   ~ limitations under the License.
   ~ ============LICENSE_END=========================================================
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<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>
-    <artifactId>prh</artifactId>
     <groupId>org.onap.dcaegen2.services</groupId>
+    <artifactId>prh</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>prh-aai-client</artifactId>
   <groupId>org.onap.dcaegen2.services.prh</groupId>
+  <artifactId>prh-aai-client</artifactId>
   <packaging>jar</packaging>
 
-
-  <properties>
-    <main.basedir>${project.parent.basedir}</main.basedir>
-  </properties>
   <dependencies>
-
-    <!-- DEVELOPMENT DEPENDENCIES -->
     <dependency>
       <groupId>org.immutables</groupId>
       <artifactId>value</artifactId>
@@ -49,11 +42,6 @@
       <groupId>org.immutables</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webflux</artifactId>
-      <version>5.0.5.RELEASE</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -66,6 +54,10 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webflux</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -73,15 +65,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-reactor-netty</artifactId>
-      <version>2.0.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.onap.dcaegen2.services.prh</groupId>
       <artifactId>prh-commons</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
-    <!-- LOGGING DEPENDENCIES-->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -95,15 +85,14 @@
       <artifactId>log4j-over-slf4j</artifactId>
     </dependency>
 
-    <!-- TEST DEPENDENCIES-->
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-- 
cgit 1.2.3-korg