Merge branch '3.2.x' into 3.3.x

Author: philwebb

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/build.gradle

@@ -1,5 +1,6 @@
 plugins {
 	id "java"
+	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot TestNG smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/SampleTestNGApplication.java

@@ -16,15 +16,15 @@
 
 package smoketest.testng;
 
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-
 @SpringBootApplication
 public class SampleTestNGApplication {
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/web/SampleController.java

@@ -16,13 +16,13 @@
 
 package smoketest.testng.web;
 
+import smoketest.testng.service.HelloWorldService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import smoketest.testng.service.HelloWorldService;
-
 @Controller
 public class SampleController {
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/test/java/smoketest/testng/SampleTestNGApplicationTests.java

@@ -16,7 +16,7 @@
 
 package smoketest.testng;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.testng.annotations.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -25,7 +25,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Basic integration tests for demo application.