Merge branch '2.7.x' into 3.0.x

Closes gh-35864
spring-projects · Jun 13, 2023 · bdbbbc6 · bdbbbc6
2 parents 02a601e + 984dc1d
commit bdbbbc6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...ot-project/spring-boot-devtools/src/intTest/java/com/example/DevToolsTestApplication.java b/...ot-project/spring-boot-devtools/src/intTest/java/com/example/DevToolsTestApplication.java
@@ -21,7 +21,7 @@
 import org.springframework.boot.web.context.WebServerPortFileWriter;
 
 @SpringBootApplication
-public class DevToolsTestApplication {
+class DevToolsTestApplication {
 
 	public static void main(String[] args) {
 		new SpringApplicationBuilder(DevToolsTestApplication.class).listeners(new WebServerPortFileWriter(args[0]))

diff --git a/...oot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartLauncher.java b/...oot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public void run() {
 		try {
 			Class<?> mainClass = Class.forName(this.mainClassName, false, getContextClassLoader());
 			Method mainMethod = mainClass.getDeclaredMethod("main", String[].class);
+			mainMethod.setAccessible(true);
 			mainMethod.invoke(null, new Object[] { this.args });
 		}
 		catch (Throwable ex) {

diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
@@ -68,6 +68,7 @@
 	<suppress files="DeprecatedElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
 	<suppress files="DeprecatedElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
 	<suppress files="DeprecatedReactiveElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
+	<suppress files="DevToolsTestApplication\.java" checks="SpringMethodVisibility" />
 	<suppress files="DevToolsR2dbcAutoConfigurationTests" checks="HideUtilityClassConstructor" />
 	<suppress files="AbstractLaunchScriptIntegrationTests" checks="IllegalImport" />
 	<suppress files="FailureAnalyzers\.java" checks="RedundantModifier" />