azkaban-developers

diff --git a/azkaban-common/build.gradle b/azkaban-common/build.gradle
index 0bb8c07..d2e7adf 100644
--- a/azkaban-common/build.gradle
+++ b/azkaban-common/build.gradle
@@ -34,7 +34,7 @@ model {
 dependencies {
   compile project(':azkaban-spi')
 
-  compile('com.google.guava:guava:13.0.1')
+  compile('com.google.guava:guava:21.0')
   compile('commons-collections:commons-collections:3.2.2')
   compile('org.apache.commons:commons-dbcp2:2.1.1')
   compile('commons-dbutils:commons-dbutils:1.5')

diff --git a/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java b/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java
index bcb2ed4..d396560 100644
--- a/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java
+++ b/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java
@@ -328,8 +328,7 @@ public class JobTypeManager {
       if (jobType == null || jobType.length() == 0) {
         /* throw an exception when job name is null or empty */
         throw new JobExecutionException(String.format(
-            "The 'type' parameter for job[%s] is null or empty", jobProps,
-            logger));
+            "The 'type' parameter for job[%s] is null or empty", jobProps));
       }
 
       logger.info("Building " + jobType + " job executor. ");

diff --git a/azkaban-common/src/test/java/azkaban/trigger/MockTriggerLoader.java b/azkaban-common/src/test/java/azkaban/trigger/MockTriggerLoader.java
index 7127cec..3b91493 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/MockTriggerLoader.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/MockTriggerLoader.java
@@ -37,7 +37,7 @@ public class MockTriggerLoader implements TriggerLoader {
   @Override
   public synchronized void removeTrigger(Trigger s)
       throws TriggerLoaderException {
-    triggers.remove(s);
+    triggers.remove(s.getTriggerId());
   }
 
   @Override

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/FlowRunnerManager.java b/azkaban-exec-server/src/main/java/azkaban/execapp/FlowRunnerManager.java
index a9932fa..4cd61cb 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/FlowRunnerManager.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/FlowRunnerManager.java
@@ -447,8 +447,6 @@ public class FlowRunnerManager implements EventListener,
             } catch (IOException e) {
               logger.error(e);
             }
-
-            installedVersions.remove(versionKey);
           }
         }
       }

diff --git a/build.gradle b/build.gradle
index 05d8502..cc104d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
   }
   dependencies {
     classpath 'com.cinnober.gradle:semver-git:2.2.1'
-    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8'
+    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.10'
   }
 }
 
@@ -30,10 +30,6 @@ subprojects {
   // Set the same version for all sub-projects to root project version
   version = rootProject.version
 
-  configurations.errorprone {
-    resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.0.5'
-  }
-
   plugins.withType(JavaPlugin) {
     sourceCompatibility = JavaVersion.VERSION_1_8