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

Merge pull request #26422 from marcus-nl 

* pr/26422:
  Update copyright year of change file
  Improve configuration of Start and Stop goals

Closes gh-26422
This commit is contained in:
Stephane Nicoll 2021-06-12 18:16:40 +02:00
parent 30fbd67207 b7f126020e
commit c52eabae22
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -61,29 +61,29 @@ public class StartMojo extends AbstractRunMojo {
* The JMX name of the automatically deployed MBean managing the lifecycle of the * The JMX name of the automatically deployed MBean managing the lifecycle of the
* spring application. * spring application.
*/ */
@Parameter @Parameter(defaultValue = SpringApplicationAdminClient.DEFAULT_OBJECT_NAME)
private String jmxName = SpringApplicationAdminClient.DEFAULT_OBJECT_NAME; private String jmxName;
/** /**
* The port to use to expose the platform MBeanServer if the application is forked. * The port to use to expose the platform MBeanServer if the application is forked.
*/ */
@Parameter @Parameter(defaultValue = "9001")
private int jmxPort = 9001; private int jmxPort;
/** /**
* The number of milli-seconds to wait between each attempt to check if the spring * The number of milli-seconds to wait between each attempt to check if the spring
* application is ready. * application is ready.
*/ */
@Parameter @Parameter(property = "spring-boot.start.wait", defaultValue = "500")
private long wait = 500; private long wait;
/** /**
* The maximum number of attempts to check if the spring application is ready. * The maximum number of attempts to check if the spring application is ready.
* Combined with the "wait" argument, this gives a global timeout value (30 sec by * Combined with the "wait" argument, this gives a global timeout value (30 sec by
* default) * default)
*/ */
@Parameter @Parameter(property = "spring-boot.start.maxAttempts", defaultValue = "60")
private int maxAttempts = 60; private int maxAttempts;
private final Object lock = new Object(); private final Object lock = new Object();

8
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java
View File

@ -62,15 +62,15 @@ public class StopMojo extends AbstractMojo {
* The JMX name of the automatically deployed MBean managing the lifecycle of the * The JMX name of the automatically deployed MBean managing the lifecycle of the
* application. * application.
*/ */
@Parameter @Parameter(defaultValue = SpringApplicationAdminClient.DEFAULT_OBJECT_NAME)
private String jmxName = SpringApplicationAdminClient.DEFAULT_OBJECT_NAME; private String jmxName;
/** /**
* The port to use to lookup the platform MBeanServer if the application has been * The port to use to lookup the platform MBeanServer if the application has been
* forked. * forked.
*/ */
@Parameter @Parameter(defaultValue = "9001")
private int jmxPort = 9001; private int jmxPort;
/** /**
* Skip the execution. * Skip the execution.