Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Phillip Webb
ff36074401
Update copyright header for changed files
...
Effectively all files have been touched this year due to the nohttp
work.
2019-07-24 11:37:23 +01:00
Stephane Nicoll
5a019cf14a
Merge pull request #17567 from lihongmingming
...
* pr/17567:
Polish "Clarify description of "logging.file.max-history""
Clarify description of "logging.file.max-history"
Closes gh-17567
2019-07-24 11:36:37 +02:00
Stephane Nicoll
057ca8f6a8
Polish "Clarify description of "logging.file.max-history""
...
See gh-17567
2019-07-24 11:36:15 +02:00
lihongmingming
00a5528d7f
Clarify description of "logging.file.max-history"
...
See gh-17567
2019-07-24 11:36:15 +02:00
Stephane Nicoll
30fe10613d
Improve how to configure configuration keys of a custom starter
...
Closes gh-17573
2019-07-22 15:28:17 +02:00
Stephane Nicoll
300f07b2a8
Polish
2019-07-22 15:20:37 +02:00
Stephane Nicoll
3c7ac4fe7f
Polish
2019-07-22 13:17:51 +02:00
Stephane Nicoll
657411d8d1
Merge pull request #17531 from nosan
...
* pr/17531:
Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
Configure ActiveMQConnectionFactory properly without spring-jms
Closes gh-17531
2019-07-22 13:12:31 +02:00
Stephane Nicoll
1661da8774
Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
...
See gh-17531
2019-07-22 13:09:31 +02:00
Dmytro Nosan
77b52b993b
Configure ActiveMQConnectionFactory properly without spring-jms
...
See gh-17531
2019-07-22 13:08:42 +02:00
Stephane Nicoll
260acd05e8
Merge pull request #17590 from dreis2211
...
* pr/17590:
Cover more known Java versions in JavaVersion
Closes gh-17590
2019-07-22 10:26:46 +02:00
dreis2211
c2b6939ae1
Cover more known Java versions in JavaVersion
...
See gh-17590
2019-07-22 10:24:54 +02: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
Stephane Nicoll
8eb6886388
Fix code formating
2019-07-19 11:29:12 +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
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
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
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
b725c60177
Deprecate DeploymentInfo customization with reactive Undertow
...
Fixes gh-17555
2019-07-18 06:54:38 +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
Stephane Nicoll
b6ca1eadeb
Fix prefix for datasource metrics
...
Closes gh-17553
2019-07-17 14:28:12 +02: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
a64317b114
Fix broken link to Spring Integration metrics section
...
Closes gh-17543
2019-07-17 10:26:40 +02:00
Andy Wilkinson
e84477cfe2
Only perform Quartz DataSource init when using JDBC store
...
Fixes gh-17545
2019-07-17 09:04:17 +01:00
Stephane Nicoll
309329ace9
Merge pull request #17496 from dreis2211
...
* pr/17496:
Test the Gradle Plugin against Gradle 5.5.1
Closes gh-17496
2019-07-14 13:13:36 +02:00
dreis2211
e9203a280c
Test the Gradle Plugin against Gradle 5.5.1
...
See gh-17496
2019-07-14 13:13:17 +02: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
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
7854876608
Merge pull request #17480 from nosan
...
* gh-17480:
Polish AbstractDependsOnBeanFactoryPostProcessor
Closes gh-17480
2019-07-10 13:37:26 +01:00
Dmytro Nosan
93d0427fb5
Polish AbstractDependsOnBeanFactoryPostProcessor
...
See gh-17480
2019-07-10 13:36:57 +01:00
Andy Wilkinson
50fe7a0da5
Merge pull request #16627 from ielatif
...
* gh-16627:
Polish "Set up MongoClient beans' dependencies by type rather than name"
Set up MongoClient beans' dependencies by type rather than name
Closes gh-16627
2019-07-10 13:19:54 +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
Andy Wilkinson
1678de7323
Merge pull request #17020 from nosan
...
* gh-17020:
Polish "Allow depended on beans to be identified by type"
Allow depended on beans to be identified by type
Closes gh-17020
2019-07-10 12:26:04 +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
852f4a280c
Fix supported java version range in documentation
...
Closes gh-17476
2019-07-10 12:48:50 +02: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
3fb15a502b
Remove outdated reference to Guava in the reference guide
...
Closes gh-17446
2019-07-09 18:00:57 +02: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