Merge branch '3.1.x' into 3.2.x

Closes gh-40605

Author: mhalbritter

spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java

@@ -165,7 +165,7 @@ private void projectGenerationOptions() {
 			this.packaging = option(Arrays.asList("packaging", "p"), "Project packaging (for example 'jar')")
 				.withRequiredArg();
 			this.build = option("build", "Build system to use (for example 'maven' or 'gradle')").withRequiredArg()
-				.defaultsTo("maven");
+				.defaultsTo("gradle");
 			this.format = option("format", "Format of the generated content (for example 'build' for a build file, "
 					+ "'project' for a project archive)")
 				.withRequiredArg()

spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java

@@ -344,7 +344,7 @@ void overwriteFileInArchive(@TempDir File tempDir) throws Exception {
 	void parseTypeOnly() throws Exception {
 		this.handler.disableProjectGeneration();
 		this.command.run("-t=ant-project");
-		assertThat(this.handler.lastRequest.getBuild()).isEqualTo("maven");
+		assertThat(this.handler.lastRequest.getBuild()).isEqualTo("gradle");
 		assertThat(this.handler.lastRequest.getFormat()).isEqualTo("project");
 		assertThat(this.handler.lastRequest.isDetectType()).isFalse();
 		assertThat(this.handler.lastRequest.getType()).isEqualTo("ant-project");
@@ -364,7 +364,7 @@ void parseBuildOnly() throws Exception {
 	void parseFormatOnly() throws Exception {
 		this.handler.disableProjectGeneration();
 		this.command.run("--format=web");
-		assertThat(this.handler.lastRequest.getBuild()).isEqualTo("maven");
+		assertThat(this.handler.lastRequest.getBuild()).isEqualTo("gradle");
 		assertThat(this.handler.lastRequest.getFormat()).isEqualTo("web");
 		assertThat(this.handler.lastRequest.isDetectType()).isTrue();
 		assertThat(this.handler.lastRequest.getType()).isNull();