Merge branch 'master' into code_polish

Author: gkorland

.circleci/config.yml

@@ -2,15 +2,14 @@
 #
 # Check https://circleci.com/docs/2.0/language-java/ for more details
 #
-version: 2
+version: 2.1
+
 jobs:
   build:
     docker:
       - image: circleci/openjdk:8u171-jdk
-      
-      - image: redisai/redisai:edge
-        port: 6379:6379
-      
+      - image: redislabs/redisai:edge-cpu-bionic
+
     working_directory: ~/repo
 
     environment:
@@ -34,14 +33,14 @@ jobs:
           paths:
             - ~/.m2
           key: v1-dependencies-{{ checksum "pom.xml" }}
-        
+
       # validate code format
       - run: mvn git-code-format:validate-code-format -Dgcf.globPattern=**/*
       # run tests!
       - run: mvn integration-test
-      - run: mvn cobertura:cobertura          
-      - run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}  
-              
+      - run: mvn cobertura:cobertura
+      - run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
+
       #- run: mvn -s .circleci.settings.xml -DskipTests deploy
 workflows:
   version: 2

pom.xml

@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>3.5.2</version>
+			<version>3.6.0</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>