diff options
| author |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-06-19 14:16:52 -0400 |
|---|---|---|
| committer | Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-06-19 14:16:52 -0400 |
| commit | 7022234a0bc0c399ea68547643c7972c85717c4b (patch) | |
| tree | 059a1e208384e88576b5cdaaf9aceb9c4a98f320 | |
| parent | 6fdd0b6f4b482422800b2ab18e16d2f0827934c1 (diff) | |
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>
| -rw-r--r-- | common/pom.xml | 20 | ||||
| -rw-r--r-- | pom.xml | 6 |
2 files changed, 15 insertions, 11 deletions
diff --git a/common/pom.xml b/common/pom.xml index 316cad1da7..4490b63c3b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,10 +20,6 @@ <dependencies> <dependency> - <groupId>hikari-cp</groupId> - <artifactId>hikari-cp</artifactId> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> @@ -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> @@ -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> |