X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fblueprintsprocessor%2Fparent%2Fpom.xml;h=4ee3f3656573ace58c3fbfe1fa887e65e08b1099;hb=65bb9d0d83762e8fa8e3ab568c801908eafa0686;hp=091d9dc6877864d9fb70ea7016198a4d0bf8c7b1;hpb=383235b495c32a1762511f1837bc9e98af6226eb;p=ccsdk%2Fcds.git

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 091d9dc68..4ee3f3656 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -33,15 +33,15 @@
 
     <properties>
         <sli.version>${ccsdk.sli.core.version}</sli.version>
+        <!-- Override CDS version from parent to be project.version -->
+        <ccsdk.cds.version>${project.version}</ccsdk.cds.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>
         <onap.logger.slf4j>1.2.2</onap.logger.slf4j>
+        <hazelcast.version>4.0</hazelcast.version>
 
         <h2database.version>1.4.197</h2database.version>
         <powermock.version>1.7.4</powermock.version>
@@ -52,6 +52,7 @@
         <netty-ssl>2.0.26.Final</netty-ssl>
         <sshd.version>2.2.0</sshd.version>
         <jsch.version>0.1.55</jsch.version>
+        <jslt.version>0.1.8</jslt.version>
         <jython.version>2.7.1</jython.version>
         <jinja.version>2.5.1</jinja.version>
         <velocity.version>1.7</velocity.version>
@@ -85,7 +86,7 @@
             <dependency>
                 <groupId>org.springframework.kafka</groupId>
                 <artifactId>spring-kafka</artifactId>
-                <version>${spring.kafka.version}</version>
+                <version>${spring-kafka.version}</version>
             </dependency>
 
             <!--Swagger Dependencies -->
@@ -158,6 +159,11 @@
                 <artifactId>jinjava</artifactId>
                 <version>${jinja.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.schibsted.spt.data</groupId>
+                <artifactId>jslt</artifactId>
+                <version>${jslt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -297,26 +303,23 @@
                 <version>${netty-ssl}</version>
             </dependency>
 
-            <!-- Atomix -->
-            <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix</artifactId>
-                <version>${atomix.version}</version>
-            </dependency>
+            <!-- NATS -->
             <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix-raft</artifactId>
-                <version>${atomix.version}</version>
+                <groupId>io.nats</groupId>
+                <artifactId>jnats</artifactId>
+                <version>${nats.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix-primary-backup</artifactId>
-                <version>${atomix.version}</version>
+                <groupId>io.nats</groupId>
+                <artifactId>java-nats-streaming</artifactId>
+                <version>${nats.streaming.version}</version>
             </dependency>
+
+            <!-- Hazelcast -->
             <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix-gossip</artifactId>
-                <version>${atomix.version}</version>
+                <groupId>com.hazelcast</groupId>
+                <artifactId>hazelcast-all</artifactId>
+                <version>${hazelcast.version}</version>
             </dependency>
 
             <!-- Adaptors -->
@@ -397,130 +400,138 @@
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>processor-core</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-                <artifactId>atomix-lib</artifactId>
-                <version>${project.version}</version>
+                <artifactId>db-lib</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-                <artifactId>db-lib</artifactId>
-                <version>${project.version}</version>
+                <artifactId>rest-lib</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-                <artifactId>rest-lib</artifactId>
-                <version>${project.version}</version>
+                <artifactId>nats-lib</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>ssh-lib</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
+
             <!-- message-lib dependency -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>message-lib</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>dmaap-lib</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>grpc-lib</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>execution-service</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>workflow-service</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
 
-            <!--
-            <dependency>
-                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-                <artifactId>health-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            -->
-
             <!-- North Bound -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>configs-api</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>designer-api</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>resource-api</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>selfservice-api</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>application</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
 
             <!-- Functions -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>resource-resolution</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
+                <artifactId>nrm-restful</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>python-executor</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>ansible-awx-executor</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>netconf-executor</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>restconf-executor</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>cli-executor</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>config-snapshots</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>message-prioritizaion</artifactId>
-                <version>${project.version}</version>
+                <version>${ccsdk.cds.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>health-api</artifactId>
+                <version>${ccsdk.cds.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>health-api-common</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
 
             <!-- Diff capability providers for config-snapshots -->
@@ -537,24 +548,24 @@
 
             <!-- Controller Blueprints Application Dependency -->
             <dependency>
-               <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-               <artifactId>resource-dict</artifactId>
-               <version>${project.version}</version>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>resource-dict</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
-               <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-               <artifactId>blueprint-core</artifactId>
-               <version>${project.version}</version>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>blueprint-core</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
-               <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-               <artifactId>blueprint-proto</artifactId>
-               <version>${project.version}</version>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>blueprint-proto</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
             <dependency>
-               <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-               <artifactId>blueprint-validation</artifactId>
-               <version>${project.version}</version>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>blueprint-validation</artifactId>
+                <version>${ccsdk.cds.version}</version>
             </dependency>
 
             <!-- Database -->
@@ -584,6 +595,12 @@
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.nhaarman.mockitokotlin2</groupId>
+                <artifactId>mockito-kotlin</artifactId>
+                <version>2.2.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-test-junit</artifactId>
@@ -596,6 +613,7 @@
                 <version>${kotlin.couroutines.version}</version>
                 <scope>test</scope>
             </dependency>
+
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-testing</artifactId>
@@ -607,7 +625,7 @@
             <dependency>
                 <groupId>org.springframework.kafka</groupId>
                 <artifactId>spring-kafka-test</artifactId>
-                <version>${spring.kafka.version}</version>
+                <version>${spring-kafka.version}</version>
                 <scope>test</scope>
             </dependency>