Commit Graph

17139 Commits (60b109cf0cec58e73e9270bbcde23086750003d4)
 

Author SHA1 Message Date
Phillip Webb a12baed5de Merge branch '2.0.x' 7 years ago
Phillip Webb c1ab3eab69 Polish 7 years ago
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
7 years ago
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
7 years ago
Brian Clozel 87af880446 Reactor BOM is now declaring reactor-netty 0.8
See gh-13321
7 years ago
Madhura Bhave 360d392eb1 Merge branch '2.0.x' 7 years ago
Madhura Bhave 60a4d67b13 Handle special characters in TraceableHttpServletRequest
Fixes gh-13273
7 years ago
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
7 years ago
Andy Wilkinson ebb99d1c20 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 1a0dfa06ab Add log4j-jul to Log4j 2 starter
Closes gh-12659
7 years ago
Phillip Webb 1d35b629bb Merge branch '2.0.x' 7 years ago
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
7 years ago
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
7 years ago
Andy Wilkinson 0f321abe66 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 70c0d6a005 Test the Gradle plugin against Gradle 4.8
Closes gh-13359
7 years ago
Andy Wilkinson 00449bef6a Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
Closes gh-12631
7 years ago
Andy Wilkinson aee6aecfc2 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 624946a779 Upgrade to Maven Invoker Plugin 3.1.0
Closes gh-12687
7 years ago
Stephane Nicoll 5218e15b79 Merge pull request #13351 from izeye:patch-49
* pr/13351:
  Add "Managed dependency upgrade" section
7 years ago
Johnny Lim 8be2fe79cb Add "Managed dependency upgrade" section
Closes gh-13351
7 years ago
Stephane Nicoll 93396aef51 Polish 7 years ago
Andy Wilkinson b38f60a631 Merge branch '2.0.x' 7 years ago
Andy Wilkinson d54072e0a8 More accurately document buildInfo's effect on up-to-date checking
Closes gh-13152
7 years ago
Stephane Nicoll ee158df993 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 9e871816d6 Merge pull request #13331 from nosan:gh-13329
* pr/13331:
  Auto-configure jOOQ with TransactionListenerProvider
7 years ago
Dmytro Nosan 20003489be Auto-configure jOOQ with TransactionListenerProvider
Closes gh-13331
7 years ago
Andy Wilkinson d0ce919d8c Merge branch '2.0.x' 7 years ago
Andy Wilkinson 0df37b917b Ignore unresolvable placeholders during property binding
Closes gh-13122
7 years ago
Andy Wilkinson 9c8d2c8016 Improve analysis of bind failures caused by a conversion failure
Closes gh-13357
7 years ago
Andy Wilkinson 92629ac5af Merge branch '2.0.x' 7 years ago
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
7 years ago
Stephane Nicoll 4a6102091e Merge branch '2.0.x' 7 years ago
Stephane Nicoll bc59434bcc Start building against Spring Framework 5.0.7 snapshots
See gh-13353
7 years ago
Stephane Nicoll 0da425794e Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 628cce567f Start building against Spring Framework 4.3.18 snapshots
See gh-13352
7 years ago
Stephane Nicoll 99f0270fce Merge branch '2.0.x' 7 years ago
Stephane Nicoll a9b2826c26 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll a562cb5d6c Merge pull request #13338 from mtheiss:master
* pr/13338:
  Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
  Retrieve javax.cache.CacheManager using Bean ClassLoader
7 years ago
Stephane Nicoll c67aedd8bc Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
Closes gh-13338
7 years ago
Martin Theiss 76b9d0d243 Retrieve javax.cache.CacheManager using Bean ClassLoader
This commit uses the bean's classloader to retrieve the CacheManager to
prevent issues with off-heap serialization.

See gh-13338
7 years ago
Stephane Nicoll c973488c70 Merge pull request #12707 from nosan:feature/web-service-template
* pr/12707:
  Polish "Add auto-configuration for WebServiceTemplate"
  Extract ClientHttpRequestFactory detection to its own class
  Add auto-configuration for WebServiceTemplate
7 years ago
Stephane Nicoll 8bcea0d8cc Polish "Add auto-configuration for WebServiceTemplate"
Closes gh-1270
7 years ago
Stephane Nicoll ef9c1a8e35 Extract ClientHttpRequestFactory detection to its own class
See gh-12707
7 years ago
dnosan c9df1c551a Add auto-configuration for WebServiceTemplate
See gh-12707
7 years ago
Stephane Nicoll 283ceaa071 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 6be208ed04 Merge pull request #13345 from dreis2211:remove-deprecated-matcher
* pr/13345:
  Remove usage of deprecated Matchers class
7 years ago
dreis2211 8bb7b8af51 Remove usage of deprecated Matchers class
Closes gh-13345
7 years ago
Stephane Nicoll d924c89525 Merge branch '2.0.x' 7 years ago
Stephane Nicoll d5ccd43feb Merge pull request #13343 from dreis2211:property-source-stream-polish
* pr/13343:
  Polish stream creation in some PropertySources
7 years ago
dreis2211 29605bacd2 Polish stream creation in some PropertySources
Closes gh-13343
7 years ago