From 68b77999c87d7fba66a9e6553ef320d17a0e494b Mon Sep 17 00:00:00 2001 From: Sebastian Brandt Date: Fri, 4 Nov 2016 15:50:58 +0100 Subject: [PATCH 1/2] change for issue #587 --- .../mesos/elasticsearch/scheduler/CredentialFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/CredentialFactory.java b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/CredentialFactory.java index 392cc53f..ded8eec2 100644 --- a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/CredentialFactory.java +++ b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/CredentialFactory.java @@ -26,11 +26,11 @@ Protos.Credential.Builder getBuilder() { credentialBuilder.setPrincipal(principal); try { ByteString bytes = ByteString.readFrom(new FileInputStream(secretFilePath)); - credentialBuilder.setSecret(bytes); + credentialBuilder.setSecretBytes(bytes); } catch (IOException cause) { LOGGER.error("Error reading authentication secret from file: " + secretFilePath, cause); } } return credentialBuilder; } -} \ No newline at end of file +} From d9178ba6f3d880e7b288b894859ef50641703117 Mon Sep 17 00:00:00 2001 From: Sebastian Brandt Date: Fri, 4 Nov 2016 16:00:15 +0100 Subject: [PATCH 2/2] raised mesos version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 86abb856..6c4dca77 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { jsonVersion = "20160212" junitVersion = "4.12" log4jVersion = "1.2.17" - mesosVer = "0.25.0" + mesosVer = "0.28.2" minimesosVersion = "0.7.1" springBootVersion = "1.2.5.RELEASE" // Bumping SB version causes Jackson incompatabilities with Docker-Java unirestVersion = "1.4.8" @@ -61,7 +61,7 @@ buildscript { classpath "org.ajoberstar:grgit:1.3.0" classpath 'com.bmuschko:gradle-docker-plugin:2.4.1' classpath "com.github.zafarkhaja:java-semver:0.9.0" - classpath 'org.springframework.boot:spring-boot:1.2.5.RELEASE' + classpath 'org.springframework.boot:spring-boot:1.2.5.RELEASE' } }