Merge pull request #29 from rspieldenner/docupdate

Update to latest plugins. Gradle 2.10.

CHANGELOG.md

@@ -1,3 +1,10 @@
+3.2.0 / 2015-12-22
+==================
+
+* Publishing plugins 3.0.2 - > 4.4.4
+* nebula.nebula-bintray 3.0.1 -> 3.1.0
+* nebula.nebula-release 2.2.7 -> 3.1.1
+
 3.1.1 / 2015-08-25
 ==================
 

README.md

@@ -6,14 +6,14 @@ Nebula Plugin Plugin
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nebula-plugins/nebula-plugin-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Apache 2.0](https://img.shields.io/github/license/nebula-plugins/nebula-plugin-plugin.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
-Plugin to establish conventions for a nebula-plugins plugin, e.g. publishing, licenses.
+Plugin to establish conventions for a nebula-plugins plugin, e.g. publishing, licenses. This plugin is used to help setup our other plugins. It can be used as an example of setting up similar conventions for an organization's gradle plugins.
 
 ![Yo Dawg](https://s3.amazonaws.com/uploads.hipchat.com/25234/334670/CgbXYbDuUzuV3JP/plugins.png)
 
 Conventions
 -----------
 * Defaults group to com.netflix.nebula
-* Applies nebula.maven-publishing
+* Applies nebula.maven-publish
 * Applies and configures nebula.nebula-release and nebula.nebula-bintray
 
 Usages
@@ -23,15 +23,15 @@ To apply this plugin if using Gradle 2.1 or newer
 
 
     plugins {
-      id 'nebula.plugin-plugin' version '3.1.1'
+      id 'nebula.plugin-plugin' version '3.2.0'
     }
 
 If using an older version of Gradle
 
     buildscript {
       repositories { jcenter() }
       dependencies {
-        classpath 'com.netflix.nebula:nebula-plugin-plugin:3.1.1'
+        classpath 'com.netflix.nebula:nebula-plugin-plugin:3.2.0'
       }
     }
 
@@ -50,6 +50,10 @@ Gradle Compatibility Tested
 | 2.4            | yes   |
 | 2.5            | yes   |
 | 2.6            | yes   |
+| 2.7            | yes   |
+| 2.8            | yes   |
+| 2.9            | yes   |
+| 2.10           | yes   |
 
 LICENSE
 =======

build.gradle

@@ -1,15 +1,21 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+}
+
 plugins {
     id 'groovy'
     id 'idea'
     id 'jacoco'
-    id 'nebula.maven-publishing' version '3.0.2'
-    id 'nebula.apache-license-pom' version '3.0.2'
-    id 'nebula.javadoc-jar' version '3.0.2'
-    id 'nebula.source-jar' version '3.0.2'
+    id 'nebula.maven-publish' version '4.4.4'
+    id 'nebula.maven-apache-license' version '4.4.4'
+    id 'nebula.javadoc-jar' version '4.4.4'
+    id 'nebula.source-jar' version '4.4.4'
     id 'nebula.info' version '3.0.3'
     id 'nebula.contacts' version '3.0.1'
-    id 'nebula.nebula-release' version '2.2.7'
-    id 'nebula.nebula-bintray' version '3.0.1'
+    id 'nebula.nebula-release' version '3.1.1'
+    id 'nebula.nebula-bintray' version '3.1.0'
     id 'com.gradle.plugin-publish' version '0.9.1'
     id 'com.github.kt3k.coveralls' version '2.4.0'
     id 'org.ysb33r.gradletest' version '0.5.4'
@@ -40,9 +46,9 @@ repositories {
 dependencies {
     compile localGroovy()
     compile gradleApi()
-    compile 'com.netflix.nebula:nebula-core:2.2.0'
-    compile 'com.netflix.nebula:nebula-bintray-plugin:3.0.1'
-    compile 'com.netflix.nebula:nebula-release-plugin:2.2.7'
+    compile 'com.netflix.nebula:nebula-core:3.0.1'
+    compile 'com.netflix.nebula:nebula-bintray-plugin:3.1.0'
+    compile 'com.netflix.nebula:nebula-release-plugin:3.1.1'
     compile 'org.ajoberstar:gradle-git' // using these but just want the version used by nebula-release-plugin
     testCompile 'org.ajoberstar:grgit'
     testCompile('com.netflix.nebula:nebula-test:4.0.0') {
@@ -77,8 +83,6 @@ pluginBundle {
 }
 
 // Wire up build and publishing process
-project.tasks.getByName('verifyReleaseStatus').actions.clear()
-project.tasks.getByName('verifySnapshotStatus').actions.clear()
 
 tasks.matching { it.name == 'bintrayUpload' || it.name == 'artifactoryPublish'}.all { Task task ->
     task.mustRunAfter('build')
@@ -118,7 +122,7 @@ if (project.hasProperty('release.travisci') && project.property('release.travisc
 }
 
 gradleTest {
-    versions '2.2.1', '2.3', '2.4', '2.5', '2.6'
+    versions '2.2.1', '2.3', '2.4', '2.5', '2.6', '2.7', '2.8', '2.9', '2.10'
 }
 
 gradleTest.dependsOn(jar)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Sep 15 13:44:19 PDT 2015
+#Tue Dec 22 15:57:34 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

gradlew

@@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 

src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy

@@ -40,9 +40,6 @@ class NebulaPluginPlugin implements Plugin<Project> {
             project.group = 'com.netflix.nebula'
         }
 
-        project.tasks.getByName('verifyReleaseStatus').actions.clear()
-        project.tasks.getByName('verifySnapshotStatus').actions.clear()
-
         project.tasks.matching { it.name == 'bintrayUpload' || it.name == 'artifactoryPublish'}.all { Task task ->
             task.mustRunAfter('build')
             project.rootProject.tasks.release.dependsOn(task)