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

282 Commits

Author SHA1 Message Date
Spring Buildmaster
05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Stephane Nicoll
d8e90af3bf Merge branch '1.4.x' into 1.5.x 2017-03-28 10:27:14 +02:00
dreis
1266642aba Fix test assertions 
Closes gh-8660
 2017-03-28 10:26:25 +02:00
Spring Buildmaster
d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Spring Buildmaster
2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Spring Buildmaster
5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Spring Buildmaster
a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Spring Buildmaster
ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Phillip Webb
3d619da553 Polish 2017-01-25 16:56:22 -08:00
Andy Wilkinson
cd5124005b Deprecate support for module layout 
Closes gh-8008
 2017-01-25 16:40:42 +00:00
Stephane Nicoll
505e7f75ea Polish contribution 
Closes gh-8089
 2017-01-25 11:01:53 +01:00
dreis
d58f38f6f6 Use String.replace() with single char if possible 
See gh-8089
 2017-01-25 11:01:52 +01:00
Andy Wilkinson
080ff49c8d Prevent AspectJ from loading aspects too early 
Previously, AspectJ would find META-INF/aop.xml almost as soon as
the jar was launched, and before LaunchedURLClassLoader had been
created. This meant that AspectJ would attempt to load aspects listed
in META-INF/aop.xml but that were package in BOOT-INF/classes and,
therefore, could not be loaded.

This commit updates the Repackager so that a META-INF/aop.xml file
is moved into BOOT-INF/classes. This ensures that it isn't visible
to the app class loader so it won't be loaded to early. It will
now be loaded by LaunchedURLClassLoader which can also load the
compiled aspects that aop.xml references.

Closes gh-7587
 2017-01-20 16:51:51 +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
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
c5e7d83e2d Fix shellcheck warnings for literal { and } characters in launch.script 
Closes gh-7870
 2017-01-04 21:30:42 +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
Johnny Lim
f915ae197a Polish 2017-01-04 09:53:45 +01: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
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
aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -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
Spring Buildmaster
9057f9ae1f Next development version 2016-12-23 00:15:23 +00:00
Johnny Lim
e12b4a944f Polish 2016-12-21 20:18: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
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
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
Johnny Lim
6d1b752ffe Polish 
Closes gh-7552
 2016-12-14 19:14:24 +01: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
Johnny Lim
423f8037ce Polish 
Closes gh-7530
 2016-11-30 08:31:13 +01:00
Andy Wilkinson
1595286e04 Prefer @SpringBootApplication-annotated class when finding main class 
Closes gh-6496
 2016-11-29 15:44:10 +00: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
Christian Koops
5c11059e1d Make launch script's logFilename and pidFilename configurable via properties 
Closes gh-7234
 2016-11-22 13:54:16 +00:00
Johnny Lim
8038882d46 Polish 
Closes gh-7403
 2016-11-16 13:36:51 -08:00
Spring Buildmaster
e712a9ba8c Next Development Version 2016-11-08 16:55:37 +00:00
Phillip Webb
97fee46682 Revert Layout changes 
This reverts commits:
- 974ec92ad6.
- 537e0c12c2.
- 500a3df6e9.
 2016-10-31 21:08:15 -07:00
Stephane Nicoll
974ec92ad6 Fix broken build 2016-10-31 10:37:57 +01:00
Dave Syer
537e0c12c2 Support for custom layout types to change loader classes 
A layout can
also optionally change the loader jar that is unpacked in the root
of the repackaged archive by implementing a new method in Layout.
 2016-10-30 11:24:29 +00:00
Dave Syer
500a3df6e9 Add LayoutFactory in spring.factories 
Instead of a fixed enum of layout types, user can provide custom
layouts via implementations of LayoutFactory in spring.factories.
 2016-10-30 11:24:29 +00:00
Stephane Nicoll
ae4dd0d17e Merge branch '1.4.x' into 1.5.x 2016-10-24 18:08:23 +02:00
Stephane Nicoll
a638dcd51b Remove unnecessary use of System.out.println 2016-10-24 18:07:40 +02:00
Andy Wilkinson
899b8a04cb Merge branch '1.4.x' into 1.5.x 2016-10-14 09:20:02 +01:00
Andy Wilkinson
24f8c737fb Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory 
Closes gh-7092
Closes gh-7093
 2016-10-14 09:19:11 +01:00
Andy Wilkinson
57b7357be7 Merge branch '1.4.x' into 1.5.x 2016-10-13 16:55:21 +01:00