Commit Graph

123 Commits

Author SHA1 Message Date
Stephane Nicoll
101fd14286 Merge branch '2.1.x' into 2.2.x
Closes gh-19685
2020-01-13 17:44:45 +01:00
Stephane Nicoll
8b8a4ee65e Polish "Make equality checks defensive to null reference"
See gh-19540
2020-01-13 17:38:38 +01:00
liuhuan
6d8b849361 Make equality checks defensive to null reference
See gh-19540
2020-01-13 17:38:26 +01:00
Andy Wilkinson
b5243c5076 Polish "Polish"
See gh-18534
2019-10-08 07:38:53 -05:00
Kant Leung
2f73e196af Polish
See gh-18534
2019-10-08 07:38:21 -05:00
Andy Wilkinson
308f2db930 Polish "Support multiple drives when running CLI using Cygwin"
See gh-17872
2019-09-03 17:22:08 +01:00
Wanderrful
584a562970 Support multiple drives when running CLI using Cygwin
See gh-17872
2019-09-03 17:21:40 +01:00
dreis2211
b4350a9d96 Remove unnecessary blank lines
See gh-18089
2019-09-03 08:48:10 +02:00
Andy Wilkinson
caa4c165b5 Merge branch '2.1.x'
Closes gh-18084
2019-09-01 20:21:18 +01:00
Andy Wilkinson
7150f121a3 Redirect stdout from cd to /dev/null in CLI's bash script
Fixes gh-17579
2019-09-01 20:20:32 +01:00
Andy Wilkinson
a04a6c3e92 Merge branch '2.1.x'
Closes gh-17996
2019-08-29 13:51:05 +01:00
Ben Hale
2a04d94cf1 Use exec when launching the JVM in CLI's shell script
Previously, when the Spring Boot CLI ran the Java command line for an
application it did a straight invocation which suppressed propagation of
signals to the JVM in certain circumstances (e.g within Docker containers).

This change prepends the command with exec which causes the Java process to
replace the script process in a shell ensuring that signals are propagated to
the Java process without suppression.

See gh-17976

Signed-off-by: Ben Hale <bhale@pivotal.io>
2019-08-29 13:49:46 +01:00
Phillip Webb
8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb
fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb
01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Andy Wilkinson
9f253603db Drop -d option from CLI as it was not POSIX compliant
Closes gh-16663
2019-07-09 09:48:49 +01:00
Phillip Webb
a66c4d3096 Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
2019-07-03 11:39:47 -07:00
Phillip Webb
605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb
266d6334b2 Fix checkstyle RedundantModifier test violations 2019-06-07 20:46:33 -07:00
Andy Wilkinson
aef92b9295 Merge branch '2.1.x'
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb
db75347eb6 Merge branch '2.1.x' 2019-06-04 14:41:20 -07:00
Phillip Webb
0ef331018e Merge branch '2.0.x' into 2.1.x 2019-06-04 14:30:52 -07:00
Phillip Webb
17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
2019-04-24 19:37:59 -07:00
Andy Wilkinson
5c4537add9 Merge branch '2.1.x' 2019-04-03 09:52:58 +01:00
Andy Wilkinson
52ebf20cbf Merge branch '2.0.x' into 2.1.x 2019-04-03 09:52:45 +01:00
Andy Wilkinson
bfe65c8a5c Merge branch '1.5.x' into 2.0.x 2019-04-03 09:52:28 +01:00
Andy Wilkinson
878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson
864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson
ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Andy Wilkinson
4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c Use HTTPS for external links in XML files
See gh-16270
2019-03-20 14:33:25 +00:00
Andy Wilkinson
f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson
53326695ea Polish 2019-02-21 08:13:54 +00:00
Stephane Nicoll
9eccf6c367 Merge branch '2.1.x' 2019-02-08 08:45:43 +01:00
dreis2211
48295e16fc Fix assertion
Closes gh-15871
2019-02-08 08:45:12 +01:00
Stephane Nicoll
8d1d3fb087 Polish "Avoid string concatenation inside StringBuilder append()"
Closes gh-15589
2019-01-11 08:30:12 +01:00
igor-suhorukov
59ac85d371 Avoid string concatenation inside StringBuilder append()
See gh-15589
2019-01-11 08:28:19 +01:00
Andy Wilkinson
3995c66b37 Merge branch '2.0.x' 2018-10-18 10:47:46 +01:00
Andy Wilkinson
993c75ea38 Merge branch '1.5.x' into 2.0.x 2018-10-18 10:47:35 +01:00
Stephane Nicoll
716b04721c Merge branch '2.0.x' 2018-10-09 17:08:56 +02:00
Stephane Nicoll
6e6c22c0ae Polish "Remove duplicate -l option for init command"
Closes gh-1446
2018-10-09 17:08:10 +02:00