From b1c0a7cda486e4f745b4233715efb8c0dc2814df Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 19 Mar 2015 14:22:31 +0000
Subject: [PATCH] =?UTF-8?q?Upgrade=20Gradle=20plugin=E2=80=99s=20ID=20so?=
 =?UTF-8?q?=20it=E2=80=99s=20suitable=20for=20the=20Plugin=20Portal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Gradle’s plugin portal requires each plugin’s ID to be in a namespace.
Our existing ID, spring-boot, does not meet this requirement. This
commit changes the plugin’s ID to org.springframework.boot.spring-boot.
Note that, as is recommended [1], the plugin’s ID does not include
“gradle”.

See gh-1567

[1] http://plugins.gradle.org/submit
---
 spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc    | 2 +-
 spring-boot-docs/src/main/asciidoc/getting-started.adoc       | 2 +-
 spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc     | 2 +-
 .../src/test/resources/boot-run-resources/build.gradle        | 2 +-
 .../src/test/resources/classifier-extension.gradle            | 2 +-
 .../src/test/resources/classifier.gradle                      | 2 +-
 .../src/test/resources/flatdir.gradle                         | 2 +-
 .../src/test/resources/install-app.gradle                     | 2 +-
 .../src/test/resources/installer.gradle                       | 4 ++--
 .../src/test/resources/main-in-run.gradle                     | 2 +-
 .../multi-project-common-file-dependency/build.gradle         | 2 +-
 .../multi-project-runtime-project-dependency/build.gradle     | 2 +-
 .../multi-project-transitive-file-dependency/build.gradle     | 2 +-
 .../spring-boot-gradle-tests/src/test/resources/nojar.gradle  | 2 +-
 .../src/test/resources/repackage.gradle                       | 2 +-
 .../src/test/resources/spring-loaded-jvm-args/build.gradle    | 2 +-
 .../src/test/resources/spring-loaded-old-gradle/build.gradle  | 2 +-
 .../src/test/resources/starter-dependencies.gradle            | 2 +-
 .../src/test/resources/war-packaging.gradle                   | 4 ++--
 spring-boot-samples/spring-boot-sample-actuator/build.gradle  | 2 +-
 spring-boot-samples/spring-boot-sample-profile/build.gradle   | 2 +-
 spring-boot-samples/spring-boot-sample-simple/build.gradle    | 2 +-
 .../spring-boot-sample-web-static/build.gradle                | 2 +-
 spring-boot-samples/spring-boot-sample-web-ui/build.gradle    | 2 +-
 ...erties => org.springframework.boot.spring-boot.properties} | 0
 25 files changed, 26 insertions(+), 26 deletions(-)
 rename spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/{spring-boot.properties => org.springframework.boot.spring-boot.properties} (100%)

diff --git a/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc b/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
index 7363595a08..c7a58822cb 100644
--- a/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
+++ b/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
@@ -182,7 +182,7 @@ the `spring-boot` plugin:
 			classpath("org.springframework.boot:spring-boot-gradle-plugin:{spring-boot-version}")
 		}
 	}
-	apply plugin: 'spring-boot'
+	apply plugin: 'org.springframework.boot.spring-boot'
 ----
 
 If you are using a milestone or snapshot release you will also need to add appropriate
diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index 31bcab2dfe..027d93f215 100644
--- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -235,7 +235,7 @@ endif::release[]
 	}
 
 	apply plugin: 'java'
-	apply plugin: 'spring-boot'
+	apply plugin: 'org.springframework.boot.spring-boot'
 
 	jar {
 		baseName = 'myproject'
diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index 7da07f0ae7..9e522e1384 100644
--- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -170,7 +170,7 @@ managed by Spring Boot:
 	}
 
 	apply plugin: 'java'
-	apply plugin: 'spring-boot'
+	apply plugin: 'org.springframework.boot.spring-boot'
 
 	repositories { jcenter() }
 	dependencies {
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle
index b5b1eaa5e2..6ab89e33f4 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 apply plugin: 'java'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 repositories {
 	mavenLocal()
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle
index da980ba30f..fac7b10614 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle
@@ -9,7 +9,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 jar {
 	baseName =  'classifier-extension'
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle
index e77c5dab3a..bba536112c 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle
@@ -9,7 +9,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 jar {
 	baseName =  'classifier'
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle
index 7f4bdde011..16f41103cc 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle
@@ -7,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 group = 'flatdir'
 version = '0.0.0'
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle
index fce05a8137..d7246f6d3c 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle
@@ -9,7 +9,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 group = 'installer'
 version = '0.0.0'
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle
index bc24c4b133..618b5c9db9 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle
@@ -9,7 +9,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 group = 'installer'
 version = '0.0.0'
@@ -17,7 +17,7 @@ version = '0.0.0'
 install {
     repositories.mavenInstaller {
         pom.project {
-          parent { 
+          parent {
             groupId 'org.springframework.boot'
             artifactId 'spring-boot-starter-parent'
             version "${project.bootVersion}"
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle
index a0a7b94c54..2b275bcd63 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle
@@ -9,7 +9,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 group = 'installer'
 version = '0.0.0'
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle
index 887ea90698..941f4f60a7 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle
@@ -15,7 +15,7 @@ subprojects {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 repositories {
 	mavenLocal()
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle
index fe60f4f57e..f15757fc68 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 project(':projectA') {
-	apply plugin: 'spring-boot'
+	apply plugin: 'org.springframework.boot.spring-boot'
 	repositories {
 		mavenLocal()
 	}
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle
index 87ef48932c..589af57c8e 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 project('main') {
-	apply plugin: 'spring-boot'
+	apply plugin: 'org.springframework.boot.spring-boot'
 	apply plugin: 'java'
 
 	repositories {
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle
index 045a589f75..f191635e0f 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle
@@ -7,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 group = 'nojar'
 version = '0.0.0'
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle
index 439ef9e485..f9ae02cd9a 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle
@@ -12,7 +12,7 @@ repositories {
 	mavenCentral()
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 apply plugin: 'java'
 
 dependencies {
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
index 7cc675f6ab..b186345410 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 apply plugin: 'java'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 repositories {
 	mavenLocal()
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle
index 70d15523ad..2a69a3a669 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 apply plugin: 'java'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 repositories {
 	mavenLocal()
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle
index 36e51e750b..65d99270a6 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle
@@ -22,7 +22,7 @@ dependencies {
 	springBootStarter "org.springframework.boot:${project.starter}:${project.bootVersion}"
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 task checkCommonsLogging {
 	doFirst {
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle
index 9ff8591d00..33c0018c27 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle
@@ -14,10 +14,10 @@ repositories {
 	mavenCentral()
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 apply plugin: 'war'
 
-dependencies {	
+dependencies {
 	compile 'org.springframework.boot:spring-boot-starter-freemarker'
 	providedRuntime "org.springframework.boot:spring-boot-starter-$servletContainer"
 }
diff --git a/spring-boot-samples/spring-boot-sample-actuator/build.gradle b/spring-boot-samples/spring-boot-sample-actuator/build.gradle
index cabe144fb9..780ea12a4e 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-actuator/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 jar {
 	baseName = 'spring-boot-sample-actuator'
diff --git a/spring-boot-samples/spring-boot-sample-profile/build.gradle b/spring-boot-samples/spring-boot-sample-profile/build.gradle
index d685fb1657..8aa639eee8 100644
--- a/spring-boot-samples/spring-boot-sample-profile/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-profile/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 jar {
 	baseName = 'spring-boot-sample-profile'
diff --git a/spring-boot-samples/spring-boot-sample-simple/build.gradle b/spring-boot-samples/spring-boot-sample-simple/build.gradle
index 0e77a10214..7e0789c442 100644
--- a/spring-boot-samples/spring-boot-sample-simple/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-simple/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 jar {
 	baseName = 'spring-boot-sample-simple'
diff --git a/spring-boot-samples/spring-boot-sample-web-static/build.gradle b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
index ab834b389d..0d967b545d 100644
--- a/spring-boot-samples/spring-boot-sample-web-static/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 apply plugin: 'war'
 
 mainClassName = "sample.ui.SampleWebStaticApplication"
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
index c2514582f1..3a3365a208 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
@@ -21,7 +21,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot.spring-boot'
 
 mainClassName = "sample.ui.SampleWebUiApplication"
 
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties b/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.boot.spring-boot.properties
similarity index 100%
rename from spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.boot.spring-boot.properties