Merge "Add the check Fabric Config in"

[so.git] / common / pom.xml

diff --git a/common/pom.xml b/common/pom.xml
index 316cad1..2553038 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,10 +19,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>hikari-cp</groupId>
-      <artifactId>hikari-cp</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -115,7 +111,7 @@
     <dependency>
       <groupId>net.jodah</groupId>
       <artifactId>failsafe</artifactId>
-      <version>1.1.0</version>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
@@ -144,7 +140,10 @@
       <artifactId>reflections</artifactId>
       <version>0.9.11</version>
     </dependency>
-
+    <dependency>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
+    </dependency>
     <!-- CDS dependencies -->
     <dependency>
       <groupId>org.onap.ccsdk.cds.components</groupId>
@@ -187,8 +186,24 @@
       <version>${grpc.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.javatuples</groupId>
+      <artifactId>javatuples</artifactId>
+      <version>1.2</version>
+    </dependency>
 
   </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${springboot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <resources>
       <resource>