spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x

Browse Source 
Closes gh-46254
This commit is contained in:
Andy Wilkinson
2025-07-02 20:31:39 +01:00
parent 1b7244b983 808d2e58b7
commit 3f4c870a13
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
settings.gradle
+1 -1
View File
@@ -19,7 +19,7 @@ pluginManagement {
repositories {
mavenCentral()
gradlePluginPortal()
spring.mavenRepositories();
spring.mavenRepositories()
}
resolutionStrategy {
eachPlugin {
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
import org.springframework.boot.buildpack.platform.build.PullPolicy;
import org.springframework.boot.buildpack.platform.build.PullPolicy
plugins {
id 'java'
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
+2 -2
View File
@@ -80,8 +80,8 @@ dependencies {
undertow("org.springframework.boot:spring-boot-starter-undertow")
}
def boolean isWindows() {
return File.separatorChar == '\\';
static boolean isWindows() {
return File.separatorChar == '\\'
}
["jetty", "tomcat", "undertow"].each { webServer ->
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle
+1 -1
View File
@@ -74,7 +74,7 @@ tasks.register("syncAntSources", Sync) {
tasks.register("antRun", JavaExec) {
workingDir = layout.buildDirectory.dir("ant")
dependsOn syncTestRepository, syncAntSources, configurations.antDependencies
classpath = configurations.antDependencies;
classpath = configurations.antDependencies
mainClass = "org.apache.tools.ant.launch.Launcher"
args = [ "clean", "build" ]
systemProperties = [