From 7c5042d07976acb27ebeb46cb33c09aecd5300f6 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Jan 2018 21:45:17 -0800 Subject: [PATCH] Don't run `apply-plugin` tests Stop running apply-plugin tests as part of the build since during a release the version number will change and the jar will not be available. Fixes gh-11857 --- .../src/main/asciidoc/getting-started.adoc | 4 ++-- .../gradle/getting-started/apply-plugin-milestone.gradle | 3 --- .../gradle/getting-started/apply-plugin-snapshot.gradle | 3 --- .../gradle/docs/GettingStartedDocumentationTests.java | 8 ++------ 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/getting-started.adoc index eacc5e9d56..4b8bfd8e99 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/getting-started.adoc @@ -14,13 +14,13 @@ endif::[] ifeval::["{version-type}" == "MILESTONE"] [source,groovy,indent=0,subs="verbatim,attributes"] ---- -include::../gradle/getting-started/apply-plugin-milestone.gradle[tags=!buildclasspath] +include::../gradle/getting-started/apply-plugin-milestone.gradle[] ---- endif::[] ifeval::["{version-type}" == "SNAPSHOT"] [source,groovy,indent=0,subs="verbatim,attributes"] ---- -include::../gradle/getting-started/apply-plugin-snapshot.gradle[tags=!buildclasspath] +include::../gradle/getting-started/apply-plugin-snapshot.gradle[] ---- endif::[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-milestone.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-milestone.gradle index aecd345938..0302ec6f4d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-milestone.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-milestone.gradle @@ -5,9 +5,6 @@ buildscript { dependencies { classpath 'org.springframework.boot:spring-boot-gradle-plugin:{version}' -// tag::buildclasspath[] - classpath files(pluginClasspath.split(',')) -// end::buildclasspath[] } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-snapshot.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-snapshot.gradle index b37d04520d..5872a19b77 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-snapshot.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-snapshot.gradle @@ -5,9 +5,6 @@ buildscript { dependencies { classpath 'org.springframework.boot:spring-boot-gradle-plugin:{version}' -// tag::buildclasspath[] - classpath files(pluginClasspath.split(',')) -// end::buildclasspath[] } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java index 4c05d9f646..412b8fe1f2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java @@ -31,12 +31,8 @@ public class GettingStartedDocumentationTests { @Rule public GradleBuild gradleBuild = new GradleBuild(); - @Test - public void applyPluginSnapshotExampleEvaluatesSuccessfully() { - this.gradleBuild - .script("src/main/gradle/getting-started/apply-plugin-snapshot.gradle") - .build(); - } + // NOTE: We can't run any `apply-plugin` tests because during a release the + // jar won't be there @Test public void typicalPluginsAppliesExceptedPlugins() {