[geode] branch feature/GEODE-4009 updated: Add HikariCP to be part of assembly

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

agingade pushed a commit to branch feature/GEODE-4009
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-4009 by this push:
     new 2843a86  Add HikariCP to be part of assembly
2843a86 is described below

commit 2843a8636577868731259c60d5d090beef5f0ade
Author: Anil <ag...@pivotal.io>
AuthorDate: Thu Dec 21 11:57:22 2017 -0800

    Add HikariCP to be part of assembly
---
 geode-assembly/build.gradle   | 5 ++++-
 geode-connectors/build.gradle | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 501b279..5bff01b 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -209,7 +209,10 @@ def cp = {
         it.contains('lucene-analyzers-phonetic') ||
 
         // dependencies from geode-protobuf
-        it.contains('protobuf-java')
+        it.contains('protobuf-java') ||
+
+        // dependencies from geode-connectors
+        it.contains('HikariCP')
       }
     }
   }.flatten().unique().join(' ')
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index 58f1d4a..3956179 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -18,7 +18,8 @@
 dependencies {
     compile project(':geode-core')
     compile project(':geode-common')
-    compile group: 'com.zaxxer', name: 'HikariCP', version: '2.7.4'
+    //compile group: 'com.zaxxer', name: 'HikariCP', version: '2.7.4'
+    compile group: 'com.zaxxer', name: 'HikariCP', version: project.'HikariCP.version'
 
     testCompile project(':geode-junit')
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].