Commit Graph

26597 Commits

Author SHA1 Message Date
Phillip Webb
9a1a2ca613 Merge branch '2.2.x'
Closes gh-21448
2020-05-13 23:28:29 -07:00
Phillip Webb
5eabb0400c Merge branch '2.1.x' into 2.2.x
Closes gh-21447
2020-05-13 23:01:02 -07:00
Phillip Webb
d7c7ca31f3 Upgrade to spring-javaformat 0.0.22
Closes gh-21446
2020-05-13 23:00:18 -07:00
Stephane Nicoll
f1c2dd6196 Upgrade to Spring Integration 5.3.0.RELEASE
Closes gh-21385
2020-05-14 07:34:45 +02:00
Stephane Nicoll
d12ed468c8 Upgrade to Spring Session Dragonfruit-RELEASE
Closes gh-21386
2020-05-14 07:34:09 +02:00
Phillip Webb
fd505e516f Merge branch '2.2.x'
Closes gh-21444
2020-05-13 19:11:29 -07:00
Phillip Webb
49a21ded7a Create endpoint beans as late as possible
Update `EndpointDiscoverer` so that `@Endpoint` and `@EndpointExtension`
beans are created as late as possible.

Prior to this commit, endpoint beans and extension beans would be
created during the discovery phase which could cause early bean
initialization. The problem was especially nasty when using an embedded
servlet container since `ServletEndpointRegistrar` is loaded as the
container is initialized. This would trigger discovery and load all
endpoint beans, including the health endpoint, and all health indicator
beans.

Fixes gh-20714
2020-05-13 19:10:54 -07:00
Madhura Bhave
5acd115cb3 Add redis sentinel password property
Closes gh-21353
2020-05-13 16:55:51 -07:00
Phillip Webb
038ae93406 Update copyright year of changed files 2020-05-13 16:48:51 -07:00
Phillip Webb
12381467da Polish 2020-05-13 16:48:51 -07:00
Madhura Bhave
4d521e712f Merge branch '2.2.x' 2020-05-13 13:55:44 -07:00
Madhura Bhave
27ada029b5 Revert "Expose property to configure OAuth2 provider configurationMetadata"
This reverts commit 7b79029949.

See gh-21375
2020-05-13 13:53:46 -07:00
Andy Wilkinson
6a3dec438c Upgrade to Spring Kafka 2.5.0.RELEASE
Closes gh-21387
2020-05-13 20:43:09 +01:00
Phillip Webb
6a1f61c1bf Merge branch '2.2.x' 2020-05-13 12:23:10 -07:00
Phillip Webb
daed512076 Restore getUseRelativeRedirects in deprecated form
Restore the `getUseRelativeRedirects` method with a `Boolean` object
result and introduce `isUseRelativeRedirects` for the primitive boolean
variant.

See gh-20796
2020-05-13 11:36:24 -07:00
Phillip Webb
5157a75119 Polish 2020-05-13 11:36:02 -07:00
Andy Wilkinson
9be7fa8e1f Upgrade to XMLUnit 2.7.0
Closes gh-21419
2020-05-13 17:50:23 +01:00
Andy Wilkinson
8b6cdbb977 Deregister JDBC drivers when deployed war's ServletContext is destroyed
Closes gh-21221
2020-05-13 17:46:37 +01:00
Andy Wilkinson
9e569cf1b0 Remove non-user-facing packages from the javadoc
Closes gh-20517
2020-05-13 16:57:01 +01:00
Stephane Nicoll
a09ef94517 Merge pull request #21378 from dreis2211
* pr/21378:
  Upgrade to Testcontainers 1.14.1

Closes gh-21378
2020-05-13 17:44:32 +02:00
dreis2211
1c7f2d6ea6 Upgrade to Testcontainers 1.14.1
See gh-21378
2020-05-13 17:43:46 +02:00
Andy Wilkinson
0ef7f909b8 Disable generation of Gradle metadata for spring-boot-dependencies
Gradle's metadata for a platform does not provide a way to define
exclusions in the same way that can be done in <dependencyManagement>
in a Mavne bom. This means that Gradle 6 users lose the exclusions
that are defined in the pom as Gradle 6 will use the metadata rather
than the pom.

Until such a time as Gradle's metadata supports the configuration of
such exclusions we can avoid the problem by disabling the metadata's
publication.

Fixes gh-21350
2020-05-13 16:36:59 +01:00
Andy Wilkinson
4169724b86 Disable test that is flaky due to Reactor Netty problem
See gh-21437
2020-05-13 14:59:05 +01:00
Stephane Nicoll
a5f826fc78 Fix typo 2020-05-13 15:57:29 +02:00
Stephane Nicoll
f43419054d Include all deprecated properties in migration report
This commit expands the migration check to all deprecated properties,
not only the ones that have been effectively removed. This provides more
information upfront, including keys that still work in the current
release but will need to be renamed sooner than later anyway.

Closes gh-21425
2020-05-13 15:56:06 +02:00
Stephane Nicoll
786dae5d9a Use "release notes" in message as it is more generic 2020-05-13 15:44:16 +02:00
Stephane Nicoll
23c5549832 Polish 2020-05-13 15:39:44 +02:00
Andy Wilkinson
a03426af57 Configure the Asciidoctor revnumber in a central location
See gh-20934
2020-05-13 08:16:59 +01:00
Phillip Webb
0607af870d Improve ConfigurationPropertySource performance
Further improve the performance of `containsDescendantOf` by using
a Map to limit the number of candidates that need checking.

Closes gh-21416
2020-05-12 20:17:06 -07:00
Phillip Webb
4af6e7ff99 Improve ConfigurationPropertySource performance
Attempt to improve the performance of the `ConfigurationPropertySource`
adapters `containsDescendantOf` method. The method now operates on
arrays rather than iterators and reduces the inner for-loop when
possible.

See gh-21416
2020-05-12 16:44:57 -07:00
Madhura Bhave
376098d080 Set asciidoctor revnumber to null
Closes gh-20934
2020-05-12 14:58:38 -07:00
Andy Wilkinson
4c4097a29b Address flakiness in TomcatServletWebServerFactoryTests 2020-05-12 22:41:56 +01:00
Andy Wilkinson
8cf56069d2 Allow more time for shutdown result callback to be received
5 seconds isn't always sufficient, particularly on CI where the timing
can be quite variable.
2020-05-12 22:25:41 +01:00
Scott Frederick
90ce472252 Support local socket path in DOCKER_HOST
Prior to this commit, if a DOCKER_HOST environment variable was present
when attempting to communicate with a Docker daemon, it was assumed
that the value of that variable was an address that could be used to
create an HTTP connection to a remote daemon. In some cases, the value
of the variable is the path to a local socket file, which would cause
the HTTP connection to fail.

This commit adds additional validation of the value of the DOCKER_HOST
environment variable to determine whether it is a remote address or
a local socket file and create the appropriate connection type.

Fixes gh-21173
2020-05-12 16:11:27 -05:00
Andy Wilkinson
86e6ec04b2 Fix hang caused by race condition in test for reset of kept-alive connection
Previously, a race between the server starting to reject requests
on a kept-alive connection and the request reaching the blocking
servlet could result in a response never being sent.

This commit updates the test to disable blocking once graceful
shutdown with an in-flight request has being. Awaitility is then used
to make a request on an idle kept-alive connection until it fails
due to the connection reset. This may not happen immediately due to
the aforementioned race.
2020-05-12 22:10:23 +01:00
Madhura Bhave
453ca01338 Merge branch '2.2.x'
Closes gh-21429
2020-05-12 13:43:17 -07:00
Madhura Bhave
7b79029949 Expose property to configure OAuth2 provider configurationMetadata
Closes gh-21375
2020-05-12 13:42:03 -07:00
Andy Wilkinson
0bb687717c Auto-configure a lifecycle processor with configurable timeout
Closes gh-21347
2020-05-12 19:59:52 +01:00
Andy Wilkinson
240898121f Use SmartLifecycle for graceful web server shutdown
Closes gh-21325
2020-05-12 19:59:52 +01:00
Andy Wilkinson
c42571ba40 Consolidate Undertow WebServers and simplify their constructors
Closes gh-21391

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2020-05-12 19:59:52 +01:00
Scott Frederick
0d00947735 Closes gh-21428 2020-05-12 13:50:16 -05:00
Scott Frederick
6b8d08a6e3 Handle exceptions in management context
Prior to this commit, details about an exception would get dropped when
the management context was separate from the application context and
an actuator endpoint threw a binding exception.

This commit adds some logic to capture the exception so the management
context error handlers can add the appropriate attributes to the error
response.

Fixes gh-21036
2020-05-12 11:44:28 -05:00
Stephane Nicoll
64aac04862 Merge pull request #21390 from izeye
* pr/21390:
  Fix ClientHttpConnectorConfigurationTests.shouldApplyHttpClientMapper()

Closes gh-21390
2020-05-12 17:17:23 +02:00
Johnny Lim
6022d4cac7 Fix ClientHttpConnectorConfigurationTests.shouldApplyHttpClientMapper()
See gh-21390
2020-05-12 17:13:27 +02:00
Stephane Nicoll
deb2322457 Remove wrong replacement key in deprecated metadata 2020-05-12 15:37:50 +02:00
Brian Clozel
7787fd94f3 Merge remote-tracking branch 'origin/2.2.x'
Closes gh-21422
2020-05-12 14:47:03 +02:00
Brian Clozel
3c666ac4c8 Upgrade to RSocket 1.0.0
Closes gh-21421
2020-05-12 14:44:35 +02:00
Stephane Nicoll
8cc2e32482 Upgrade to Spring Data Neumann-RELEASE
Closes gh-21383
2020-05-12 14:03:24 +02:00
Stephane Nicoll
b6b0452d5f Upgrade to Spring HATEOAS 1.1.0.RELEASE
Closes gh-21384
2020-05-12 14:02:25 +02:00
Stephane Nicoll
a6efe77a0c Polish "Calculate hashCode only once in ConfigurationPropertyName"
See gh-21394
2020-05-12 13:10:03 +02:00