Browse Source

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
pull/26879/head
Stephane Nicoll 5 years ago
parent
commit
c52eabae22
  1. 18
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
  2. 8
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java

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

@ -1,5 +1,5 @@ @@ -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");
* you may not use this file except in compliance with the License.
@ -61,29 +61,29 @@ public class StartMojo extends AbstractRunMojo { @@ -61,29 +61,29 @@ public class StartMojo extends AbstractRunMojo {
* The JMX name of the automatically deployed MBean managing the lifecycle of the
* spring application.
*/
@Parameter
private String jmxName = SpringApplicationAdminClient.DEFAULT_OBJECT_NAME;
@Parameter(defaultValue = SpringApplicationAdminClient.DEFAULT_OBJECT_NAME)
private String jmxName;
/**
* The port to use to expose the platform MBeanServer if the application is forked.
*/
@Parameter
private int jmxPort = 9001;
@Parameter(defaultValue = "9001")
private int jmxPort;
/**
* The number of milli-seconds to wait between each attempt to check if the spring
* application is ready.
*/
@Parameter
private long wait = 500;
@Parameter(property = "spring-boot.start.wait", defaultValue = "500")
private long wait;
/**
* 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
* default)
*/
@Parameter
private int maxAttempts = 60;
@Parameter(property = "spring-boot.start.maxAttempts", defaultValue = "60")
private int maxAttempts;
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

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

Loading…
Cancel
Save