diff --git a/build.gradle b/build.gradle
index 4120aa35..ac496895 100755
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id 'nebula.netflixoss' version '2.2.9'
+  id 'nebula.netflixoss' version '3.1.2'
   id 'me.champeau.gradle.jmh' version '0.2.0'
 }
 
@@ -83,10 +83,6 @@ subprojects {
     sourceSets = [sourceSets.main]
   }
 
-  tasks.withType(Checkstyle) {
-    exclude "**/jsr166e/**"
-  }
-
   findbugs {
     ignoreFailures = false 
     sourceSets = [sourceSets.main]
@@ -107,10 +103,11 @@ subprojects {
     sourceSets = [sourceSets.main]
   }
 
-  tasks.withType(Pmd) {
-    exclude "**/jsr166e/**"
+  project.tasks.withType(Javadoc) {
+    if (JavaVersion.current().isJava8Compatible()) {
+      options.addStringOption('Xdoclint:none', '-quiet')
+    }
   }
-
   javadoc {
     options.addStringOption("sourcepath", "")
   }
diff --git a/codequality/pmd.xml b/codequality/pmd.xml
index c625ebdf..3eb925a5 100644
--- a/codequality/pmd.xml
+++ b/codequality/pmd.xml
@@ -13,6 +13,7 @@
     <exclude name="AddEmptyString"/>
     <exclude name="AppendCharacterWithChar"/>
     <exclude name="ArrayIsStoredDirectly"/>
+    <exclude name="AtLeastOneConstructor"/>
     <exclude name="AvoidCatchingGenericException"/>
     <exclude name="AvoidDuplicateLiterals"/>
     <exclude name="AvoidFieldNameMatchingMethodName"/>
@@ -48,6 +49,7 @@
     <exclude name="LoosePackageCoupling"/>
     <exclude name="MethodArgumentCouldBeFinal"/>
     <exclude name="MethodReturnsInternalArray"/>
+    <exclude name="ModifiedCyclomaticComplexity"/>
     <exclude name="NullAssignment"/>
     <exclude name="OnlyOneReturn"/>
     <exclude name="PrematureDeclaration"/>
@@ -56,9 +58,9 @@
     <exclude name="SimpleDateFormatNeedsLocale"/>
     <exclude name="SimplifyConditional"/>
     <exclude name="ShortClassName"/>
-    <exclude name="ShortMethod"/>
     <exclude name="ShortMethodName"/>
     <exclude name="ShortVariable"/>
+    <exclude name="StdCyclomaticComplexity"/>
     <exclude name="TooManyFields"/>
     <exclude name="TooManyMethods"/>
     <exclude name="UncommentedEmptyMethod"/>
@@ -68,5 +70,6 @@
     <exclude name="UseIndexOfChar"/>
     <exclude name="UselessParentheses"/>
     <exclude name="UseStringBufferForStringAppends"/>
+    <exclude name="UseVarargs"/>
   </rule>
 </ruleset>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 13f82bb5..f86e9285 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip