Commit Graph

6095 Commits

Author SHA1 Message Date
Phillip Webb
01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb
c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Phillip Webb
cdf43a7489 Polish 2019-07-14 19:42:56 +01:00
Phillip Webb
8d4a2add63 Allow OutputCaptureRule to be used with AssertJ
Update `OutputCaptureRule` so that it now implements
`CapturedOutput` and can be used directly with AssertJ.

Closes gh-17512
2019-07-14 19:42:42 +01:00
Stephane Nicoll
79b29396d0 Merge branch '2.1.x'
Closes gh-17506
2019-07-14 13:14:21 +02:00
dreis2211
e9203a280c Test the Gradle Plugin against Gradle 5.5.1
See gh-17496
2019-07-14 13:13:17 +02:00
dreis2211
82047a2544 Polish
See gh-17505
2019-07-14 11:38:40 +02:00
Phillip Webb
b7e092e821 Fix upstream RSocket method renames
Align with the recent upstream Spring Framework changes triggered by
their issue #23170.
2019-07-13 14:01:04 +01:00
Madhura Bhave
6164e3efe8 Merge branch '2.1.x' 2019-07-10 18:26:25 -07:00
Madhura Bhave
aebb60d8b8 Fix tests
Setting the log file name to a random value in smoke tests
doesn't work because the logger context has already been initialized.
2019-07-10 18:14:58 -07:00
Madhura Bhave
d590c3ed10 Merge branch '2.1.x'
Closes gh-17486
2019-07-10 15:32:22 -07:00
Madhura Bhave
773dda3d55 Log file location should be evaluated just once
Using a random value for the logfile name caused
the logfile endpoint to return a 404 as the name
was resolved from the environment on every request.
This commit registers a bean for LogFile which is then
used by the logfile endpoint.

Fixes gh-17434
2019-07-10 14:46:09 -07:00
Andy Wilkinson
dc0432665b Use ephemeral ports rather than 8080 in our tests
Closes gh-17025
2019-07-10 17:22:40 +01:00
Brian Clozel
906f7637ed Add synchronoss multipart dependency in webflux starter
Fixes gh-17484
2019-07-10 16:19:39 +02:00
Dmytro Nosan
8dd9c6baa1 Allow build.time to be disabled so BuildInfoMojo's output is repeatable
See gh-17390
2019-07-10 13:40:17 +01:00
Andy Wilkinson
1fffe0ab3e Merge branch '2.1.x'
Closes gh-17482
2019-07-10 13:37:32 +01:00
Dmytro Nosan
93d0427fb5 Polish AbstractDependsOnBeanFactoryPostProcessor
See gh-17480
2019-07-10 13:36:57 +01:00
Andy Wilkinson
47f4bb0d64 Merge branch '2.1.x'
Closes gh-17481
2019-07-10 13:30:10 +01:00
Andy Wilkinson
f753c31988 Polish "Set up MongoClient beans' dependencies by type rather than name"
See gh-16627
2019-07-10 13:13:19 +01:00
ielatif
39f1039425 Set up MongoClient beans' dependencies by type rather than name
See gh-16627
2019-07-10 13:10:41 +01:00
Brian Clozel
32ecb63002 Add reactor-tools dependency for javadoc generation
See gh-17128
2019-07-10 13:59:45 +02:00
Andy Wilkinson
6adcd75481 Merge branch '2.1.x'
Closes gh-17479
2019-07-10 12:37:40 +01:00
Andy Wilkinson
80650f485d Polish "Allow depended on beans to be identified by type"
See gh-17020
2019-07-10 12:25:57 +01:00
Dmytro Nosan
9923ffe9bd Allow depended on beans to be identified by type
Prior to this commit, `AbstractDependsOnBeanFactoryPostProcessor`
could only identify depended on beans by name.

See gh-17020
2019-07-10 12:25:57 +01:00
Stephane Nicoll
acfb7f28f4 Merge branch '2.1.x'
Closes gh-17478
2019-07-10 12:49:13 +02:00
Stephane Nicoll
852f4a280c Fix supported java version range in documentation
Closes gh-17476
2019-07-10 12:48:50 +02:00
Brian Clozel
3c28622ebc Add support for reactor-tools debug agent
The `reactor-tools` dependency now brings a new Reactor Debug Agent
which instruments loaded classes for better Reactor stacktraces.
This commit removes the `spring.reactor.stacktrace-mode.enabled`
configuration property since the related Reactor Hook is about to be
removed.
As a replacement, we're introducing `spring.reactor.debug-agent.enabled`
which tells whether the Reactor Debug Agent should be loaded, given that
the `reactor-tools` dependency is available. This option is enabled by
default, since adding the dependency on classpath is a strong signal
already.

Fixes gh-17128
2019-07-10 12:06:26 +02:00
Brian Clozel
b1a3849b27 Disable Jackson XML support in RSocket codecs
Prior to this commit, having the `spring-boot-starter-rsocket` and the
`jackson-dataformat-xml` dependencies on classpath would result in a
`ClassCastException` when the RSocket auto-configuration tries to
configure Jackson CBOR codecs for RSocket strategies.

This commit disables the Jackson XML support for the CBOR codec in
RSocket.

Fixes gh-17425
2019-07-10 12:06:26 +02:00
Brian Clozel
2830847344 Optimize reactor operators in actuator support
This commit uses native Reactor operators `Mono.fromCallable` and
`subscribeOn` for better performance and support.

Fixes gh-17452
2019-07-10 12:06:26 +02:00
dreis2211
25586a2e23 Use Assertions.contentOf() where possible
See gh-17444
2019-07-10 06:40:52 +01:00
Johnny Lim
255469b82f Add Javadoc @since tags for new additional Tomcat connectors methods
See gh-17473
2019-07-10 06:32:16 +01:00
dreis2211
32549cfc85 Remove folder that only contains package-info
See gh-17471
2019-07-10 06:24:40 +01:00
Andy Wilkinson
be3a737532 Merge branch '2.1.x'
Closes gh-17470
2019-07-09 20:05:30 +01:00
Andy Wilkinson
6748b20863 Prevent JUL loggers from being GCed once their level has been set
Fixes gh-17217
2019-07-09 19:51:55 +01:00
Stephane Nicoll
c7311631c0 Merge branch '2.1.x'
Closes gh-17467
2019-07-09 18:01:28 +02:00
Stephane Nicoll
3fb15a502b Remove outdated reference to Guava in the reference guide
Closes gh-17446
2019-07-09 18:00:57 +02:00
Dmytro Nosan
fd9e8503bb Polish BatchAutoConfiguration
See gh-17462
2019-07-09 16:56:16 +01:00
Andy Wilkinson
edff0f87e2 Merge branch '2.1.x'
Closes gh-17466
2019-07-09 16:52:13 +01:00
Andy Wilkinson
acd9b61c8e Make Batch JPA auto-configuration back off without a DataSource
Fixes gh-17465
2019-07-09 15:46:45 +01:00
Andy Wilkinson
a40bc64f6e Merge branch '2.1.x'
Closes gh-17463
2019-07-09 15:14:41 +01:00
Andy Wilkinson
c5241f0e82 Remove accidental usage of com.hazelcast.util.Base64
Closes gh-17461
2019-07-09 15:03:31 +01:00
Andy Wilkinson
d93c79316d Align with body method changes in RequestBodySpec
Closes gh-17460
2019-07-09 12:13:23 +01:00
Andy Wilkinson
3e6c15c451 Deprecate auto-configuration for Joda-Time
Closes gh-17419
2019-07-09 11:52:36 +01:00
Andy Wilkinson
9f253603db Drop -d option from CLI as it was not POSIX compliant
Closes gh-16663
2019-07-09 09:48:49 +01:00
Johnny Lim
426ef749db Polish
See gh-17413
2019-07-09 07:40:30 +02:00
Madhura Bhave
939a247d87 Merge pull request #17448 from izeye
* pr/17448:
  Fix typo

Closes gh-17448
2019-07-08 16:04:35 -07:00
Johnny Lim
e42f4d0279 Fix typo
See gh-17448
2019-07-08 16:04:12 -07:00
Andy Wilkinson
b0626bca32 Merge branch '2.1.x'
Closes gh-17454
2019-07-08 15:54:04 +01:00
Andy Wilkinson
02bea78229 Retain as much Batch auto-config as possible without Spring JDBC
Closes gh-17451
2019-07-08 15:35:16 +01:00
Andy Wilkinson
5b7c0e0c58 Merge branch '2.1.x'
Closes gh-17453
2019-07-08 14:44:34 +01:00