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
Andy Wilkinson
ea1139755d
Ensure that customizers registered multiple times are only called once
...
Closes gh-17264
2019-07-17 14:52:29 +01:00
Stephane Nicoll
62233a0750
Merge branch '2.1.x'
...
Closes gh-17554
2019-07-17 14:29:16 +02:00
Stephane Nicoll
b6ca1eadeb
Fix prefix for datasource metrics
...
Closes gh-17553
2019-07-17 14:28:12 +02:00
Stephane Nicoll
470e1d66a7
Merge pull request #17504 from ayudovin
...
* pr/17504:
Polish "Add metrics support for idle jdbc connections"
Add metrics support for idle jdbc connections
Closes gh-17504
2019-07-17 14:15:23 +02:00
Stephane Nicoll
56ce2b8e3f
Polish "Add metrics support for idle jdbc connections"
...
See gh-17504
2019-07-17 14:14:47 +02:00
ayudovin
9acc02b5cc
Add metrics support for idle jdbc connections
...
See gh-17504
2019-07-17 14:14:47 +02:00
Andy Wilkinson
808b373def
Merge branch '2.1.x'
...
Closes gh-17552
2019-07-17 12:45:48 +01:00
Andy Wilkinson
9dabc0e14d
Cleared deferred lines after each test
...
Previously, DeferredLinesWriter would collect MockMvc output from
every test that has executed. If a test eventually failed, the
output from every test up to including the one that had failed would
be output, rather than just the output for the test that has just
failed.
This commit clears the deferred lines after each test, thereby
ensuring that when a failure occurs only the lines from the failing
test are output.
Fixes gh-17551
2019-07-17 12:29:41 +01:00
Stephane Nicoll
9d85dbad66
Merge pull request #17537 from EugeneMsv
...
* pr/17537:
Polish "Add reference to amqp-rabbit-spring-boot-autoconfigure"
Add reference to amqp-rabbit-spring-boot-autoconfigure
Closes gh-17537
2019-07-17 11:31:27 +02:00
Stephane Nicoll
f32020aaad
Polish "Add reference to amqp-rabbit-spring-boot-autoconfigure"
...
See gh-17537
2019-07-17 11:30:57 +02:00
EugeneMsv
e632ea706d
Add reference to amqp-rabbit-spring-boot-autoconfigure
...
See gh-17537
2019-07-17 11:29:22 +02:00
Stephane Nicoll
cc6f321da4
Improve detection of NoSuchMethodError on Java 13
...
Closes gh-17544
2019-07-17 11:17:37 +02:00
Stephane Nicoll
3a49996dbd
Merge branch '2.1.x'
...
Closes gh-17547
2019-07-17 10:30:36 +02:00
Stephane Nicoll
a64317b114
Fix broken link to Spring Integration metrics section
...
Closes gh-17543
2019-07-17 10:26:40 +02:00
Andy Wilkinson
73f7a9318f
Merge branch '2.1.x'
...
Closes gh-17546
2019-07-17 09:07:28 +01:00
Andy Wilkinson
e84477cfe2
Only perform Quartz DataSource init when using JDBC store
...
Fixes gh-17545
2019-07-17 09:04:17 +01:00
Phillip Webb
74d00354f5
Refine BuildInfoMojo time property
...
Update `BuildInfoMojo` so that the time property now defaults to
`${session.request.startTime}` rather than the time the Mojo was
created. Also update javadoc to make it clear that any supplied
value will be passed to `Instant.parse`.
See gh-17390
2019-07-16 13:51:03 +01:00