From 4452bb1873cb28762cea750e67c9f802561fc1b4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 20 Apr 2015 13:51:44 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Upgrade=20Gradle=20plugin=E2=80=99s?= =?UTF-8?q?=20ID=20so=20it=E2=80=99s=20suitable=20for=20the=20Plugin=20Por?= =?UTF-8?q?tal"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b1c0a7cda486e4f745b4233715efb8c0dc2814df. The plugin publishing process has moved to a new plugin-based approach that brings with it some significant limitations: - There's no staging to allow the promotion of good release builds - There's no easy way to upload an existing artifact - There's no control over the published pom. The risk brought by these limitations, particularly the first, are too great so we will no be publishing the Boot plugin to the Portal until they're resolved. Changing the plugin's ID was a breaking change that would require users to do some work when they upgrade to Boot 1.3. The ID of the plugin was changed purely so that it met the Portal's requirements. Given that the plugin will not be published to the Portal for the foreseaable future there's no need for us to inflict a breaking change on people when there will be no benefit. See gh-1567 --- 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 +- ...ork.boot.spring-boot.properties => 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/{org.springframework.boot.spring-boot.properties => 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 536700a63c..16092882a2 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: 'org.springframework.boot.spring-boot' + apply plugin: '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 027d93f215..31bcab2dfe 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: 'org.springframework.boot.spring-boot' + apply plugin: '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 b9cf076bdf..8c501178bc 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: 'org.springframework.boot.spring-boot' + apply plugin: '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 6ab89e33f4..b5b1eaa5e2 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 fac7b10614..da980ba30f 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 bba536112c..e77c5dab3a 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 16f41103cc..7f4bdde011 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 d7246f6d3c..fce05a8137 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 618b5c9db9..bc24c4b133 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 2b275bcd63..a0a7b94c54 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 941f4f60a7..887ea90698 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 f15757fc68..fe60f4f57e 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: 'org.springframework.boot.spring-boot' + apply plugin: '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 589af57c8e..87ef48932c 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: 'org.springframework.boot.spring-boot' + apply plugin: '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 f191635e0f..045a589f75 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 f9ae02cd9a..439ef9e485 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 b186345410..7cc675f6ab 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 2a69a3a669..70d15523ad 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 65d99270a6..36e51e750b 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 33c0018c27..9ff8591d00 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 780ea12a4e..cabe144fb9 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 8aa639eee8..d685fb1657 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 7e0789c442..0e77a10214 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 0d967b545d..ab834b389d 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: 'org.springframework.boot.spring-boot' +apply plugin: '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 3a3365a208..c2514582f1 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: 'org.springframework.boot.spring-boot' +apply plugin: 'spring-boot' mainClassName = "sample.ui.SampleWebUiApplication" diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.boot.spring-boot.properties b/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties similarity index 100% rename from spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.boot.spring-boot.properties rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties