From 71f561eb81dfa6c777cc296693cd8f69cb58b8b0 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Wed, 18 Sep 2019 10:05:39 -0400
Subject: Ensure json-smart is in right scope

Adding json-smart:2.3 as dependencies to avoid Junit Failure

Issue-ID: CCSDK-1740
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I6a01d344735ded414d9b42b14221cdb447882528
---
 ms/blueprintsprocessor/parent/pom.xml | 84 +++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 33 deletions(-)

(limited to 'ms/blueprintsprocessor/parent')

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 726ba55c5..ac123cbfd 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -31,28 +31,36 @@
     <description>Blueprints Processor Parent</description>
 
     <properties>
-        <sshd.version>2.2.0</sshd.version>
-        <jsch.version>0.1.55</jsch.version>
+        <sli.version>${ccsdk.sli.core.version}</sli.version>
+        <dmaap.client.version>1.1.5</dmaap.client.version>
+
+        <!-- Should be using released artifact as soon as available: -->
+        <!-- https://github.com/springfox/springfox/milestone/44 -->
+        <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
         <spring.kafka.version>2.2.6.RELEASE</spring.kafka.version>
         <kafka.version>2.2.0</kafka.version>
         <eelf.version>1.0.0</eelf.version>
-        <sli.version>${ccsdk.sli.core.version}</sli.version>
-        <guava.version>27.0.1-jre</guava.version>
-        <jython.version>2.7.1</jython.version>
-        <!--        Should be using released artifact as soon as available:-->
-        <!--        https://github.com/springfox/springfox/milestone/44-->
-        <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
-        <h2database.version>1.4.197</h2database.version>
         <onap.logger.slf4j>1.2.2</onap.logger.slf4j>
+
+        <h2database.version>1.4.197</h2database.version>
         <powermock.version>1.7.4</powermock.version>
-        <dmaap.client.version>1.1.5</dmaap.client.version>
+        <mockkserver.version>5.5.1</mockkserver.version>
+        <json.unit.version>2.8.0</json.unit.version>
+        <xmlunit.version>2.6.3</xmlunit.version>
+
+        <sshd.version>2.2.0</sshd.version>
+        <jsch.version>0.1.55</jsch.version>
+        <jython.version>2.7.1</jython.version>
         <jinja.version>2.5.1</jinja.version>
         <velocity.version>1.7</velocity.version>
-        <json.unit.version>2.8.0</json.unit.version>
-        <mockkserver.version>5.5.1</mockkserver.version>
+        <guava.version>27.0.1-jre</guava.version>
         <jsoup.version>1.10.3</jsoup.version>
-        <xmlunit.version>2.6.3</xmlunit.version>
         <json-patch.version>1.9</json-patch.version>
+        <json-smart.version>2.3</json-smart.version>
+
+        <commons-io-version>2.6</commons-io-version>
+        <commons-lang3-version>3.2.1</commons-lang3-version>
+        <commons-collections-version>3.2.2</commons-collections-version>
     </properties>
 
     <dependencyManagement>
@@ -101,33 +109,36 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>io.springfox</groupId>-->
-<!--                <artifactId>springfox-spring-webflux</artifactId>-->
-<!--                <version>${springfox.swagger2.version}</version>-->
-<!--                <exclusions>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.slf4j</groupId>-->
-<!--                        <artifactId>slf4j-api</artifactId>-->
-<!--                    </exclusion>-->
-<!--                </exclusions>-->
-<!--            </dependency>-->
+
+            <!--
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-spring-webflux</artifactId>
+                <version>${springfox.swagger2.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            -->
 
             <!-- Common Utils Dependencies -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.2.1</version>
+                <version>${commons-lang3-version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
+                <version>${commons-collections-version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.6</version>
+                <version>${commons-io-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
@@ -161,6 +172,11 @@
                 <artifactId>jython-standalone</artifactId>
                 <version>${jython.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>${json-smart.version}</version>
+            </dependency>
 
             <!-- Kotlin Dependencies -->
             <dependency>
@@ -254,7 +270,6 @@
                 <version>${protobuff.java.utils.version}</version>
             </dependency>
 
-
             <!-- Adaptors -->
             <dependency>
                 <groupId>org.apache.sshd</groupId>
@@ -329,7 +344,6 @@
                 </exclusions>
             </dependency>
 
-
             <!-- Blueprint Processor Application Module Dependencies -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
@@ -562,6 +576,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+        </dependency>
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit-json-path</artifactId>
@@ -580,10 +598,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>io.springfox</groupId>-->
-<!--            <artifactId>springfox-spring-webflux</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.springfox</groupId>-->
+        <!--            <artifactId>springfox-spring-webflux</artifactId>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-- 
cgit 1.2.3-korg