X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fcontrollerblueprints%2Fparent%2Fpom.xml;h=ea0f4adb9f4025bfa24d876fa3a7e85f06a9c4ec;hb=c65d8743072d10e7ec426d145adebcd8557212ee;hp=9ba4a2d40b2a50883b08d0681e87a69d87576eef;hpb=2a1364a0df3906ec6810187d308d876eb71a501a;p=ccsdk%2Fcds.git

diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 9ba4a2d40..ea0f4adb9 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -2,7 +2,7 @@
 <!--
   ~ Copyright © 2017-2018 AT&T Intellectual Property.
   ~
-  ~ Modifications Copyright © 2018 IBM.
+  ~ Modifications Copyright © 2018 - 2019 IBM, Bell Canada
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,30 +19,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.ccsdk.apps</groupId>
+        <groupId>org.onap.ccsdk.cds</groupId>
         <artifactId>controllerblueprints</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.6.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+    <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
     <artifactId>parent</artifactId>
     <name>Controller Blueprints Parent</name>
     <packaging>pom</packaging>
     <properties>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
-        <spring.version>5.1.5.RELEASE</spring.version>
-        <kotlin.version>1.3.21</kotlin.version>
-        <kotlin.maven.version>1.3.21</kotlin.maven.version>
-        <kotlin.couroutines.version>1.1.1</kotlin.couroutines.version>
-        <grpc.version>1.18.0</grpc.version>
-        <protobuff.java.utils.version>3.6.1</protobuff.java.utils.version>
         <eelf.version>1.0.0</eelf.version>
         <guava.version>27.0.1-jre</guava.version>
         <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>
         <powermock.version>1.7.4</powermock.version>
-        <mockk.version>1.9</mockk.version>
+        <jinja.version>2.5.1</jinja.version>
+        <velocity.version>1.7</velocity.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -56,14 +49,15 @@
             </dependency>
 
             <dependency>
-                <groupId>com.att.eelf</groupId>
-                <artifactId>eelf-core</artifactId>
-                <version>${eelf.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-slf4j</artifactId>
-                <version>${onap.logger.slf4j}</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-logging</artifactId>
+                <version>${spring.boot.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!--Swagger Dependencies -->
@@ -71,6 +65,12 @@
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger2</artifactId>
                 <version>${springfox.swagger2.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
@@ -93,15 +93,15 @@
                 <artifactId>commons-io</artifactId>
                 <version>2.6</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-compress</artifactId>
-                <version>1.15</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
-                <version>1.7</version>
+                <version>${velocity.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.hubspot.jinjava</groupId>
+                <artifactId>jinjava</artifactId>
+                <version>${jinja.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
@@ -211,37 +211,27 @@
 
             <!-- Application Components -->
             <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+                <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
                 <artifactId>blueprint-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+                <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
                 <artifactId>resource-dict</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>db-resources</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+                <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
                 <artifactId>blueprint-validation</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>blueprint-scripts</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+                <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
                 <artifactId>service</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+                <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
                 <artifactId>application</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -281,14 +271,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>com.att.eelf</groupId>
-            <artifactId>eelf-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.logging-analytics</groupId>
-            <artifactId>logging-slf4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -301,13 +283,15 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -316,6 +300,12 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>