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

Merge branch '3.1.x' into 3.2.x 

Closes gh-39422
This commit is contained in:
Moritz Halbritter 2024-02-06 13:10:15 +01:00
parent 3555adb5aa 34f6220427
commit 976152b244
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/using/running-your-application.adoc
View File

@ -40,7 +40,7 @@ Doing so lets you attach a debugger to your packaged application, as shown in th
[source,shell,indent=0,subs="verbatim"] [source,shell,indent=0,subs="verbatim"]
---- ----
$ java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n \ $ java -agentlib:jdwp=server=y,transport=dt_socket,address=8000,suspend=n \
-jar target/myapplication-0.0.1-SNAPSHOT.jar -jar target/myapplication-0.0.1-SNAPSHOT.jar
---- ----

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc
View File

@ -79,11 +79,11 @@ The following configuration suspend the process until a debugger has joined on p
include::../maven/running/debug-pom.xml[tags=debug] include::../maven/running/debug-pom.xml[tags=debug]
---- ----
These arguments can be specified on the command line as well, make sure to wrap that properly, that is: These arguments can be specified on the command line as well:
[indent=0] [indent=0]
---- ----
$ mvn spring-boot:run -Dspring-boot.run.jvmArguments="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" $ mvn spring-boot:run -Dspring-boot.run.jvmArguments=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
---- ----

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/running/debug-pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<jvmArguments> <jvmArguments>
-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
</jvmArguments> </jvmArguments>
</configuration> </configuration>
</plugin> </plugin>

9
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
View File

@ -63,11 +63,10 @@ class RunArgumentsTests {
} }
@Test @Test
void parseDebugFlags() { void parseDebugFlag() {
String[] args = parseArgs("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"); String[] args = parseArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
assertThat(args).hasSize(2); assertThat(args).hasSize(1);
assertThat(args[0]).isEqualTo("-Xdebug"); assertThat(args[0]).isEqualTo("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
assertThat(args[1]).isEqualTo("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005");
} }
@Test @Test