From: Benjamin, Max (mb388a) <mb388a@us.att.com>
Date: Wed, 19 Jun 2019 18:16:52 +0000 (-0400)
Subject: changed hikari dependency to java based one
X-Git-Tag: 1.5.2~258
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F90177%2F1;p=so.git

changed hikari dependency to java based one

clojure dependency used by accident, replaced with HikariCP

Change-Id: I25b9f75d8be061fb3ac3d7737e9a58883a801425
Issue-ID: SO-2038
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---

diff --git a/common/pom.xml b/common/pom.xml
index 316cad1da7..4490b63c3b 100644
--- 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>
@@ -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>
@@ -189,6 +188,17 @@
     </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>
diff --git a/pom.xml b/pom.xml
index 7384c5b104..cd944781ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,6 @@
     <camunda.springboot.version>3.2.0</camunda.springboot.version>
     <format.skipValidate>false</format.skipValidate>
     <format.skipExecute>true</format.skipExecute>
-    <hikari.cp.version>2.7.1</hikari.cp.version>
     <io.fabric8.version>4.1.0</io.fabric8.version>
   </properties>
   <distributionManagement>
@@ -860,11 +859,6 @@
         <artifactId>snakeyaml</artifactId>
         <version>1.19</version>
       </dependency>
-      <dependency>
-        <groupId>hikari-cp</groupId>
-        <artifactId>hikari-cp</artifactId>
-        <version>${hikari.cp.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>