Merge branch '2.3.x' into 2.4.x

Closes gh-24643

spring-boot-project/spring-boot-cli/samples/http.groovy

@@ -7,7 +7,7 @@ import groovyx.net.http.*
 class Example implements CommandLineRunner {
 
 	@Autowired
-	ApplicationContext context;
+	ApplicationContext context
 
 	@RequestMapping("/")
 	@ResponseBody
@@ -16,7 +16,7 @@ class Example implements CommandLineRunner {
 	}
 
 	void run(String... args) {
-		def port = context.webServer.port;
+		def port = context.webServer.port
 		def world = new RESTClient("http://localhost:" + port).get(path:"/").data.text
 		print "Hello " + world
 	}

spring-boot-project/spring-boot-cli/samples/integration.groovy

@@ -5,11 +5,11 @@ package org.test
 class SpringIntegrationExample implements CommandLineRunner {
 
 	@Autowired
-	private ApplicationContext context;
+	private ApplicationContext context
 
 	@Bean
 	DirectChannel input() {
-		new DirectChannel();
+		new DirectChannel()
 	}
 
 	@Override

spring-boot-project/spring-boot-cli/samples/template.groovy

@@ -1,6 +1,6 @@
 package org.test
 
-import static org.springframework.boot.groovy.GroovyTemplate.*;
+import static org.springframework.boot.groovy.GroovyTemplate.*
 
 @Component
 class Example implements CommandLineRunner {

spring-boot-project/spring-boot-cli/samples/ui.groovy

@@ -7,7 +7,7 @@ class Example {
 	@RequestMapping("/")
 	public String helloWorld(Map<String,Object> model) {
 		model.putAll([title: "My Page", date: new Date(), message: "Hello World"])
-		return "home";
+		return "home"
 	}
 }
 

spring-boot-project/spring-boot-cli/samples/web.groovy

@@ -2,12 +2,12 @@
 class Example {
 
 	@Autowired
-	private MyService myService;
+	private MyService myService
 
 	@RequestMapping("/")
 	@ResponseBody
 	public String helloWorld() {
-		return myService.sayWorld();
+		return myService.sayWorld()
 	}
 
 }
@@ -16,6 +16,6 @@ class Example {
 class MyService {
 
 	public String sayWorld() {
-		return "World!";
+		return "World!"
 	}
 }

spring-boot-project/spring-boot-cli/src/test/resources/classloader-test-app.groovy

@@ -6,7 +6,7 @@ public class Test implements CommandLineRunner {
 	public void run(String... args) throws Exception {
 		println "HasClasses-" + ClassUtils.isPresent("missing", null) + "-" +
 			ClassUtils.isPresent("org.springframework.boot.SpringApplication", null) + "-" +
-			ClassUtils.isPresent(args[0], null);
+			ClassUtils.isPresent(args[0], null)
 	}
 
 }

spring-boot-project/spring-boot-cli/src/test/resources/scripts/command.groovy

@@ -16,7 +16,7 @@
 
 package org.test.command
 
-import java.util.Collection;
+import java.util.Collection
 
 class TestCommand implements Command {
 

spring-boot-project/spring-boot-cli/test-samples/integration_auto.groovy

@@ -5,7 +5,7 @@ package com.example
 class RestTests {
 
 	@Autowired
-	TestRestTemplate testRestTemplate;
+	TestRestTemplate testRestTemplate
 
 	@Test
 	void testHome() {