5a88e47414
Merge branch '1.5.x'
2016-11-03 12:30:21 +01:00
f3ac98aa82
Merge branch '1.4.x' into 1.5.x
2016-11-03 12:30:09 +01:00
8350238b8c
Polish doc
...
See gh-5137
2016-11-03 12:29:57 +01:00
97597ca54f
Merge branch '1.5.x'
2016-11-03 12:27:43 +01:00
1b38528333
Polish doc
...
Closes gh-7170
2016-11-03 12:27:30 +01:00
cad3cc4e5d
Merge branch '1.5.x'
2016-11-03 11:00:28 +01:00
56fa34719d
Merge branch '1.4.x' into 1.5.x
2016-11-03 11:00:05 +01:00
fc535fe27c
Disable resource chain cache when DevTools is enabled
...
If the resource chain is used, such as by using the
`"spring.resources.chain.strategy.content.enabled"` property,
resource chain caching can prevent the developer from seeing
changes made to resources, so that caching should be disabled
when DevTools is enabled.
This commit sets the `"spring.resources.chain.cache"` property
to `true` when devtools is enabled.
2016-11-03 10:44:32 +01:00
d0eedd23e9
Merge branch '1.5.x'
2016-11-02 17:07:33 +00:00
7ba9d0e432
Merge branch '1.4.x' into 1.5.x
2016-11-02 17:07:26 +00:00
6bcdc431b2
Start building against Spring Data Hopper snapshots
...
See gh-7275
2016-11-02 17:06:35 +00:00
7c3d7d882a
Merge branch '1.5.x'
2016-11-01 16:25:07 +00:00
ef3395beaa
Raise the minimum supported version of Gradle to 2.9
...
Closes gh-6884
2016-11-01 16:25:02 +00:00
f28fa3e1ab
Merge branch '1.5.x'
2016-11-01 16:48:38 +01:00
a733c62689
Fix typo
2016-11-01 16:48:24 +01:00
d58c79d9b7
Merge branch '1.5.x'
2016-11-01 14:26:22 +00:00
20e8c36590
Merge branch '1.4.x' into 1.5.x
2016-11-01 14:26:18 +00:00
6828997651
Correct minimum recommended version of Gradle to be 2.9 rather than 2.8
...
Closes gh-7189
See gh-6884
2016-11-01 14:25:07 +00:00
05732613dd
Update ConditionalOnJava and its usage now that Boot requires Java 8
...
Closes gh-6982
2016-11-01 14:18:33 +00:00
8026b2e7a0
Merge branch '1.5.x'
...
See gh-6982
2016-11-01 13:55:34 +00:00
fe50b2019e
Merge branch '1.4.x' into 1.5.x
2016-11-01 13:52:51 +00:00
b191974faa
Reflect Java 7/8 differences in javadoc for metric repository auto-config
...
Closes gh-6985
2016-11-01 13:51:46 +00:00
4e30da35ad
Merge branch '1.5.x'
2016-11-01 13:48:37 +00:00
aeaaaaf903
Merge branch '1.4.x' into 1.5.x
2016-11-01 13:48:31 +00:00
ae4b8dc420
Ensure that CLI-based tests automatically import new TestRestTemplate
...
See gh-6973
2016-11-01 13:47:37 +00:00
14d58b49dd
Merge branch '1.5.x'
2016-11-01 13:36:05 +00:00
8b631390ba
Merge branch '1.4.x' into 1.5.x
2016-11-01 13:36:00 +00:00
307fd94b4f
Correct typo in the documentation for RestTemplateBuilder customization
...
See gh-7054
2016-11-01 13:35:27 +00:00
f5d60c3c0a
Merge branch '1.5.x'
2016-11-01 11:46:34 +00:00
f85535b697
Merge branch '1.4.x' into 1.5.x
2016-11-01 11:46:28 +00:00
fc0d4e45a5
Update CLI test auto-configuration to 1.4's new test infrastructure
...
Closes gh-6973
2016-11-01 11:36:48 +00:00
5bc8101725
Merge branch '1.5.x'
2016-11-01 11:07:01 +00:00
ffbbd2a5f8
Merge branch '1.4.x' into 1.5.x
2016-11-01 11:06:56 +00:00
be78dc4b99
Flesh out the documentation on RestTemplateBuilder customization
...
Closes gh-7054
2016-11-01 11:06:38 +00:00
473543056f
Merge branch '1.5.x'
2016-11-01 10:36:36 +00:00
90cc322c5e
Merge branch '1.4.x' into 1.5.x
2016-11-01 10:36:30 +00:00
4919c6f30c
Ignore scoped targets when collecting servlet context initializer beans
...
Previously, there were two problems with servlet context initializer
beans that are a scoped proxy:
1. When there's no explicit registration bean the target of the scoped
proxy is registered rather than the proxy. This meant that the
proxy had no effect as it was being bypassed.
2. When there is an explicit registration bean, the registration is
performed twice: the faulty implicit registration described above
and explicit registration.
A fix (SPR-14816) has been made in Spring Framework so that we can
correctly determine the type of bean that will be produced by a
scoped proxy's factory bean. That change, coupled with the change in
this commit that ignored beans that are the target of a scoped proxy
addresses both of the problems described above. A single registration
is now performed and its the scoped proxy, rather than its target,
that is registered.
Closes gh-7150
2016-11-01 10:24:33 +00:00
1186eb3250
Merge branch '1.5.x'
2016-11-01 10:00:34 +00:00
9b6c9eeedd
Merge branch '1.4.x' into 1.5.x
2016-11-01 10:00:16 +00:00
7e8c5f5940
Silence CLI dependency resolution progress reporting when run with -q
...
Closes gh-7247
2016-11-01 09:59:58 +00:00
98a3ae9ac4
Merge branch '1.5.x'
2016-10-31 23:13:37 -07:00
5b66ffbb4b
Merge branch '1.4.x' into 1.5.x
2016-10-31 23:09:36 -07:00
f4328b41af
Polish
2016-10-31 23:09:25 -07:00
1b17677e0b
Polish TLD skip pattern support
...
See gh-5010
2016-10-31 23:09:24 -07:00
97fee46682
Revert Layout changes
...
This reverts commits:
- 974ec92ad6537e0c12c2500a3df6e9
2016-10-31 21:08:15 -07:00
cecc1c8817
Disable DevTools property defaults in production
...
Update `DevToolsPropertyDefaultsPostProcessor` so that property defaults
are only added at development time. Properties are now added only when
`Restarter` is initialize or remote devtools is enabled.
Fixes gh-7014
2016-10-31 20:55:05 -07:00
c6657aaf12
Merge pull request #7066 from youngm/pidotherevents
...
* pr/7066:
Support ApplicationReadyEvent from PidFileWriter
2016-10-31 16:37:08 -07:00
970dcc3fd3
Support ApplicationReadyEvent from PidFileWriter
...
Update `ApplicationPidFileWriter` to support `ApplicationReadyEvent` in
addition to the already supported `ApplicationEnvironmentPreparedEvent`
and `ApplicationPreparedEvent` events.
Closes gh-7066
Fixes gh-7027
2016-10-31 16:34:27 -07:00
5a3b881e1f
Merge pull request #7217 from gdpotter/master
...
* pr/7217:
Respect 'primary' flag when replacing databases
2016-10-31 16:27:09 -07:00
39d5881bf2
Respect 'primary' flag when replacing databases
...
Update TestDatabaseAutoConfiguration to ensure that the the `primary`
flag of the `BeanDefinition` is copied.
Closes gh-7217
2016-10-31 16:26:41 -07:00
Stephane Nicoll
Brian Clozel
Craig Andrews
Andy Wilkinson
Phillip Webb
Mike Youngstrom
Greg Potter