Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,488 Commits 23 Branches 0 Tags
b29e29638332d8a8ea58c8143d35792aa9216385
Commit Graph

219 Commits

Author SHA1 Message Date
Andy Wilkinson
aba09cce73 Merge branch '1.5.x' 2017-01-18 14:25:09 +00:00
Alessandro Falappa
ec537b307e Make start/stop run-levels configurable in INIT-INFO of launch.script 
See gh-7008
Closes gh-7902
 2017-01-18 14:24:29 +00:00
Phillip Webb
77f9bb09ca Further Polish Mockito 2 support 
See gh-7770
 2017-01-05 14:29:29 -08:00
Andy Wilkinson
4dc30938d0 Merge branch '1.5.x' 2017-01-04 21:39:34 +00:00
Andy Wilkinson
803eddf6b2 Update test to reflect quoting of STOP_WAIT_TIME in launch.script 2017-01-04 21:39:16 +00:00
Andy Wilkinson
3967c525c8 Merge branch '1.5.x' 2017-01-04 21:31:26 +00:00
Andy Wilkinson
c5e7d83e2d Fix shellcheck warnings for literal { and } characters in launch.script 
Closes gh-7870
 2017-01-04 21:30:42 +00:00
Andy Wilkinson
be71f666d2 Merge branch '1.5.x' 2017-01-04 20:40:57 +00:00
Andy Wilkinson
75cb545361 Update launch.script to use a consistent location for pid file 
Closes gh-6924
 2017-01-04 20:39:51 +00:00
Stephane Nicoll
506f6497c0 Merge branch '1.5.x' 2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a Polish 2017-01-04 09:53:45 +01:00
Phillip Webb
4026fa563f Merge branch '1.5.x' 2017-01-02 19:54:26 -08:00
Phillip Webb
41b83085a6 Restore kill -9 to launch.script force-stop 
Restore the `-9` flag to the send `kill` call which was inadvertently
lost in commit a35a1022c2.

Closes gh-6223
 2017-01-02 19:47:54 -08:00
Phillip Webb
a90bad37bd Merge branch '1.5.x' 2016-12-30 13:29:18 -08:00
Phillip Webb
a35a1022c2 Update force-stop to respect STOP_WAIT_TIME 
Closes gh-6223
 2016-12-30 13:23:47 -08:00
Kazuki Shimizu
40691d07f8 Add force-stop to launch.script usage 
See gh-6223
Closes gh-7787
 2016-12-30 13:19:36 -08:00
Phillip Webb
53f1df86a2 Merge branch '1.5.x' 2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -08:00
Phillip Webb
4d73f3d2e9 Merge branch '1.5.x' 2016-12-29 22:22:04 -08:00
Gaurav Rawat
509be7474d Add force-stop support to launch script 
Update the embedded launch script to support `force-stop`.

Closes gh-6223
 2016-12-29 22:20:05 -08:00
Phillip Webb
6e02fe59f7 Merge branch '1.5.x' 2016-12-21 22:32:43 -08:00
Johnny Lim
e12b4a944f Polish 2016-12-21 20:18:04 -08:00
Phillip Webb
8b47561f7e Merge branch '1.5.x' 2016-12-20 21:56:04 -08:00
Lucas Saldanha
534a9db6fd Make stop wait time in the launch script configurable 
Create a parameter `STOP_WAIT_TIME` for the startup script
that configures the time in seconds to wait for a normal
shutdown. Because of #4941 we also send a shutdown half
way the countdown.

Fixes gh-7121
 2016-12-20 15:15:12 -08:00
Phillip Webb
1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -08:00
Phillip Webb
6121208cbb Polish formatting 2016-12-19 12:47:03 -08:00
Phillip Webb
4b9cba351b Merge branch '1.4.x' into 1.5.x 2016-12-19 12:36:57 -08:00
Phillip Webb
bd74c3d327 Polish formatting 2016-12-19 12:25:09 -08:00
Stephane Nicoll
1302d1b0e4 Merge branch '1.5.x' 2016-12-15 14:16:28 +01:00
Alessandro Falappa
dd7d81a580 INIT INFO Required Start/Stop as embedded launch script properties 
Expose the Required-Start and Require-Stop lines in the launch script
INIT INFO section as customizable embedded launch script properties.

This way one can express dependencies fron other init services by simply
changing the configuration in the build script.

Closes gh-7555
 2016-12-15 14:14:50 +01:00
Stephane Nicoll
a86678cc31 Merge branch '1.5.x' 2016-12-14 19:33:34 +01:00
Johnny Lim
6d1b752ffe Polish 
Closes gh-7552
 2016-12-14 19:14:24 +01:00
Andy Wilkinson
39c0f229c2 Merge branch '1.5.x' 2016-12-02 11:34:00 +00:00
Andy Wilkinson
0df03a95f0 Merge branch '1.4.x' into 1.5.x 2016-12-02 11:33:52 +00:00
Pei-Tang Huang
5a5e2db134 Quote $jarfile when creating arguments in launch script 
Previously, if the pathname of fully executable contained any space
characters, the launch script would fail to locate the jar file

This commit fixes this issue by quoting the jarfile.

Closes gh-7535
 2016-12-02 11:31:51 +00:00
Stephane Nicoll
0568afc6cb Merge branch '1.5.x' 2016-11-30 08:31:41 +01:00
Johnny Lim
423f8037ce Polish 
Closes gh-7530
 2016-11-30 08:31:13 +01:00
Andy Wilkinson
633280d1d0 Merge branch '1.5.x' 2016-11-29 15:44:31 +00:00
Andy Wilkinson
1595286e04 Prefer @SpringBootApplication-annotated class when finding main class 
Closes gh-6496
 2016-11-29 15:44:10 +00:00
Phillip Webb
450ab28163 Merge branch '1.5.x' 2016-11-28 17:27:05 -08:00
Dave Syer
c6c6524b40 Support custom fat jar layouts 
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.

See gh-7263
 2016-11-28 16:31:53 -08:00
Phillip Webb
f5b03c81f3 Rework Repacakger timeout code 
Pull up common timeout code into Repackager and remove the need for
custom subclasses.

See gh-7263
 2016-11-28 16:15:39 -08:00
Andy Wilkinson
bc6b2a9c75 Merge branch '1.5.x' 2016-11-22 13:54:49 +00:00
Christian Koops
5c11059e1d Make launch script's logFilename and pidFilename configurable via properties 
Closes gh-7234
 2016-11-22 13:54:16 +00:00
Phillip Webb
cb7c0b5031 Merge branch '1.5.x' 2016-11-16 16:06:53 -08:00
Johnny Lim
8038882d46 Polish 
Closes gh-7403
 2016-11-16 13:36:51 -08:00
Phillip Webb
98a3ae9ac4 Merge branch '1.5.x' 2016-10-31 23:13:37 -07:00
Phillip Webb
97fee46682 Revert Layout changes 
This reverts commits:
- 974ec92ad6.
- 537e0c12c2.
- 500a3df6e9.
 2016-10-31 21:08:15 -07:00
Stephane Nicoll
d27ffd289a Merge branch '1.5.x' 2016-10-31 10:38:06 +01:00
Stephane Nicoll
974ec92ad6 Fix broken build 2016-10-31 10:37:57 +01:00