mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
eddb10e4c9
@ -548,9 +548,12 @@ the following example and place it in `/etc/systemd/system` directory:
|
||||
TIP: Remember to change the `Description`, `User` and `ExecStart` fields for your
|
||||
application.
|
||||
|
||||
TIP: Note that `ExecStart` field does not declare the script action command, which means
|
||||
that `run` command is used by default.
|
||||
|
||||
Note that unlike when running as an `init.d` service, user that runs the application, PID
|
||||
file and console log file behave differently under `systemd` and must be configured using
|
||||
appropriate fields in '`service`' script. Consult the
|
||||
file and console log file are managed by `systemd` itself and therefore must be configured
|
||||
using appropriate fields in '`service`' script. Consult the
|
||||
http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit
|
||||
configuration man page] for more details.
|
||||
|
||||
|
@ -37,8 +37,9 @@ import org.springframework.util.ReflectionUtils.FieldCallback;
|
||||
* annotations.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.4.2
|
||||
*/
|
||||
class MockitoTestExecutionListener extends AbstractTestExecutionListener {
|
||||
public class MockitoTestExecutionListener extends AbstractTestExecutionListener {
|
||||
|
||||
@Override
|
||||
public void prepareTestInstance(TestContext testContext) throws Exception {
|
||||
|
Loading…
Reference in New Issue
Block a user