From 71f561eb81dfa6c777cc296693cd8f69cb58b8b0 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" 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) Change-Id: I6a01d344735ded414d9b42b14221cdb447882528 --- cds-ui/application/pom.xml | 2 +- cds-ui/client/pom.xml | 4 +- cds-ui/pom.xml | 4 +- cds-ui/server/pom.xml | 2 +- ms/blueprintsprocessor/distribution/pom.xml | 2 +- .../modules/inbounds/health-api/pom.xml | 32 ++--- ms/blueprintsprocessor/parent/pom.xml | 84 ++++++----- ms/command-executor/pom.xml | 2 +- ms/controllerblueprints/README_FIRST.txt | 0 .../modules/blueprint-proto/pom.xml | 30 ++-- .../modules/blueprint-validation/pom.xml | 1 - ms/controllerblueprints/parent/pom.xml | 22 ++- ms/controllerblueprints/repoproject.txt | 1 - ms/controllerblueprints/time.txt | 1 - ms/sdclistener/application/pom.xml | 156 ++++++++++----------- ms/sdclistener/distribution/pom.xml | 2 +- ms/sdclistener/parent/pom.xml | 1 - pom.xml | 21 ++- 18 files changed, 198 insertions(+), 169 deletions(-) delete mode 100644 ms/controllerblueprints/README_FIRST.txt delete mode 100644 ms/controllerblueprints/repoproject.txt delete mode 100644 ms/controllerblueprints/time.txt diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index de8827f4a..358de718e 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -32,7 +32,7 @@ limitations under the License. 0.7.0-SNAPSHOT pom - cds-ui-application + CDS UI Application onap/ccsdk-cds-ui diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index 4217ac5c9..abf5afff6 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -1,5 +1,5 @@ - - 4.0.0 + 4.0.0 - - org.onap.ccsdk.cds.blueprintsprocessor - inbounds - 0.7.0-SNAPSHOT - + + org.onap.ccsdk.cds.blueprintsprocessor + inbounds + 0.7.0-SNAPSHOT + - health-api - jar + health-api + jar - Blueprints Processor Health API - checking system check health endpoints + Blueprints Processor Health API + checking system check health endpoints - - - org.onap.ccsdk.cds.blueprintsprocessor - rest-lib - - + + + org.onap.ccsdk.cds.blueprintsprocessor + rest-lib + + 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 @@ Blueprints Processor Parent - 2.2.0 - 0.1.55 + ${ccsdk.sli.core.version} + 1.1.5 + + + + 2.9.2 2.2.6.RELEASE 2.2.0 1.0.0 - ${ccsdk.sli.core.version} - 27.0.1-jre - 2.7.1 - - - 2.9.2 - 1.4.197 1.2.2 + + 1.4.197 1.7.4 - 1.1.5 + 5.5.1 + 2.8.0 + 2.6.3 + + 2.2.0 + 0.1.55 + 2.7.1 2.5.1 1.7 - 2.8.0 - 5.5.1 + 27.0.1-jre 1.10.3 - 2.6.3 1.9 + 2.3 + + 2.6 + 3.2.1 + 3.2.2 @@ -101,33 +109,36 @@ - - - - - - - - - - - + + org.apache.commons commons-lang3 - 3.2.1 + ${commons-lang3-version} commons-collections commons-collections - 3.2.2 + ${commons-collections-version} commons-io commons-io - 2.6 + ${commons-io-version} org.apache.velocity @@ -161,6 +172,11 @@ jython-standalone ${jython.version} + + net.minidev + json-smart + ${json-smart.version} + @@ -254,7 +270,6 @@ ${protobuff.java.utils.version} - org.apache.sshd @@ -329,7 +344,6 @@ - org.onap.ccsdk.cds.blueprintsprocessor @@ -562,6 +576,10 @@ + + net.minidev + json-smart + net.javacrumbs.json-unit json-unit-json-path @@ -580,10 +598,10 @@ - - - - + + + + io.springfox springfox-swagger-ui diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index 0db7af92b..0aad7b46c 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -37,7 +37,7 @@ true ${project.version} ${maven.build.timestamp} - yyyyMMdd'T'HHmmss'Z' + yyyyMMdd'T'HHmmss'Z' diff --git a/ms/controllerblueprints/README_FIRST.txt b/ms/controllerblueprints/README_FIRST.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml index eb4dd9f78..91097b9d9 100644 --- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml @@ -66,19 +66,21 @@ - - - - - - - - - - - - - + @@ -95,7 +97,7 @@ ${project.basedir}/target/generated-sources/protobuf/java ${project.basedir}/target/generated-sources/protobuf/grpc-java - + diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml index 40fff14d4..5bc2e2a6b 100644 --- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml @@ -47,7 +47,6 @@ resource-dict - org.jetbrains.kotlin diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml index 62f300c0a..c5e01a6b6 100644 --- a/ms/controllerblueprints/parent/pom.xml +++ b/ms/controllerblueprints/parent/pom.xml @@ -36,11 +36,17 @@ 27.0.1-jre 0.5.0 2.9.2 + 1.4.197 1.2.2 1.7.4 + 2.5.1 1.7 + 2.3 + 2.6 + 3.2.1 + 3.2.2 @@ -87,17 +93,17 @@ org.apache.commons commons-lang3 - 3.2.1 + ${commons-lang3-version} commons-collections commons-collections - 3.2.2 + ${commons-collections-version} commons-io commons-io - 2.6 + ${commons-io-version} org.apache.velocity @@ -114,6 +120,11 @@ guava ${guava.version} + + net.minidev + json-smart + ${json-smart.version} + @@ -219,7 +230,6 @@ ${h2database.version} - org.onap.ccsdk.cds.controllerblueprints @@ -293,6 +303,10 @@ + + net.minidev + json-smart + com.google.guava guava diff --git a/ms/controllerblueprints/repoproject.txt b/ms/controllerblueprints/repoproject.txt deleted file mode 100644 index 91a5c8e67..000000000 --- a/ms/controllerblueprints/repoproject.txt +++ /dev/null @@ -1 +0,0 @@ -ST_SDNCMS diff --git a/ms/controllerblueprints/time.txt b/ms/controllerblueprints/time.txt deleted file mode 100644 index 6ed29fb4a..000000000 --- a/ms/controllerblueprints/time.txt +++ /dev/null @@ -1 +0,0 @@ -Current time : 17:38:06 diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index d1048acfd..2e6c183a9 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -15,91 +15,91 @@ ~ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.cds.sdclistener - parent - 0.7.0-SNAPSHOT - ../parent - + + org.onap.ccsdk.cds.sdclistener + parent + 0.7.0-SNAPSHOT + ../parent + - application - 0.7.0-SNAPSHOT - jar + application + 0.7.0-SNAPSHOT + jar - SDC Listener Application + SDC Listener Application - - 3.6.1 - ${parent.version} - + + 3.6.1 + ${parent.version} + - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.springframework.boot - spring-boot-starter-test - test - + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-test + test + - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - 1.3.0 - + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + 1.3.0 + - - org.jmockit - jmockit - test - + + org.jmockit + jmockit + test + - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - com.google.protobuf - protobuf-java - - - io.grpc - grpc-testing - test - - - org.onap.ccsdk.cds.controllerblueprints - blueprint-proto - + + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + com.google.protobuf + protobuf-java + + + io.grpc + grpc-testing + test + + + org.onap.ccsdk.cds.controllerblueprints + blueprint-proto + - - io.projectreactor - reactor-core - compile - - + + io.projectreactor + reactor-core + compile + + diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index ca6947841..58dabc0c6 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -85,7 +85,7 @@ package - + diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index 850dfa43f..65ca25040 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -183,7 +183,6 @@ ${project.version} - org.onap.ccsdk.cds.controllerblueprints diff --git a/pom.xml b/pom.xml index 8350e1e5a..41ad1cb69 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ limitations under the License. org.onap.ccsdk.parent spring-boot-starter-parent 1.5.0-SNAPSHOT - + org.onap.ccsdk.cds @@ -30,7 +30,7 @@ limitations under the License. 0.7.0-SNAPSHOT pom - cds-parent + CDS Parent CCSDK Controller Design Studio https://wiki.onap.org @@ -44,7 +44,7 @@ limitations under the License. - + src/main @@ -52,12 +52,11 @@ limitations under the License. **/*.java,**/*.kt - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml 0.8.3 - - - false + + + false true @@ -69,7 +68,7 @@ limitations under the License. ${jacoco.version} - + org.codehaus.mojo tidy-maven-plugin @@ -133,8 +132,8 @@ limitations under the License. - - + + format true -- cgit 1.2.3-korg