From 8fe579d7d1b802e9d91205c7ff991631ea35f7ac Mon Sep 17 00:00:00 2001
From: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>
Date: Thu, 4 Mar 2021 17:13:00 +0200
Subject: Fix cps-nf-proxy standalone assembly.

Application dependency on cps-ri module moved from cps-rest module (indirect)
to cps-application (direct, using assembly profiles)

Issue-ID: CPS-274
Change-Id: Id246dc4c6d15343e4862f70151aa82c5020862c9
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>
---
 cps-application/pom.xml | 12 ++++++++++++
 cps-rest/pom.xml        |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index cfebf6887..9a7d2f8e3 100644
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -124,6 +124,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -149,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>
@@ -178,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>
diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index 840228eb9..9264c6815 100755
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -16,10 +16,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>cps-service</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cps-ri</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -30,6 +26,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
-- 
cgit 1.2.3-korg