KNL-1392 Upgrade hikarcp to 2.4.1

yuyilin · Nov 3, 2015 · 1c68f23 · 1c68f23
1 parent 84bda38
commit 1c68f23
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/kernel/api/pom.xml b/kernel/api/pom.xml
@@ -54,12 +54,6 @@
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP-java6</artifactId>
-    </dependency>
-    -->
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>

diff --git a/kernel/deploy/shared/pom.xml b/kernel/deploy/shared/pom.xml
@@ -261,13 +261,6 @@
           <artifactId>HikariCP</artifactId>
           <scope>compile</scope>
         </dependency>
-        <!--
-        <dependency>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP-java6</artifactId>
-          <scope>compile</scope>
-        </dependency> 
-        -->
         <dependency>
             <groupId>org.mnode.ical4j</groupId>
             <artifactId>ical4j</artifactId>

diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -365,13 +365,6 @@
       <artifactId>HikariCP</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP-java6</artifactId>
-      <scope>test</scope>
-    </dependency>
-    -->
   </dependencies>
 
   <profiles>

diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -132,17 +132,9 @@
       <dependency>
         <groupId>com.zaxxer</groupId>
         <artifactId>HikariCP</artifactId>
-        <version>2.3.7</version>
+        <version>2.4.1</version>
         <scope>compile</scope>
       </dependency>
-      <!--
-      <dependency>
-        <groupId>com.zaxxer</groupId>
-        <artifactId>HikariCP-java6</artifactId>
-        <version>2.3.2</version>
-        <scope>provided</scope>
-      </dependency>
-      -->
     </dependencies>
   </dependencyManagement>