diff --git a/build.gradle b/build.gradle index f4765f28..2cc13805 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'nebula.netflixoss' version '3.6.4' + id 'nebula.netflixoss' version '5.0.0' } // Establish version and status @@ -16,6 +16,9 @@ subprojects { apply plugin: 'eclipse' apply plugin: 'nebula.compile-api' + sourceCompatibility = '1.8' + targetCompatibility = '1.8' + repositories { jcenter() } @@ -33,11 +36,15 @@ subprojects { testCompile "io.netty:netty-all:4.1.14.Final" } - project.tasks.withType(Javadoc) { - if (JavaVersion.current().isJava8Compatible()) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } + //project.tasks.withType(Javadoc) { + // if (JavaVersion.current().isJava8Compatible()) { + // //options.addStringOption('Xdoclint:none', '-quiet') + // options.addBooleanOption('Xdoclint:none', true) + // failOnError=false + // } + //} + + tasks.withType(Javadoc).all { enabled = false } } project(':dyno-core') { diff --git a/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java b/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java index 36fd1201..3d98b77f 100644 --- a/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java +++ b/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java @@ -44,6 +44,7 @@ public class Host implements Comparable { private final String datacenter; private String hashtag; private Status status = Status.Down; + private String password = null; public enum Status { Up, Down; @@ -106,6 +107,14 @@ public String getHostAddress() { return hostname; } + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + public String getHostName() { return hostname; } diff --git a/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java b/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java index 650285c0..597849dc 100644 --- a/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java +++ b/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java @@ -84,6 +84,13 @@ public JedisConnection(HostConnectionPool hostPool) { jedisClient = new Jedis(host.getHostAddress(), host.getPort(), hostPool.getConnectionTimeout(), hostPool.getSocketTimeout(), true, sslSocketFactory, new SSLParameters(), null); } + + String redisPassword = host.getPassword(); + if(null != jedisClient && null != redisPassword) { + if(!jedisClient.auth(redisPassword).equals("OK")) { + Logger.warn("Failed to set REDIS auth Password"); + } + } } @Override diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 736fb7d3..6b6ea3ab 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 52dd1f04..933b6473 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip