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

Merge branch '3.5.x' 

Closes gh-47344
This commit is contained in:
Stéphane Nicoll 2025-09-29 09:46:15 +02:00
parent 52c55788a2 93c9413ac0
commit ae86895953
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
View File

@ -77,7 +77,9 @@ class ConventionsPluginTests {
out.println(" id 'org.springframework.boot.conventions'"); out.println(" id 'org.springframework.boot.conventions'");
out.println("}"); out.println("}");
out.println("version = '1.2.3'"); out.println("version = '1.2.3'");
out.println("java {");
out.println(" sourceCompatibility = '17'"); out.println(" sourceCompatibility = '17'");
out.println("}");
out.println("description 'Test project for manifest customization'"); out.println("description 'Test project for manifest customization'");
out.println("jar.archiveFileName = 'test.jar'"); out.println("jar.archiveFileName = 'test.jar'");
} }
@ -107,7 +109,9 @@ class ConventionsPluginTests {
out.println(" id 'org.springframework.boot.conventions'"); out.println(" id 'org.springframework.boot.conventions'");
out.println("}"); out.println("}");
out.println("version = '1.2.3'"); out.println("version = '1.2.3'");
out.println("java {");
out.println(" sourceCompatibility = '17'"); out.println(" sourceCompatibility = '17'");
out.println("}");
out.println("description 'Test'"); out.println("description 'Test'");
} }
runGradle("assemble"); runGradle("assemble");
@ -136,7 +140,9 @@ class ConventionsPluginTests {
out.println(" id 'org.springframework.boot.conventions'"); out.println(" id 'org.springframework.boot.conventions'");
out.println("}"); out.println("}");
out.println("version = '1.2.3'"); out.println("version = '1.2.3'");
out.println("java {");
out.println(" sourceCompatibility = '17'"); out.println(" sourceCompatibility = '17'");
out.println("}");
out.println("description 'Test'"); out.println("description 'Test'");
} }
runGradle("assemble"); runGradle("assemble");

3
documentation/spring-boot-docs/src/docs/antora/modules/tutorial/pages/first-application/index.adoc
View File

@ -180,7 +180,10 @@ apply plugin: 'io.spring.dependency-management'
group = 'com.example' group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
java {
sourceCompatibility = '17' sourceCompatibility = '17'
}
repositories { repositories {
mavenCentral() mavenCentral()