639 Commits

Author SHA1 Message Date
Stephane Nicoll
ae12d515ee Merge branch '2.0.x' 2018-06-19 11:11:18 +02:00
Johnny Lim
1e7ed2ffdb Add log level guards in ConfigFileApplicationListener
Closes gh-13512
2018-06-19 11:10:45 +02:00
Madhura Bhave
3a01914b63 Merge branch '2.0.x' 2018-06-18 17:18:16 -07:00
Madhura Bhave
87680b4ee5 Fix profile precedence when active and include provided
Before 2.0.2, if profiles were activated via the environment using the
active and include profile property, profiles specified via the active
property would take precedence. This commit restores that behavior.

Fixes gh-13513
2018-06-18 16:24:49 -07:00
Stephane Nicoll
b4584e6a28 Support profile expression in Logback's <springProfile>
Closes gh-13496
2018-06-18 13:23:58 +02:00
Stephane Nicoll
a89b2ae46e Support profile expression in yml profile matching
Closes gh-12469
2018-06-18 13:05:52 +02:00
Stephane Nicoll
0c4176f596 Drop JsonSimpleJsonParser and JSON simple dependency
Closes gh-13471
2018-06-18 10:11:50 +02:00
Brian Clozel
cb6c8f76e2 Configure X-Forwarded-* support with Reactor Netty
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.

Closes gh-10900
2018-06-13 14:55:33 +02:00
Phillip Webb
375769ed5a Merge branch '2.0.x' 2018-06-06 15:18:52 -07:00
Phillip Webb
dc1c459cde Polish "Fix caching issues with map property sources"
Refine the property source cache key fix so that a copy of the
key is only taken when the values change. This allows us to
retain the previous performance optimization of not creating
unnecessary string arrays.

Closes gh-13344
2018-06-06 15:17:07 -07:00
Fahim Farook
c556d2b58f Fix caching issues with map property sources
Update `SpringIterableConfigurationPropertySource` so that the cache
key from a `MapPropertySource` is invalidated when the map contents
changes.

Prior to this commit, the actual keys of the map were used as the key.
This meant that if the underlying map changed, they key wouldn't be
invalidated because it ultimately pointed to the same object instance.

See gh-13344
2018-06-06 15:02:59 -07:00
Phillip Webb
66be6c3396 Polish 2018-06-05 17:44:51 -07:00
Dmytro Nosan
5b159a6bd0 Use Duration in HttpWebServiceMessageSenderBuilder
Closes gh-13364
2018-06-05 16:14:34 +02:00
Stephane Nicoll
909722f143 Polish 2018-06-05 16:02:32 +02:00
Stephane Nicoll
e9c3df4ad2 Polish "Add duration support for setConnectTimeout and setReadTimeout"
Closes gh-13355
2018-06-05 16:00:33 +02:00
Dmytro Nosan
36f3c1b883 Add duration support for setConnectTimeout and setReadTimeout
See gh-13355
2018-06-05 16:00:33 +02:00
Stephane Nicoll
8691d01aaf Polish "Add duration support for setConnectTimout and setReadTimeout"
See gh-13355
2018-06-05 16:00:25 +02:00
Stephane Nicoll
c612ed2695 Polish "RestTemplateCustomizers should be applied at the end"
Closes gh-13358
2018-06-05 09:45:19 +02:00
Dmytro Nosan
ce3420748f RestTemplateCustomizers should be applied at the end
See gh-13358
2018-06-05 09:42:42 +02:00
Phillip Webb
d47e7ebb5b Merge branch '2.0.x' 2018-06-04 15:42:12 -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
a12baed5de Merge branch '2.0.x' 2018-06-04 15:02:14 -07:00
Phillip Webb
c1ab3eab69 Polish 2018-06-04 15:02:06 -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
Phillip Webb
ef5301d079 Add saaj and jax-ws dependencies for Java 9 build
Add test dependencies for saaj-impl and jax-ws since Java 9+ no longer
includes them.

See gh-1270
2018-06-04 12:16:30 -07:00
Phillip Webb
1d35b629bb Merge branch '2.0.x' 2018-06-04 11:02:06 -07: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
Brian Clozel
bd8106d77f Upgrade to Spring Framework 5.1
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.

Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.

See gh-13321
2018-06-04 18:59:17 +02:00
Stephane Nicoll
93396aef51 Polish 2018-06-04 17:50:29 +02:00
Andy Wilkinson
d0ce919d8c Merge branch '2.0.x' 2018-06-04 16:30:23 +01: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
Stephane Nicoll
8bcea0d8cc Polish "Add auto-configuration for WebServiceTemplate"
Closes gh-1270
2018-06-04 12:27:29 +02:00
Stephane Nicoll
ef9c1a8e35 Extract ClientHttpRequestFactory detection to its own class
See gh-12707
2018-06-04 11:12:02 +02:00
dnosan
c9df1c551a Add auto-configuration for WebServiceTemplate
See gh-12707
2018-06-04 11:12:02 +02:00
Stephane Nicoll
283ceaa071 Merge branch '2.0.x' 2018-06-04 10:32:21 +02:00
dreis2211
8bb7b8af51 Remove usage of deprecated Matchers class
Closes gh-13345
2018-06-04 10:31:25 +02:00
Stephane Nicoll
d924c89525 Merge branch '2.0.x' 2018-06-03 16:57:34 +02:00
dreis2211
29605bacd2 Polish stream creation in some PropertySources
Closes gh-13343
2018-06-03 16:56:51 +02:00
Madhura Bhave
37a7457f36 Polish 2018-06-01 15:02:46 -07:00
Madhura Bhave
458d574d1f Merge branch '2.0.x' 2018-06-01 14:59:27 -07: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
Stephane Nicoll
bc47bf44a9 Merge branch '2.0.x' 2018-06-01 09:26:29 +02:00
Johnny Lim
6b0ce46491 Polish
Closes gh-13320
2018-06-01 09:22:20 +02:00
Madhura Bhave
817c228906 Merge branch '2.0.x' 2018-05-31 16:53:51 -07:00
Madhura Bhave
0afd947350 BindFailureAnalyzer should show original failure message
Fixes gh-13122
2018-05-31 16:51:42 -07:00
Andy Wilkinson
cff5c1ec72 Merge branch '2.0.x' 2018-05-31 13:42:23 +01: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