Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,187 Commits 23 Branches 0 Tags
73308ba24b1bb3e7ff57c91c8993c8eeec6605a7
Commit Graph

9187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave
73308ba24b Merge remote-tracking branch 'springsource/1.4.x' into 1.5.x 2016-11-03 10:15:49 -07:00
Madhura Bhave
b04a74f01d Fix failure analysis for Collections and Maps 
Closes gh-6996
 2016-11-03 10:14:01 -07:00
Andy Wilkinson
f468bc3ffb Merge branch '1.4.x' into 1.5.x 2016-11-03 16:17:27 +00:00
Andy Wilkinson
f02fa161b2 Upgrade to Jedis 2.8.2 
Closes gh-7298
 2016-11-03 15:39:31 +00:00
Andy Wilkinson
3d8428934e Upgrade to Spring Ws 2.3.1.RELEASE 
Closes gh-7297
 2016-11-03 15:39:30 +00:00
Andy Wilkinson
b8df641ae5 Upgrade to Postgresql 9.4.1212.jre7 
Closes gh-7296
 2016-11-03 15:39:30 +00:00
Andy Wilkinson
5e1d6f6ea8 Upgrade to Jooq 3.8.5 
Closes gh-7295
 2016-11-03 15:39:30 +00:00
Andy Wilkinson
f02e37cc4d Upgrade to Jolokia 1.3.5 
Closes gh-7294
 2016-11-03 15:39:29 +00:00
Andy Wilkinson
216e68bfe1 Upgrade to Narayana 5.3.5.Final 
Closes gh-7293
 2016-11-03 15:39:29 +00:00
Andy Wilkinson
0104ca435d Upgrade to Elasticsearch 2.4.1 
Closes gh-7292
 2016-11-03 15:39:29 +00:00
Andy Wilkinson
7d1164c279 Upgrade to Ehcache3 3.1.3 
Closes gh-7291
 2016-11-03 15:39:28 +00:00
Andy Wilkinson
4787a6059d Upgrade to Jetty 9.3.14.v20161028 
Closes gh-7290
 2016-11-03 15:39:28 +00:00
Andy Wilkinson
05ee521124 Upgrade to Tomcat 8.5.6 
Closes gh-7289
 2016-11-03 15:39:28 +00:00
Andy Wilkinson
ecbe1a70bb Upgrade to Ehcache 2.10.3 
Closes gh-7288
 2016-11-03 15:39:27 +00:00
Andy Wilkinson
0d24a7f2aa Upgrade to Mysql 5.1.40 
Closes gh-7287
 2016-11-03 15:39:26 +00:00
Andy Wilkinson
1057efad21 Upgrade to Commons Beanutils 1.9.3 
Closes gh-7286
 2016-11-03 15:39:26 +00:00
Andy Wilkinson
756f9a9179 Upgrade to Hazelcast 3.6.6 
Closes gh-7285
 2016-11-03 15:39:26 +00:00
Andy Wilkinson
2148851ead Upgrade to Appengine 1.9.44 
Closes gh-7284
 2016-11-03 15:39:26 +00:00
Andy Wilkinson
175acd5c04 Upgrade to Caffeine 2.3.4 
Closes gh-7283
 2016-11-03 15:39:25 +00:00
Andy Wilkinson
e4856749e1 Upgrade to Jackson 2.8.4 
Closes gh-7282
 2016-11-03 15:39:25 +00:00
Andy Wilkinson
c370f498a9 Upgrade to Classmate 1.3.3 
Closes gh-7281
 2016-11-03 15:39:24 +00:00
Stephane Nicoll
f3ac98aa82 Merge branch '1.4.x' into 1.5.x 2016-11-03 12:30:09 +01:00
Stephane Nicoll
8350238b8c Polish doc 
See gh-5137
 2016-11-03 12:29:57 +01:00
Stephane Nicoll
1b38528333 Polish doc 
Closes gh-7170
 2016-11-03 12:27:30 +01:00
Brian Clozel
56fa34719d Merge branch '1.4.x' into 1.5.x 2016-11-03 11:00:05 +01:00
Craig Andrews
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
Andy Wilkinson
7ba9d0e432 Merge branch '1.4.x' into 1.5.x 2016-11-02 17:07:26 +00:00
Andy Wilkinson
6bcdc431b2 Start building against Spring Data Hopper snapshots 
See gh-7275
 2016-11-02 17:06:35 +00:00
Andy Wilkinson
ef3395beaa Raise the minimum supported version of Gradle to 2.9 
Closes gh-6884
 2016-11-01 16:25:02 +00:00
Stephane Nicoll
a733c62689 Fix typo 2016-11-01 16:48:24 +01:00
Andy Wilkinson
20e8c36590 Merge branch '1.4.x' into 1.5.x 2016-11-01 14:26:18 +00:00
Andy Wilkinson
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
Andy Wilkinson
fe50b2019e Merge branch '1.4.x' into 1.5.x 2016-11-01 13:52:51 +00:00
Andy Wilkinson
b191974faa Reflect Java 7/8 differences in javadoc for metric repository auto-config 
Closes gh-6985
 2016-11-01 13:51:46 +00:00
Andy Wilkinson
aeaaaaf903 Merge branch '1.4.x' into 1.5.x 2016-11-01 13:48:31 +00:00
Andy Wilkinson
ae4b8dc420 Ensure that CLI-based tests automatically import new TestRestTemplate 
See gh-6973
 2016-11-01 13:47:37 +00:00
Andy Wilkinson
8b631390ba Merge branch '1.4.x' into 1.5.x 2016-11-01 13:36:00 +00:00
Andy Wilkinson
307fd94b4f Correct typo in the documentation for RestTemplateBuilder customization 
See gh-7054
 2016-11-01 13:35:27 +00:00
Andy Wilkinson
f85535b697 Merge branch '1.4.x' into 1.5.x 2016-11-01 11:46:28 +00:00
Andy Wilkinson
fc0d4e45a5 Update CLI test auto-configuration to 1.4's new test infrastructure 
Closes gh-6973
 2016-11-01 11:36:48 +00:00
Andy Wilkinson
ffbbd2a5f8 Merge branch '1.4.x' into 1.5.x 2016-11-01 11:06:56 +00:00
Andy Wilkinson
be78dc4b99 Flesh out the documentation on RestTemplateBuilder customization 
Closes gh-7054
 2016-11-01 11:06:38 +00:00
Andy Wilkinson
90cc322c5e Merge branch '1.4.x' into 1.5.x 2016-11-01 10:36:30 +00:00
Andy Wilkinson
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
Andy Wilkinson
9b6c9eeedd Merge branch '1.4.x' into 1.5.x 2016-11-01 10:00:16 +00:00
Andy Wilkinson
7e8c5f5940 Silence CLI dependency resolution progress reporting when run with -q 
Closes gh-7247
 2016-11-01 09:59:58 +00:00
Phillip Webb
5b66ffbb4b Merge branch '1.4.x' into 1.5.x 2016-10-31 23:09:36 -07:00
Phillip Webb
f4328b41af Polish 2016-10-31 23:09:25 -07:00
Phillip Webb
1b17677e0b Polish TLD skip pattern support 
See gh-5010
 2016-10-31 23:09:24 -07:00
Phillip Webb
97fee46682 Revert Layout changes 
This reverts commits:
- 974ec92ad6.
- 537e0c12c2.
- 500a3df6e9.
 2016-10-31 21:08:15 -07:00