diff --git a/build.gradle b/build.gradle
index ab966fb..662d6d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,8 @@ plugins {
     id 'nebula.plugin-plugin' version '4.18.0'
 }
 
+group 'com.netflix.nebula.core'
+
 description 'Common classes that plugins might need'
 
 contacts {
@@ -29,6 +31,7 @@ contacts {
 }
 
 dependencies {
+    compile 'com.google.guava:guava:latest.release'
     compile 'org.apache.commons:commons-lang3:latest.release'
     compile 'org.apache.httpcomponents:httpclient-cache:latest.release'
 }
diff --git a/dependencies.lock b/dependencies.lock
index 239025e..79b8e0e 100644
--- a/dependencies.lock
+++ b/dependencies.lock
@@ -1,5 +1,9 @@
 {
     "compile": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "org.apache.commons:commons-lang3": {
             "locked": "3.4",
             "requested": "latest.release"
@@ -10,6 +14,10 @@
         }
     },
     "compileClasspath": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "org.apache.commons:commons-lang3": {
             "locked": "3.4",
             "requested": "latest.release"
@@ -20,6 +28,10 @@
         }
     },
     "compileOnly": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "org.apache.commons:commons-lang3": {
             "locked": "3.4",
             "requested": "latest.release"
@@ -30,6 +42,10 @@
         }
     },
     "default": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "org.apache.commons:commons-lang3": {
             "locked": "3.4",
             "requested": "latest.release"
@@ -50,6 +66,10 @@
         }
     },
     "runtime": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "org.apache.commons:commons-lang3": {
             "locked": "3.4",
             "requested": "latest.release"
@@ -60,6 +80,10 @@
         }
     },
     "testCompile": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "com.netflix.nebula:nebula-test": {
             "locked": "4.2.0",
             "requested": "4.2.0"
@@ -74,6 +98,10 @@
         }
     },
     "testCompileClasspath": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "com.netflix.nebula:nebula-test": {
             "locked": "4.2.0",
             "requested": "4.2.0"
@@ -88,6 +116,10 @@
         }
     },
     "testCompileOnly": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "com.netflix.nebula:nebula-test": {
             "locked": "4.2.0",
             "requested": "4.2.0"
@@ -102,6 +134,10 @@
         }
     },
     "testRuntime": {
+        "com.google.guava:guava": {
+            "locked": "19.0",
+            "requested": "latest.release"
+        },
         "com.netflix.nebula:nebula-test": {
             "locked": "4.2.0",
             "requested": "4.2.0"
diff --git a/src/main/groovy/nebula/core/CopySpecHelper.groovy b/src/main/groovy/nebula/core/CopySpecHelper.groovy
index 12489af..cd9cac2 100644
--- a/src/main/groovy/nebula/core/CopySpecHelper.groovy
+++ b/src/main/groovy/nebula/core/CopySpecHelper.groovy
@@ -1,6 +1,6 @@
 package nebula.core
 
-import org.apache.commons.lang.reflect.FieldUtils
+import org.apache.commons.lang3.reflect.FieldUtils
 import org.gradle.api.Action
 import org.gradle.api.internal.file.CopyActionProcessingStreamAction
 import org.gradle.api.internal.file.copy.*
@@ -10,7 +10,6 @@ import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.internal.reflect.Instantiator
 
 class CopySpecHelper {
-
     static visitCopySpec(CopySpecInternal copySpec, Closure closure) {
         Instantiator instantiator = new DirectInstantiator()
         //FileSystem fileSystem = new GenericFileSystem(new EmptyChmod(), new FallbackStat(), new FallbackSymlink())
@@ -46,7 +45,7 @@ class CopySpecHelper {
     static CopySpecInternal findCopySpec(CopySpecInternal delegateCopySpec, Closure<Boolean> closure) {
         def foundCsi = null
         visitAllCopySpecs(delegateCopySpec) { CopySpecInternal csi, FileCopyDetailsInternal details ->
-            if(foundCsi==null && closure.call(csi, details)) {
+            if (foundCsi == null && closure.call(csi, details)) {
                 foundCsi = csi
             }
         }
diff --git a/src/main/groovy/nebula/core/GradleHelper.groovy b/src/main/groovy/nebula/core/GradleHelper.groovy
index a2261dd..c8323a3 100644
--- a/src/main/groovy/nebula/core/GradleHelper.groovy
+++ b/src/main/groovy/nebula/core/GradleHelper.groovy
@@ -14,8 +14,8 @@ import org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy.DefaultRe
 import org.gradle.api.internal.project.AbstractProject
 import org.gradle.internal.event.BroadcastDispatch
 import org.gradle.listener.ClosureBackedMethodInvocationDispatch
-import org.gradle.messaging.dispatch.Dispatch
-import org.gradle.messaging.dispatch.MethodInvocation
+import org.gradle.internal.dispatch.Dispatch
+import org.gradle.internal.dispatch.MethodInvocation
 
 /**
  * Utility methods to dive into Gradle internals, if needed.