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

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-34460
This commit is contained in:
Andy Wilkinson
2023-03-03 10:24:55 +00:00
parent f5a8a71a10 4f7e038f14
commit 03dd666818
25 changed files with 170 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-applyingJavaPluginCreatesBootJarTask.gradle Normal file
View File

@@ -0,0 +1,4 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-applyingJavaPluginCreatesBootRunTask.gradle Normal file
View File

@@ -0,0 +1,4 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-applyingJavaPluginCreatesDevelopmentOnlyConfiguration.gradle Normal file
View File

@@ -0,0 +1,12 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}
springBoot {
mainClass = "com.example.Main"
}
gradle.taskGraph.whenReady {
println "developmentOnly exists = ${configurations.findByName('developmentOnly') != null}"
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-errorMessageIsHelpfulWhenMainClassCannotBeResolved.gradle Normal file
View File

@@ -0,0 +1,4 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}

13
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksCanOverrideDefaultParametersCompilerFlag.gradle
View File

@@ -3,15 +3,18 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
springBoot {
mainClass = "com.example.Main"
}
tasks.withType(JavaCompile) {
options.compilerArgs = ['-Xlint:all']
}
task('javaCompileTasksCompilerArgs') {
doFirst {
tasks.withType(JavaCompile) {
println "${name} compiler args: ${options.compilerArgs}"
gradle.taskGraph.whenReady {
gradle.taskGraph.allTasks.each {
if (it instanceof JavaCompile) {
println "${it.name} compiler args: ${it.options.compilerArgs}"
}
}
}

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksUseParametersAndAdditionalCompilerFlags.gradle
View File

@@ -3,14 +3,18 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
springBoot {
mainClass = "com.example.Main"
}
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:all'
}
task('javaCompileTasksCompilerArgs') {
doFirst {
tasks.withType(JavaCompile) {
println "${name} compiler args: ${options.compilerArgs}"
gradle.taskGraph.whenReady {
gradle.taskGraph.allTasks.each {
if (it instanceof JavaCompile) {
println "${it.name} compiler args: ${it.options.compilerArgs}"
}
}
}

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksUseParametersCompilerFlagByDefault.gradle
View File

@@ -3,10 +3,14 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
task('javaCompileTasksCompilerArgs') {
doFirst {
tasks.withType(JavaCompile) {
println "${name} compiler args: ${options.compilerArgs}"
springBoot {
mainClass = "com.example.Main"
}
gradle.taskGraph.whenReady {
gradle.taskGraph.allTasks.each {
if (it instanceof JavaCompile) {
println "${it.name} compiler args: ${it.options.compilerArgs}"
}
}
}

16
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksUseUtf8Encoding.gradle Normal file
View File

@@ -0,0 +1,16 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}
springBoot {
mainClass = "com.example.Main"
}
gradle.taskGraph.whenReady {
gradle.taskGraph.allTasks.each {
if (it instanceof JavaCompile) {
println "${it.name} = ${it.options.encoding}"
}
}
}

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-noBootJarTaskWithoutJavaPluginApplied.gradle Normal file
View File

@@ -0,0 +1,3 @@
plugins {
id 'org.springframework.boot' version '{version}'
}

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-noBootRunTaskWithoutJavaPluginApplied.gradle Normal file
View File

@@ -0,0 +1,3 @@
plugins {
id 'org.springframework.boot' version '{version}'
}

16
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-productionRuntimeClasspathIsConfiguredWithAttributes.gradle Normal file
View File

@@ -0,0 +1,16 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}
springBoot {
mainClass = "com.example.Main"
}
gradle.taskGraph.whenReady {
def attributes = configurations.findByName('productionRuntimeClasspath').attributes
println "${attributes.keySet().size()} productionRuntimeClasspath attributes:"
attributes.keySet().each { attribute ->
println " ${attribute}: ${attributes.getAttribute(attribute)}"
}
}

19
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-productionRuntimeClasspathIsConfiguredWithResolvabilityAndConsumabilityThatMatchesRuntimeClasspath.gradle Normal file
View File

@@ -0,0 +1,19 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'java'
}
springBoot {
mainClass = "com.example.Main"
}
gradle.taskGraph.whenReady {
analyzeConfiguration('productionRuntimeClasspath')
analyzeConfiguration('runtimeClasspath')
}
def analyzeConfiguration(String configurationName) {
Configuration configuration = configurations.findByName(configurationName)
println "$configurationName canBeResolved: ${configuration.canBeResolved}"
println "$configurationName canBeConsumed: ${configuration.canBeConsumed}"
}

49
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.gradle
View File

@@ -1,49 +0,0 @@
plugins {
id 'org.springframework.boot' version '{version}'
}
if (project.hasProperty('applyJavaPlugin')) {
apply plugin: 'java'
}
task('taskExists') {
doFirst {
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
}
}
task('javaCompileEncoding') {
doFirst {
tasks.withType(JavaCompile) {
println "${name} = ${options.encoding}"
}
}
}
task('configurationExists') {
doFirst {
println "${configurationName} exists = ${configurations.findByName(configurationName) != null}"
}
}
task('configurationAttributes') {
doFirst {
def attributes = configurations.findByName(configurationName).attributes
println "${attributes.keySet().size()} ${configurationName} attributes:"
attributes.keySet().each { attribute ->
println " ${attribute}: ${attributes.getAttribute(attribute)}"
}
}
}
task('configurationResolvabilityAndConsumability') {
if (project.hasProperty("configurationName")) {
Configuration configuration = configurations.findByName(configurationName)
def canBeResolved = configuration.canBeResolved
def canBeConsumed = configuration.canBeConsumed
doFirst {
println "canBeResolved: ${canBeResolved}"
println "canBeConsumed: ${canBeConsumed}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle
View File

@@ -9,5 +9,5 @@ targetCompatibility = '1.8'
bootBuildImage {
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
pullPolicy = "IF_NOT_PRESENT"
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" ]
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle
View File

@@ -9,5 +9,5 @@ targetCompatibility = '1.8'
bootBuildImage {
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
pullPolicy = "IF_NOT_PRESENT"
buildpacks = [ "file://${projectDir}/buildpack/hello-world" ]
buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle
View File

@@ -9,5 +9,5 @@ targetCompatibility = '1.8'
bootBuildImage {
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
pullPolicy = "IF_NOT_PRESENT"
buildpacks = [ "file://${projectDir}/hello-world.tgz" ]
buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-whenAResolvableCopyOfAnUnresolvableConfigurationIsResolvedThenResolutionSucceeds.gradle
View File

@@ -7,10 +7,8 @@ bootJar {
mainClass = 'com.example.Application'
}
task resolveResolvableCopyOfUnresolvableConfiguration {
doFirst {
def copy = configurations.implementation.copyRecursive()
copy.canBeResolved = true
copy.resolve()
}
gradle.taskGraph.whenReady {
def copy = configurations.implementation.copyRecursive()
copy.canBeResolved = true
copy.resolve()
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests-applicationPluginJvmArgumentsAreUsed.gradle
View File

@@ -3,4 +3,6 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
applicationDefaultJvmArgs = ['-Dcom.foo=bar', '-Dcom.bar=baz']
application {
applicationDefaultJvmArgs = ['-Dcom.foo=bar', '-Dcom.bar=baz']
}

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests-applicationPluginMainClassNameIsNotUsedWhenItIsNull.gradle
View File

@@ -2,9 +2,3 @@ plugins {
id 'application'
id 'org.springframework.boot' version '{version}'
}
bootRun {
doFirst {
println "Main class name = ${bootRun.mainClass.get()}"
}
}