Commit Graph

17372 Commits (60457f1d9ad9984d3da04dec0600ce3de875deae)
 

Author SHA1 Message Date
Phillip Webb 845c20f13b Merge branch '2.0.x' 7 years ago
Phillip Webb e3bf518819 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 6c7289b822 Allow META-INF/resources in WAR classes folder
Update `TomcatResources` so that `META-INF/resources` folders in
`src/main/resources` no longer fail with a "URI is not hierarchical"
exception.

Closes gh-13265
7 years ago
Madhura Bhave 26b826e017 Merge branch '2.0.x' 7 years ago
Madhura Bhave d0a2a8e929 Document ConfigurableServletWebServerFactory variants
Closes gh-13083
7 years ago
Brian Clozel 56ab0da287 Support EncodedResourceResolver in resource chain
As of https://jira.spring.io/browse/SPR-16381, Spring Framework now
supports both gzip and Brotli as compression formats for static
resources resolved by the resource chain.

The `GzipResourceResolver` has been deprecated and replaced by the
`EncodedResourceResolver`. This commit uses this new resolver and adapts
the configuration key to reflect those changes.

Note that this resolver is now configured ahead of the
`VersionResourceResolver`.

Closes gh-13242
7 years ago
Stephane Nicoll ace5ba5984 Merge pull request #13364 from nosan:http-webservice-sender-duration-int
* pr/13364:
  Use Duration in HttpWebServiceMessageSenderBuilder
7 years ago
Dmytro Nosan 5b159a6bd0 Use Duration in HttpWebServiceMessageSenderBuilder
Closes gh-13364
7 years ago
Stephane Nicoll 909722f143 Polish 7 years ago
Stephane Nicoll 638d4d94f4 Merge pull request #13355 from nosan:duration-instead-of-timeout
* pr/13355:
  Polish "Add duration support for setConnectTimeout and setReadTimeout"
  Add duration support for setConnectTimeout and setReadTimeout
  Polish "Add duration support for setConnectTimout and setReadTimeout"
7 years ago
Stephane Nicoll e9c3df4ad2 Polish "Add duration support for setConnectTimeout and setReadTimeout"
Closes gh-13355
7 years ago
Dmytro Nosan 36f3c1b883 Add duration support for setConnectTimeout and setReadTimeout
See gh-13355
7 years ago
Stephane Nicoll 8691d01aaf Polish "Add duration support for setConnectTimout and setReadTimeout"
See gh-13355
7 years ago
Stephane Nicoll 83f7df920b Merge branch '2.0.x' 7 years ago
Stephane Nicoll bf56ec496d Polish 7 years ago
Stephane Nicoll 47634f5587 Polish 7 years ago
Stephane Nicoll 1901008d6f Merge branch '2.0.x' 7 years ago
Stephane Nicoll fff06822dc Polish 7 years ago
Stephane Nicoll d84e2b90d7 Fix wrong usage of ManagementContextConfiguration
Closes gh-13366
7 years ago
Stephane Nicoll df469abdb0 Merge pull request #13214 from eddumelendez:gh-13176
* pr/13214:
  Polish "Add support to set visibility via JacksonProperties"
  Add support to set visibility via JacksonProperties
7 years ago
Stephane Nicoll 51cf4e5d74 Polish "Add support to set visibility via JacksonProperties"
Closes gh-13214
7 years ago
Eddú Meléndez ca3659059a Add support to set visibility via JacksonProperties
This commit allows to configure properties visibility.

See gh-13214
7 years ago
Stephane Nicoll 3248400665 Merge branch '2.0.x' 7 years ago
Stephane Nicoll b4f8361989 Make JMX metrics domain configurable
Closes gh-13356
7 years ago
Stephane Nicoll 48c078f0d0 Merge pull request #13358 from nosan:rest-template-customizers
* pr/13358:
  Polish "RestTemplateCustomizers should be applied at the end"
  RestTemplateCustomizers should be applied at the end
7 years ago
Stephane Nicoll c612ed2695 Polish "RestTemplateCustomizers should be applied at the end"
Closes gh-13358
7 years ago
Dmytro Nosan ce3420748f RestTemplateCustomizers should be applied at the end
See gh-13358
7 years ago
Phillip Webb ade1397ea2 Merge branch '2.0.x' 7 years ago
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.
7 years ago
Phillip Webb 8eba37500c Upgrade to spring-javaformat 0.0.3 7 years ago
Phillip Webb 2274ac5214 Move spring-javaformat plugins to root POM
Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
7 years ago
Phillip Webb d47e7ebb5b Merge branch '2.0.x' 7 years ago
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
7 years ago
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