Skip to content

Commit

Permalink
Refactor Gradle plugin tests to use runner's plugin classpath
Browse files Browse the repository at this point in the history
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 spring-projectsgh-14680
  • Loading branch information
jnizet authored and wilkinsona committed Oct 4, 2018
1 parent 7e3bee3 commit c514495
Show file tree
Hide file tree
Showing 81 changed files with 281 additions and 545 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
buildscript {
dependencies {
classpath files(pluginClasspath.split(','))
}
plugins {
id 'org.springframework.boot' version '{version}'
}

// tag::apply[]
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
Original file line number Diff line number Diff line change
@@ -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[]
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Loading

0 comments on commit c514495

Please sign in to comment.