root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x 

Closes gh-37173
This commit is contained in:
Andy Wilkinson 2023-09-01 14:17:40 +01:00
parent 71ed31343c 49cf62d97c
commit 3ab1dfb9dc
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@ -58,7 +58,7 @@ gradlePlugin {
} }
task preparePluginValidationClasses(type: Copy) { task preparePluginValidationClasses(type: Copy) {
destinationDir = file("$buildDir/classes/java/pluginValidation") destinationDir = layout.buildDirectory.dir("classes/java/pluginValidation").get().asFile
from(sourceSets.main.output.classesDirs) { from(sourceSets.main.output.classesDirs) {
exclude "**/CreateBootStartScripts.class" exclude "**/CreateBootStartScripts.class"
} }

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.gradle.plugin; package org.springframework.boot.gradle.plugin;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.StringWriter; import java.io.StringWriter;
@ -79,7 +78,7 @@ final class ApplicationPluginAction implements PluginApplicationAction {
} }
}); });
createStartScripts.getConventionMapping() createStartScripts.getConventionMapping()
.map("outputDir", () -> new File(project.getBuildDir(), "bootScripts")); .map("outputDir", () -> project.getLayout().getBuildDirectory().dir("bootScripts").get().getAsFile());
createStartScripts.getConventionMapping().map("applicationName", javaApplication::getApplicationName); createStartScripts.getConventionMapping().map("applicationName", javaApplication::getApplicationName);
createStartScripts.getConventionMapping().map("defaultJvmOpts", javaApplication::getApplicationDefaultJvmArgs); createStartScripts.getConventionMapping().map("defaultJvmOpts", javaApplication::getApplicationDefaultJvmArgs);
} }

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

@ -15,7 +15,7 @@ dependencies {
task explode(type: Sync) { task explode(type: Sync) {
dependsOn(bootJar) dependsOn(bootJar)
destinationDir = file("$buildDir/exploded") destinationDir = layout.buildDirectory.dir("exploded").get().asFile
from zipTree(files(bootJar).singleFile) from zipTree(files(bootJar).singleFile)
} }

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

@ -14,7 +14,7 @@ version = '1.0'
uploadBootArchives { uploadBootArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
repository(url: "file:${buildDir}/repo") repository(url: "file:${layout.buildDirectory.dir("repo").get().asFile}")
} }
} }
} }

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

@ -14,7 +14,7 @@ version = '1.0'
uploadBootArchives { uploadBootArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
repository(url: "file:${buildDir}/repo") repository(url: "file:${layout.buildDirectory.dir("repo").get().asFile}")
} }
} }
} }

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

@ -14,7 +14,7 @@ version = '1.0'
publishing { publishing {
repositories { repositories {
maven { maven {
url "${buildDir}/repo" url = layout.buildDirectory.dir("repo")
} }
} }
publications { publications {

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

@ -14,7 +14,7 @@ version = '1.0'
publishing { publishing {
repositories { repositories {
maven { maven {
url "${buildDir}/repo" url = layout.buildDirectory.dir("repo")
} }
} }
publications { publications {