From 38f71af7fff8fbef55c2a3fada0cfbebb12c4b14 Mon Sep 17 00:00:00 2001
From: Brian Harrington <brharrington@gmail.com>
Date: Mon, 14 Sep 2015 13:35:28 -0700
Subject: [PATCH] nebula.neflixoss-3.1.1

---
 build.gradle                             | 7 ++++++-
 codequality/pmd.xml                      | 8 ++++++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 spectator-ext-spark/build.gradle         | 9 +++++++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 22e810933..21739a754 100755
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-  id 'nebula.netflixoss' version '2.2.9'
+  id 'nebula.netflixoss' version '3.1.1'
   id 'me.champeau.gradle.jmh' version '0.2.0'
 }
 
@@ -17,6 +17,10 @@ allprojects {
   apply plugin: 'project-report'
   apply plugin: 'me.champeau.gradle.jmh'
   apply plugin: 'com.github.ben-manes.versions'
+
+  task wrapper(type: Wrapper) {
+    gradleVersion = '2.6'
+  }
 }
 
 subprojects {
@@ -96,6 +100,7 @@ subprojects {
   }
 
   pmd {
+    toolVersion = '5.3.3'
     ignoreFailures = false
     sourceSets = [sourceSets.main]
     ruleSets = []
diff --git a/codequality/pmd.xml b/codequality/pmd.xml
index e4528defd..25eb1bc81 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"/>
@@ -51,6 +52,7 @@
     <exclude name="LoosePackageCoupling"/>
     <exclude name="MethodArgumentCouldBeFinal"/>
     <exclude name="MethodReturnsInternalArray"/>
+    <exclude name="ModifiedCyclomaticComplexity"/>
     <exclude name="NullAssignment"/>
     <exclude name="OneDeclarationPerLine"/>
     <exclude name="OnlyOneReturn"/>
@@ -60,12 +62,13 @@
     <exclude name="SimpleDateFormatNeedsLocale"/>
     <exclude name="SimplifyConditional"/>
     <exclude name="ShortClassName"/>
-    <exclude name="ShortMethod"/>
+    <exclude name="ShortMethodName"/>
     <exclude name="ShortMethodName"/>
     <exclude name="ShortVariable"/>
+    <exclude name="StdCyclomaticComplexity"/>
     <exclude name="TooManyFields"/>
     <exclude name="TooManyMethods"/>
-    <exclude name="UncommentedEmptyMethod"/>
+    <exclude name="UncommentedEmptyMethodBody"/>
     <exclude name="UnusedPrivateMethod"/>
     <exclude name="UnnecessaryConstructor"/>
     <exclude name="UnnecessaryParentheses"/>
@@ -73,5 +76,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 583dd068c..9bd9206dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 19 00:23:55 PDT 2015
+#Mon Sep 14 13:02:36 PDT 2015
 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.6-bin.zip
diff --git a/spectator-ext-spark/build.gradle b/spectator-ext-spark/build.gradle
index ca6307a76..795b8eb0f 100755
--- a/spectator-ext-spark/build.gradle
+++ b/spectator-ext-spark/build.gradle
@@ -27,6 +27,11 @@ shadowJar {
   }
 }
 
-import nebula.plugin.publishing.component.CustomComponentPlugin
-CustomComponentPlugin.addArtifact(project, 'shadow', shadowJar)
+publishing {
+  publications {
+    nebula(MavenPublication) {
+      artifact shadowJar
+    }
+  }
+}