196 Commits

Author SHA1 Message Date
Phillip Webb
bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
2020-01-21 18:33:33 -08:00
Stephane Nicoll
7270ca5cf4 Polish "Remove deprecated Joda-Time support"
See gh-19699
2020-01-16 15:15:21 +01:00
Andy Wilkinson
714a187d8f Rework dep mgmt again to avoid consumers picking up strict constraints
This paves the way for publishing Gradle module metadata once the
problem caused by snapshot versions and our two-step publication
process has been addressed.

See gh-19609
2020-01-15 12:33:18 +00:00
Andy Wilkinson
aefe52e4d0 Revert "Rework dep management to avoid consumers picking up strict constraints"
This reverts commit b34a311d02fe60ac267493ccc7f2c6b816f3a15c as,
having disabled the publishing of Gradle's module metadata (4f75ab5),
the changes are no longer needed.

See gh-19609
2020-01-14 12:15:53 +00:00
Phillip Webb
862462b791 Update copyright year of changed files 2020-01-13 17:04:19 -08:00
Andy Wilkinson
b34a311d02 Rework dep management to avoid consumers picking up strict constraints
Previously, enforcedPlatform dependencies were using to pull in the
constraints defined in spring-boot-dependencies and
spring-boot-parent and applied them strictly so that the constrained
version had to be used. This worked as intended in Spring Boot's own
build but incorrectly enforced those same strict version requirements
on external consumers of Spring Boot's modules.

This commit reworks how Spring Boot defines its internal dependency
management so that platform dependencies are exposed to external
consumers while enforced platform dependencies are using internally.

See gh-19609
2020-01-13 19:59:56 +00:00
Stephane Nicoll
f13ff3b939 Merge branch '2.2.x'
Closes gh-19686
2020-01-13 17:45:06 +01:00
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
ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Stephane Nicoll
08ac72f5f0 Fix build failure 2019-12-26 12:02:38 +01:00
Stephane Nicoll
2c1e81adf0 Polish 2019-12-26 10:42:40 +01:00
Andy Wilkinson
870aa86eb9 Upgrade to Hamcrest 2.2
Closes gh-18922
2019-11-08 14:13:32 +00:00
Andy Wilkinson
4b4b39853b Merge branch '2.1.x'
Closes gh-18608
2019-10-15 19:47:41 +01:00
Andy Wilkinson
00d4b44cbb Remove trailing commas from test SQL scripts
Closes gh-18607
2019-10-15 19:47:27 +01:00
dreis2211
09b9d18d88 Fix formatting issue
See gh-18544
2019-10-08 14:11:50 -05:00
dreis2211
e70a5686bf Fix checkstyle warning
See gh-18541
2019-10-08 12:21:05 -05: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
46c30d6bb0 Merge branch '2.1.x'
Closes gh-18476
2019-10-02 10:48:57 +01:00
Andy Wilkinson
3d4157ad6d Correct SCM URLs in published poms
Previously, Maven's default behaviour was relied up which resulted
in the artifact ID being appended to each URL as it was inherited.
This behaviour can only be disabled in Maven 3.6 and later, a version
that we cannot use due to an incompatibility with the Flatten Plugin.

This commit works around Maven's default behaviour by defining
properties for the SCM URL, connection, and developer connection and
then explicitly defining the settings in each pom using these
properties. The explicit definition of the properties in each pom
prevents them being inherited from the parent, thereby disabling the
unwanted appending of the artifact ID to the URL.

Fixes gh-18328
2019-10-02 10:48:30 +01: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
dreis2211
d4affd7f85 Use hasSize() assertion in favor of length checks
See gh-17874
2019-08-17 06:39:41 +02: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
dreis2211
2038fac825 Remove testsupport.assertj package
See gh-17557
2019-07-18 14:20:28 +02:00
Phillip Webb
a9ba7080ce Merge branch '2.1.x' 2019-07-17 21:48:42 +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
Phillip Webb
c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +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
8edf88a08b Polish M2Eclipse ignore configuration
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
2019-06-27 09:42:14 -07:00
Andy Wilkinson
66f1344f7c Merge branch '2.1.x'
Closes gh-17335
Closes gh-17292
2019-06-27 12:00:34 +01:00
Andy Wilkinson
91786bc712 Merge branch '2.0.x' into 2.1.x
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Stephane Nicoll
e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
2019-06-21 18:09:05 +02:00
Stephane Nicoll
ea9a0c7839 Fix @RegisterExtension on CliTester
This reverts commit dfa5480c and rather make the field package private
so that the extension can be registered properly

Closes gh-17266
2019-06-19 20:44:52 +02:00
Stephane Nicoll
dfa5480c59 Remove useless @RegisterExtension on CliTester
Closes gh-17266
2019-06-19 16:05:16 +02:00
Phillip Webb
266d6334b2 Fix checkstyle RedundantModifier test violations 2019-06-07 20:46:33 -07:00