Merge pull request #589 from sebbrandt87/feature/credentialsChange

change for issue #587
mesos · Feb 19, 2017 · a1c1b7f · a1c1b7f
2 parents 3001644 + ba8edc4
commit a1c1b7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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.10.2"
     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'
   }
 }
 

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
@@ -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;
     }
-}
+}