X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fblueprintsprocessor%2Fparent%2Fpom.xml;h=ce78c55fa72991f7f6a996924069c0b04bdcce61;hb=f946eae481bb4d37082218c64132a7099082bce5;hp=5caac2f69b4bec87aa2816bb8e8f603e096345d4;hpb=d57c3727ee2d02e2b2f4c899647d4d9de7e72b43;p=ccsdk%2Fcds.git

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 5caac2f69..ce78c55fa 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -33,17 +33,16 @@
 
     <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>
+        <error.catalog.version>${project.version}</error.catalog.version>
         <dmaap.client.version>1.1.5</dmaap.client.version>
-        <nats.version>2.6.6</nats.version>
-        <nats.streaming.version>2.2.3</nats.streaming.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>
@@ -57,14 +56,12 @@
         <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>
         <guava.version>27.0.1-jre</guava.version>
-        <jsoup.version>1.10.3</jsoup.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-compress-version>1.20</commons-compress-version>
         <commons-collections-version>3.2.2</commons-collections-version>
     </properties>
 
@@ -79,16 +76,10 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>${jsoup.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework.kafka</groupId>
                 <artifactId>spring-kafka</artifactId>
-                <version>${spring.kafka.version}</version>
+                <version>${spring-kafka.version}</version>
             </dependency>
 
             <!--Swagger Dependencies -->
@@ -130,11 +121,6 @@
             -->
 
             <!-- Common Utils Dependencies -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3-version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
@@ -146,15 +132,9 @@
                 <version>${commons-io-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity</artifactId>
-                <version>${velocity.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>${commons-compress-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.hubspot.jinjava</groupId>
@@ -253,47 +233,6 @@
                 <version>${kotlin.version}</version>
             </dependency>
 
-            <!-- GRPC Dependencies -->
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-core</artifactId>
-                <version>${grpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-netty</artifactId>
-                <version>${grpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-protobuf</artifactId>
-                <version>${grpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-stub</artifactId>
-                <version>${grpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-netty-shaded</artifactId>
-                <version>${grpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-grpclb</artifactId>
-                <version>${grpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>${protobuff.java.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java-util</artifactId>
-                <version>${protobuff.java.utils.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.marcoferrer.krotoplus</groupId>
                 <artifactId>kroto-plus-coroutines</artifactId>
@@ -317,26 +256,11 @@
                 <version>${nats.streaming.version}</version>
             </dependency>
 
-            <!-- Atomix -->
-            <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix</artifactId>
-                <version>${atomix.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix-raft</artifactId>
-                <version>${atomix.version}</version>
-            </dependency>
+            <!-- Hazelcast -->
             <dependency>
-                <groupId>io.atomix</groupId>
-                <artifactId>atomix-primary-backup</artifactId>
-                <version>${atomix.version}</version>
-            </dependency>
-            <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 -->
@@ -368,6 +292,30 @@
                 <version>${kafka.version}</version>
             </dependency>
 
+            <!-- Error Catalog -->
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.error.catalog</groupId>
+                <artifactId>error-catalog-core</artifactId>
+                <version>${error.catalog.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.error.catalog</groupId>
+                <artifactId>error-catalog-services</artifactId>
+                <version>${error.catalog.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <!-- SLI Version -->
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -419,11 +367,6 @@
                 <artifactId>processor-core</artifactId>
                 <version>${ccsdk.cds.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-                <artifactId>atomix-lib</artifactId>
-                <version>${ccsdk.cds.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
                 <artifactId>db-lib</artifactId>
@@ -505,6 +448,11 @@
                 <artifactId>resource-resolution</artifactId>
                 <version>${ccsdk.cds.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
+                <artifactId>restful-executor</artifactId>
+                <version>${ccsdk.cds.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
                 <artifactId>python-executor</artifactId>
@@ -631,21 +579,13 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-testing</artifactId>
-                <version>${grpc.version}</version>
-                <scope>test</scope>
-            </dependency>
-
             <!-- Spring Kafka -->
             <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>
-
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -774,6 +714,11 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.cds.error.catalog</groupId>
+            <artifactId>error-catalog-core</artifactId>
+        </dependency>
     </dependencies>
 
     <repositories>