Andy Wilkinson
ff9d0cf49b
Merge branch '2.1.x'
...
Closes gh-17588
2019-07-19 15:44:19 +01:00
Andy Wilkinson
74f0e42c98
Make it clearer when there will be no auto-configured MessageSource
...
Closes gh-17485
2019-07-19 15:44:00 +01:00
Andy Wilkinson
78871d7a5d
Tighten up sourceDocumentExtensions used for single and multi-page docs
...
Previously, the sourceDocumentExtension used for the single-page
documentation was htmlsingleadoc and for the multi-page docs they
were adoc and htmladoc. When finding source files to render, the
Asciidoctor Maven Plugin looks for files with a name that ends with
one of the configured extensions. This resulted in the
index.htmlsingleadoc file matching the adoc extention in the
multi-page configuration in addition to the intended match for the
index.htmladoc. As a result both the single-page and multi-page
indexes were rendered when rendering the multi-page documentation.
In addition to this unwanted rendering, if the single-page index was
rendered after the multi-page index, the multi-page index would be
overwritten by the single-page index, leaving the multi-page docs with
the wrong index file. Asciidoctor uses File.listFiles() during its
source file discovery which is documented as having no guarantee
that the resulting array will be in any specific order. As a result,
there was also no guarantee about which index we'd end up with.
Closes gh-17263
2019-07-19 14:55:10 +01:00
Andy Wilkinson
ea1dc85d50
Isolate Jackson2ObjectMapperBuilder mutation
...
Previously, Jackson2ObjectMapperBuilder was a singleton bean. This
meant that if it was injected and mutated in one injection point,
usage in a subsequent injection point would see the previous
injection point's mutation which can lead to unexpected failures.
This commit updates the auto-configuration of the builder to make it
a protoype bean. Mutation of the builder that is intended to apply
globally should be made using a customizer.
Closes gh-17477
2019-07-19 13:57:55 +01:00
Andy Wilkinson
c7d2799f4e
Add configuration property for DispatcherServlet event publishing
...
Closes gh-17500
2019-07-19 13:11:19 +01:00
Stephane Nicoll
afe3ab7517
Merge pull request #17587 from dreis2211
...
* pr/17587:
Polish "Adjust to changes in Spring AMQP 2.2 snapshots"
Adjust to changes in Spring AMQP 2.2 snapshots
Closes gh-17587
2019-07-19 13:31:04 +02:00
Stephane Nicoll
3dd5426ea5
Polish "Adjust to changes in Spring AMQP 2.2 snapshots"
...
See gh-17587
2019-07-19 13:20:25 +02:00
dreis2211
e71a417399
Adjust to changes in Spring AMQP 2.2 snapshots
...
See gh-17587
2019-07-19 13:19:57 +02:00
Stephane Nicoll
e5ca9df478
Merge branch '2.1.x'
2019-07-19 11:33:16 +02:00
Stephane Nicoll
8eb6886388
Fix code formating
2019-07-19 11:29:12 +02:00
Stephane Nicoll
cc5df880c7
Start building against Spring Integration 5.2 snapshots
...
See gh-17584
2019-07-19 11:26:43 +02:00
Stephane Nicoll
a88e231c75
Start building against Spring AMQP 2.2 snapshots
...
See gh-17583
2019-07-19 11:26:43 +02:00
Stephane Nicoll
00b29b265c
Merge branch '2.1.x'
2019-07-19 11:26:35 +02:00
Stephane Nicoll
e6a5895c05
Start build against Spring Session Bean snapshots
...
See gh-17581
2019-07-19 11:13:43 +02:00
Stephane Nicoll
32e00d5dd2
Start building against Spring Data Lovelace snapshots
...
See gh-17353
2019-07-19 11:11:42 +02:00
Stephane Nicoll
1d4e9cb6a4
Start building against Spring Framework 5.1 snapshots
...
See gh-17351
2019-07-19 11:10:58 +02:00
Andy Wilkinson
3dc20ff934
Recommend third-party tracing/observability solutions
...
Closes gh-17047
2019-07-19 10:04:27 +01:00
Stephane Nicoll
08afbe286c
Merge branch '2.1.x'
...
Closes gh-17580
2019-07-19 10:35:01 +02:00
Stephane Nicoll
b8d92cb0ae
Fix @DataJdbcTest to be transactional as advertized
...
Closes gh-17513
2019-07-19 10:33:59 +02:00
Stephane Nicoll
5903e9a57a
Polish
2019-07-19 10:33:52 +02:00
Andy Wilkinson
741d8735d2
Merge branch '2.1.x'
...
Closes gh-17576
2019-07-18 17:57:07 +01:00
Andy Wilkinson
ab364b07c7
Merge pull request #17508 from dreis2211
...
* gh-17508:
Remove unused java-statsd-client dependencies
Closes gh-17508
2019-07-18 17:55:42 +01:00
dreis2211
43833c7bf0
Remove unused java-statsd-client dependencies
...
See gh-17508
2019-07-18 17:54:48 +01:00
Andy Wilkinson
bc14dce13c
Merge pull request #17049 from sbrannen
...
* gh-17049:
Polish "Polish OutputCapture and its JUnit Jupiter extension"
Polish OutputCapture and its JUnit Jupiter extension
Closes gh-17049
2019-07-18 17:47:04 +01:00
Andy Wilkinson
41957ec2ad
Polish "Polish OutputCapture and its JUnit Jupiter extension"
...
See gh-17049
2019-07-18 17:46:56 +01:00
Sam Brannen
e1c595a67f
Polish OutputCapture and its JUnit Jupiter extension
...
- Polish Javadoc
- Improve error message in OutputCapture
- Use ExtensionContext.Store in OutputCaptureExtension
See gh-17049
2019-07-18 17:46:55 +01:00
Stephane Nicoll
b092cb7b7f
Merge pull request #17277 from marcrohlfs
...
* pr/17277:
Polish "Make layout parameter available as a user property"
Make layout parameter available as a user property
Closes gh-17277
2019-07-18 18:20:11 +02:00
Stephane Nicoll
4ce9c6edb3
Polish "Make layout parameter available as a user property"
...
See gh-17277
2019-07-18 18:20:06 +02:00
Marc Rohlfs
d2e34e6b07
Make layout parameter available as a user property
...
This commit allows the layout parameter of the Maven repackage goal to
be set from the command line.
See gh-17277
2019-07-18 18:20:06 +02:00
Andy Wilkinson
cc85746942
Merge branch '2.1.x'
...
Closes gh-17575
2019-07-18 17:17:05 +01:00
Andy Wilkinson
173ff87b98
Merge pull request #17538 from adavid9
...
* gh-17538:
Polish "Hide loader classes from Tomcat's ServletContext resource paths"
Hide loader classes from Tomcat's ServletContext resource paths
Closes gh-17538
2019-07-18 17:06:35 +01:00
Andy Wilkinson
591250f75e
Polish "Hide loader classes from Tomcat's ServletContext resource paths"
...
See gh-17538
2019-07-18 17:05:31 +01:00
adavid9
a81325bbbc
Hide loader classes from Tomcat's ServletContext resource paths
...
See gh-17538
2019-07-18 17:05:27 +01:00
Andy Wilkinson
0f105f7471
Fail fast if spring.config.location uses unknown file extension
...
Closes gh-17241
2019-07-18 15:34:49 +01:00
Stephane Nicoll
572a436d1e
Merge pull request #17510 from dirkdeyne
...
* pr/17510:
Polish "Add support for configuring Tomcat's relaxed path and query chars"
Add support for configuring Tomcat's relaxed path and query chars
Closes gh-17510
2019-07-18 16:08:55 +02:00
Stephane Nicoll
dd2f20fcd2
Polish "Add support for configuring Tomcat's relaxed path and query chars"
...
See gh-17510
2019-07-18 16:00:06 +02:00
dirkdeyne
1fee797af7
Add support for configuring Tomcat's relaxed path and query chars
...
See gh-17510
2019-07-18 15:04:29 +02:00
Stephane Nicoll
55e8a9789a
Merge pull request #17499 from nosan
...
* pr/17499:
Polish "Add HealthIndicator for Hazelcast"
Add HealthIndicator for Hazelcast
Closes gh-17499
2019-07-18 15:01:49 +02:00
Stephane Nicoll
be988d7072
Polish "Add HealthIndicator for Hazelcast"
...
See gh-17499
2019-07-18 15:00:53 +02:00
Dmytro Nosan
fca5a2b824
Add HealthIndicator for Hazelcast
...
See gh-17499
2019-07-18 14:58:18 +02:00
Stephane Nicoll
bc8514cd2f
Merge pull request #17557 from dreis2211
...
* pr/17557:
Remove testsupport.assertj package
Closes gh-17557
2019-07-18 14:27:17 +02:00
dreis2211
2038fac825
Remove testsupport.assertj package
...
See gh-17557
2019-07-18 14:20:28 +02:00
Andy Wilkinson
3bf5cf1124
Merge branch '2.1.x'
...
Closes gh-17562
2019-07-18 07:22:24 +01:00
Andy Wilkinson
b725c60177
Deprecate DeploymentInfo customization with reactive Undertow
...
Fixes gh-17555
2019-07-18 06:54:38 +01:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
Phillip Webb
30b5ba87ae
Merge branch '2.0.x' into 2.1.x
2019-07-17 21:48:01 +01:00
Phillip Webb
fd67f7ba3f
Merge branch '1.5.x' into 2.0.x
2019-07-17 21:47:04 +01:00
Phillip Webb
8843c11a28
Update copyright header of changed files
2019-07-17 21:44:01 +01:00
Phillip Webb
d567261790
Polish
2019-07-17 21:38:44 +01:00
Andy Wilkinson
dad7fb4f6d
Add NettyServerCustomizer beans to the auto-configured factory
...
Closes gh-17556
2019-07-17 14:58:11 +01:00