1248 Commits

Author SHA1 Message Date
Andy Wilkinson
17a1b2822c Isolate LoggerContext state to each test
Closes gh-16162
2019-03-07 09:37:41 +00:00
Andy Wilkinson
3f3966adb0 Merge branch '2.1.x' 2019-03-07 09:25:45 +00:00
Andy Wilkinson
9963ed1249 Merge branch '2.0.x' into 2.1.x 2019-03-07 09:25:31 +00:00
Andy Wilkinson
83216c34e5 Merge branch '1.5.x' into 2.0.x 2019-03-07 09:25:17 +00:00
Andy Wilkinson
87d696d697 Align with breaking API change in AssertJ 3.12
Closes gh-16145
2019-03-06 14:38:17 +00:00
Andy Wilkinson
d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Johnny Lim
4a738e3c49 Polish
Closes gh-16094
2019-03-05 08:19:29 +01:00
Stephane Nicoll
7b8563a877 Merge branch '2.1.x' 2019-03-04 09:29:13 +01:00
Stephane Nicoll
235fbfb4b6 Polish "Use AssertJ facilities for expected exceptions"
Closes gh-16066
2019-03-04 08:58:28 +01:00
dreis2211
be445f6346 Use AssertJ facilities for expected exceptions
See gh-16066
2019-03-04 08:45:42 +01:00
Stephane Nicoll
3bcd93bd35 Merge branch '2.1.x' 2019-02-28 14:44:27 +01:00
Stephane Nicoll
2a6791aa20 Polish "Add jaxb-runtime to TldSkipPatterns"
Closes gh-16027
2019-02-28 14:39:52 +01:00
Rupert Madden-Abbott
946ada62fb Add jaxb-runtime to TldSkipPatterns
See gh-16027
2019-02-28 14:37:45 +01:00
Stephane Nicoll
7beb64043d Fix build failure 2019-02-27 13:55:28 +01:00
Stephane Nicoll
7f817e339b Merge branch '2.1.x' 2019-02-27 13:45:26 +01:00
Stephane Nicoll
978f80122b Polish "Debug mode is not logging web and sql related loggers"
Closes gh-16018
2019-02-27 13:37:18 +01:00
Dmytro Nosan
c3430d5883 Debug mode is not logging web and sql related loggers
See gh-16018
2019-02-27 13:25:08 +01:00
Stephane Nicoll
715db153e3 Polish "Remove code deprecated in 2.1"
Closes gh-16013
2019-02-27 11:15:48 +01:00
Mehmed Baždar
246111cd84 Remove code deprecated in 2.1
See gh-16013
2019-02-27 10:08:48 +01:00
dreis2211
2ab4ce03db Fix deprecations
Closes gh-16037
2019-02-26 16:49:13 +01:00
Madhura Bhave
adea7014a9 Add support to detect Kubernetes platform in CloudPlatform
Closes gh-15537
2019-02-21 15:27:23 -08:00
Andy Wilkinson
f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson
52aa7e1e09 Include source of NoSuchMethodError in its failure analysis
Closes gh-15995
2019-02-19 12:38:21 +00:00
Andy Wilkinson
51776af45d Include source of NoSuchMethodError in its failure analysis
Closes gh-15995
2019-02-19 12:34:52 +00:00
Stephane Nicoll
eee07efee1 Switch Logback's file size properties to DataSize
This commit changes the target type of file size-based properties to
`DataSize` and tolerates Logback's specific format.

Closes gh-15930
2019-02-19 11:16:31 +01:00
Stephane Nicoll
fa49dfcaaf Add support for task scheduling shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Stephane Nicoll
d2cbf08f09 Polish "Add support for task executor shutdown related properties"
Closes gh-15951
2019-02-18 21:13:32 +01:00
Filip Hrisafov
3b47ba21a8 Add support for task executor shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Stephane Nicoll
ff6ef1e55d Merge branch '2.1.x' 2019-02-18 16:49:42 +01:00
Stephane Nicoll
20c39dc554 Document missing keys mapped on third party types
Closes gh-15980
2019-02-18 16:48:51 +01:00
Andy Wilkinson
3a4a431eaa Provide a configuration option to enable lazy initialization
Closes gh-15870
2019-02-14 12:41:49 +00:00
Stephane Nicoll
f42cec9eac Polish "Support for capping archived log files"
Closes gh-15325
2019-02-12 16:31:58 +01:00
Robert Thornton
999780f342 Support for capping archived log files
See gh-15325
2019-02-12 16:31:58 +01:00
Stephane Nicoll
82f33adba5 Polish "Add support for jdbc:firebird: url prefix"
Closes gh-15841
2019-02-12 10:32:44 +01:00
Mark Rotteveel
2ab7ece36d Add support for jdbc:firebird: url prefix
See gh-15841
2019-02-12 10:32:44 +01:00
dreis2211
3fb87a4506 Clean up SpringPropertyAction.getValue()
See gh-15885
2019-02-11 16:58:40 +00:00
Andy Wilkinson
d9ec48ef12 Merge branch '2.1.x' 2019-02-11 16:13:52 +00:00
Andy Wilkinson
3f32fbd0de Polish "Remove unwanted @Nullable annotations"
See gh-15876
2019-02-11 16:11:40 +00:00
wonwoo
2855321074 Remove unwanted @Nullable annotations
See gh-15876
2019-02-11 16:07:29 +00:00
Kedar Joshi
4a253ff87c Polish
1. Removed unnecessary null checks
2. Combined collection initialization and modification
3. Minor collections related optimizations

Closes gh-15837
2019-02-10 10:35:36 +01:00
Brian Clozel
8bcbcf6c27 Merge branch '2.1.x' 2019-02-08 19:48:49 +01:00
Brian Clozel
c24f02696f Upgrade to Californium-BUILD-SNAPSHOT
See gh-15878
2019-02-08 19:45:24 +01:00
Madhura Bhave
8528f7c140 Make spring.profiles.include behave consistently
Previously, if profiles were included via a property source with higher
precedence than config files, profiles activated via config files would
not be taken into account. This commit makes spring.profiles.include
behave consistently where it adds to active profiles rather than replacing
them, regardless of property source.

Fixes gh-15344
2019-02-08 10:28:52 -08:00
Stephane Nicoll
380d7ec01c Merge branch '2.1.x' 2019-02-08 09:21:06 +01:00
Johnny Lim
885c28891b Polish
Closes gh-15873
2019-02-08 09:20:15 +01:00
Stephane Nicoll
b169406bbe Polish contribution
Closes gh-15853
2019-02-06 09:14:06 +01:00
Kedar Joshi
b43718c360 Polish
See gh-15853
2019-02-06 09:13:53 +01:00
Andy Wilkinson
45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +00:00
Andy Wilkinson
82bc87560c Use AssertJ’s exception assertions rather than fail
Closes gh-15761
2019-02-04 11:48:26 +00:00
dreis2211
5b3e1aa21a Optimize ConfigurationPropertyName
This commit changes the iteration order when checking for element
equality. This is based on the educated guess that child elements
will likely differ while parents will probably be the same.

E.g. comparing "spring.banner.charset" with "spring.banner.location"
will now first check "charset" against "location" and thus saves some
cycles for elements that will be the same.

See gh-15782
2019-01-28 11:39:40 +00:00