Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor Gradle plugin tests to use runner's plugin classpath

Browse Source 
Previously, each test build script used a property to configure its
classpath. This commit simplifies the tests by setting the classpath
once on the GradleRunner, thereby removing the need for it to be set in
each test script. It also allows, and, in fact, requires, the use of
the plugins block to apply the Boot plugin under test.

Unfortunately, this doesn't work for the tests for the reaction to the
Kotlin plugin. See the comments in the GradleBuild class and in each
KotlingPluginActionIntegrationTests build script.

See gh-14680
This commit is contained in:
jnizet
2018-10-02 21:08:22 +02:00
committed by Andy Wilkinson
parent 7e3bee35d7
commit c51449585e
81 changed files with 281 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/typical-plugins.gradle
View File

@@ -1,7 +1,5 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'org.springframework.boot' version '{version}'
}
// tag::apply[]

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/integrating-with-actuator/build-info-additional.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::additional[]
springBoot {
buildInfo {

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/integrating-with-actuator/build-info-basic.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::build-info[]
springBoot {
buildInfo()

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/integrating-with-actuator/build-info-custom-values.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::custom-values[]
springBoot {
buildInfo {

7
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/managing-dependencies/configure-bom.gradle
View File

@@ -1,11 +1,6 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'io.spring.dependency-management'

7
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/managing-dependencies/custom-version.gradle
View File

@@ -1,10 +1,7 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
dependencyManagement {

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/managing-dependencies/dependencies.gradle
View File

@@ -1,14 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
// tag::dependencies[]

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/application-plugin-main-class.gradle
View File

@@ -1,13 +1,9 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'application'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
apply plugin: 'application'
// tag::main-class[]
mainClassName = 'com.example.ExampleApplication'
// end::main-class[]

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-and-jar.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::enable-jar[]
jar {
enabled = true

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-custom-launch-script.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
bootJar {
mainClassName 'com.example.ExampleApplication'
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-include-launch-script.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
bootJar {
mainClassName 'com.example.ExampleApplication'
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-launch-script-properties.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
bootJar {
mainClassName 'com.example.ExampleApplication'
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-main-class.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::main-class[]
bootJar {
mainClassName = 'com.example.ExampleApplication'

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-manifest-main-class.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::main-class[]
bootJar {
manifest {

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-requires-unpack.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
repositories {
mavenCentral()
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-war-include-devtools.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'war'
bootWar {
mainClassName 'com.example.ExampleApplication'
classpath file('spring-boot-devtools-1.2.3.RELEASE.jar')

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-war-properties-launcher.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'war'
bootWar {
mainClassName 'com.example.ExampleApplication'
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/spring-boot-dsl-main-class.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::main-class[]
springBoot {
mainClassName = 'com.example.ExampleApplication'

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/war-container-dependency.gradle
View File

@@ -1,14 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
}
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
// tag::dependencies[]

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/publishing/maven-publish.gradle
View File

@@ -1,13 +1,9 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'maven-publish'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
apply plugin: 'maven-publish'
// tag::publishing[]
publishing {
publications {

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/publishing/maven.gradle
View File

@@ -1,13 +1,9 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'maven'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
apply plugin: 'maven'
// tag::upload[]
uploadBootArchives {
repositories {

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/running/application-plugin-main-class-name.gradle
View File

@@ -1,13 +1,9 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'application'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
apply plugin: 'application'
// tag::main-class[]
mainClassName = 'com.example.ExampleApplication'
// end::main-class[]

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/running/boot-run-main.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::main[]
bootRun {
main = 'com.example.ExampleApplication'

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/running/boot-run-source-resources.gradle
View File

@@ -1,12 +1,8 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
// tag::source-resources[]
bootRun {
sourceResources sourceSets.main

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/running/spring-boot-dsl-main-class-name.gradle
View File

@@ -1,13 +1,9 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'java'
id 'application'
id 'org.springframework.boot' version '{version}'
}
apply plugin: 'org.springframework.boot'
apply plugin: 'java'
apply plugin: 'application'
// tag::main-class[]
springBoot {
mainClassName = 'com.example.ExampleApplication'