Commit Graph

2049 Commits

Author SHA1 Message Date
dreis2211
ba8a32fa4e Replace commons-codec Base64 usage
See gh-13378
2018-06-06 09:19:17 +02:00
Madhura Bhave
d0a2a8e929 Document ConfigurableServletWebServerFactory variants
Closes gh-13083
2018-06-05 13:48:43 -07:00
Stephane Nicoll
bf56ec496d Polish 2018-06-05 13:29:56 +02:00
Stephane Nicoll
fff06822dc Polish 2018-06-05 13:15:38 +02:00
Stephane Nicoll
d84e2b90d7 Fix wrong usage of ManagementContextConfiguration
Closes gh-13366
2018-06-05 13:15:21 +02:00
Stephane Nicoll
b4f8361989 Make JMX metrics domain configurable
Closes gh-13356
2018-06-05 10:12:26 +02:00
Phillip Webb
571c50e43f Switch to functional web code to use static imports
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
Phillip Webb
2274ac5214 Move spring-javaformat plugins to root POM
Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
2018-06-04 17:25:19 -07:00
Phillip Webb
e1d21e52d5 Allow multi-value spring.profiles properties
Update `ConfigFileApplicationListener` to correctly load properties
that have `spring.profiles` values containing a list.

Prior to this commit the loaded would attempt to add the same document
twice resulting in a "property source cannot be added relative to
itself" error.

Closes gh-13362
2018-06-04 15:39:16 -07:00
Phillip Webb
67b548dafb Protect against infinite property include loop
Update `ConfigFileApplicationListener` to ensure that a
`spring.profiles.include` property that refers to an already processed
profile doesn't cause an infinite loop.

Closes gh-13361
2018-06-04 14:59:29 -07:00
Madhura Bhave
378c4c9535 Stop included profiles overriding active profiles
Update `ConfigFileApplicationListener` so that `spring.profiles.include`
properties do not override higher priority active profiles.

This commit also changes when profiles get added to the environment.
Profiles are now added to the environment at the time of profile
processing so that they get logged in the order that they are processed.

Closes gh-13151
2018-06-04 14:46:44 -07:00
Madhura Bhave
60a4d67b13 Handle special characters in TraceableHttpServletRequest
Fixes gh-13273
2018-06-04 12:50:11 -07:00
Andy Wilkinson
1a0dfa06ab Add log4j-jul to Log4j 2 starter
Closes gh-12659
2018-06-04 19:38:25 +01:00
Phillip Webb
abe92eba2e Protect Inet test against "helpful" DNS resolvers
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.

Closes gh-11897
2018-06-04 10:50:36 -07:00
Andy Wilkinson
70c0d6a005 Test the Gradle plugin against Gradle 4.8
Closes gh-13359
2018-06-04 17:53:34 +01:00
Andy Wilkinson
00449bef6a Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
Closes gh-12631
2018-06-04 17:53:34 +01:00
Andy Wilkinson
624946a779 Upgrade to Maven Invoker Plugin 3.1.0
Closes gh-12687
2018-06-04 17:05:22 +01:00
Andy Wilkinson
d54072e0a8 More accurately document buildInfo's effect on up-to-date checking
Closes gh-13152
2018-06-04 16:39:59 +01:00
Dmytro Nosan
20003489be Auto-configure jOOQ with TransactionListenerProvider
Closes gh-13331
2018-06-04 17:35:40 +02:00
Andy Wilkinson
0df37b917b Ignore unresolvable placeholders during property binding
Closes gh-13122
2018-06-04 16:27:30 +01:00
Andy Wilkinson
9c8d2c8016 Improve analysis of bind failures caused by a conversion failure
Closes gh-13357
2018-06-04 16:26:43 +01:00
Andy Wilkinson
ea51cfabca Avoid uri tag explosion when use of path variable is undetected
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.

Closes gh-12447
2018-06-04 15:43:48 +01:00
Stephane Nicoll
bc59434bcc Start building against Spring Framework 5.0.7 snapshots
See gh-13353
2018-06-04 15:21:46 +02:00
Stephane Nicoll
a9b2826c26 Merge branch '1.5.x' into 2.0.x 2018-06-04 14:14:52 +02:00
dreis2211
8bb7b8af51 Remove usage of deprecated Matchers class
Closes gh-13345
2018-06-04 10:31:25 +02:00
dreis2211
29605bacd2 Polish stream creation in some PropertySources
Closes gh-13343
2018-06-03 16:56:51 +02:00
Madhura Bhave
95174a0773 Don't fail if aggregate merge can't get existing value
Fixes gh-13303
2018-06-01 14:52:55 -07:00
Madhura Bhave
8ce13c765b Support binding to immutable maps
Closes gh-13323
2018-06-01 14:52:55 -07:00
Andy Wilkinson
68cd27c47b Do not require DataSourcePoolMetrics to auto-configure Hikari meters
Closes gh-13330
2018-06-01 17:55:43 +01:00
Andy Wilkinson
27267a7090 Ensure that condition evaluator uses runner’s class loader
Closes gh-13319
2018-06-01 17:26:32 +01:00
Johnny Lim
6b0ce46491 Polish
Closes gh-13320
2018-06-01 09:22:20 +02:00
Madhura Bhave
0afd947350 BindFailureAnalyzer should show original failure message
Fixes gh-13122
2018-05-31 16:51:42 -07:00
Stephane Nicoll
fa21333e4d Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
Closes gh-13318
2018-05-31 21:04:02 +02:00
Stephane Nicoll
20e349c332 Polish 2018-05-31 17:35:56 +02:00
Stephane Nicoll
32aa5b9bae Merge branch '1.5.x' into 2.0.x 2018-05-31 16:38:23 +02:00
Andy Wilkinson
0d7d95d8a9 Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
Closes gh-13314
2018-05-31 13:41:43 +01:00
James McShane
d74c768cdd Remove outdated reference to @EnableReactor
Closes gh-13308
2018-05-31 10:39:44 +02:00
Phillip Webb
3751968ecd Add missing ExpectedException rule
Add ExpectedException rule which was missed from the 1.5.x merge.
2018-05-30 22:52:25 -07:00
Phillip Webb
f8ec2e6176 Polish 2018-05-30 21:01:31 -07:00
Phillip Webb
bdd541b2cc Merge branch '1.5.x' into 2.0.x 2018-05-30 20:29:03 -07:00
Phillip Webb
5ae061f491 Merge branch '1.5.x' into 2.0.x 2018-05-30 20:27:19 -07:00
Phillip Webb
2c6465abdc Merge branch '1.5.x' into 2.0.x 2018-05-30 14:08:15 -07:00
Phillip Webb
401fcbeaa4 Merge branch '1.5.x' into 2.0.x 2018-05-30 13:29:10 -07:00
Phillip Webb
587df6a07a Port call setHttpOnly property on Tomcat context
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4 to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.

See gh-12580
2018-05-30 12:23:40 -07:00
Phillip Webb
e38d5f910b Merge branch '1.5.x' into 2.0.x 2018-05-30 12:18:38 -07:00
Phillip Webb
09fa1e7e11 Polish 2018-05-30 12:12:01 -07:00
Johnny Lim
4eb070767c Remove an unnecessary @QuartzDataSource
Closes gh-13302
2018-05-30 17:49:21 +02:00
Stephane Nicoll
b47a72731f Merge branch '1.5.x' into 2.0.x 2018-05-30 15:27:58 +02:00
Andy Wilkinson
35c48bb9bd Polish 2018-05-30 10:28:52 +01:00
Madhura Bhave
ad1283195a Fix test in "Truststore password if SSLstoreprovider present"
See gh-13088
2018-05-29 15:06:39 -07:00