root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,353 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

9353 Commits

Author SHA1 Message Date
Andy Wilkinson 229691338e Reinstate JsonPath dependency that is no longer pulled in transitively 2016-11-03 21:58:15 +00:00
Phillip Webb 0cdde3b83c Merge branch '1.5.x' 2016-11-03 14:50:26 -07:00
Phillip Webb 81c5753f4d Merge branch '1.4.x' into 1.5.x 2016-11-03 14:49:38 -07:00
Phillip Webb 90afc8ebbe Formatting 2016-11-03 14:48:10 -07:00
Phillip Webb 6a2ac080ac Create our own SessionCreationPolicy enum 
Update `ManagementServerProperties` so that `security.sessions` no
longer uses `SessionCreationPolicy` from Spring Security. We now
use our own enun which allows `management.security.*` properties to
be set without the risk of a `ClassNotFoundException`.

Fixes gh-3888
 2016-11-03 14:36:49 -07:00
Andy Wilkinson 4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots 
Closes gh-7301
See gh-7029
 2016-11-03 20:49:02 +00:00
Andy Wilkinson f7618cb421 Merge branch '1.5.x' 2016-11-03 20:15:28 +00:00
Andy Wilkinson bdfceae24c Merge branch '1.4.x' into 1.5.x 2016-11-03 20:15:13 +00:00
Andy Wilkinson 97e5e32496 Make sure the MetricsFilter uses committed response's status 
Previously, if an exception was thrown during request handling after
the response had been committed, i.e. after the status and headers
had been written, the metrics filter would assume that it was a 500
response. This was potentially inaccurate as the status had already
been sent to the client and before the exception was thrown and it
may have been something other than a 500.

This commit updates MetricsFilter so that it will use the
status from the response if the response has been committed even when
an exception is thrown.

Closes gh-7277
 2016-11-03 20:08:31 +00:00
Andy Wilkinson f32f3ed49c Merge branch '1.5.x' 2016-11-03 18:55:36 +00:00
Andy Wilkinson ab2e12fd76 Merge branch '1.4.x' into 1.5.x 2016-11-03 18:55:32 +00:00
Andy Wilkinson 6a87df8e46 Upgrade to Spring Data Hopper SR5 
Closes gh-7275
 2016-11-03 18:54:42 +00:00
Madhura Bhave 3fd586aeeb Merge remote-tracking branch 'springsource/1.5.x' 2016-11-03 10:16:45 -07:00
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 571e429449 Merge branch '1.5.x' 2016-11-03 16:17:38 +00: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 5a88e47414 Merge branch '1.5.x' 2016-11-03 12:30:21 +01: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 97597ca54f Merge branch '1.5.x' 2016-11-03 12:27:43 +01:00
Stephane Nicoll 1b38528333 Polish doc 
Closes gh-7170
 2016-11-03 12:27:30 +01:00
Brian Clozel cad3cc4e5d Merge branch '1.5.x' 2016-11-03 11:00:28 +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 d0eedd23e9 Merge branch '1.5.x' 2016-11-02 17:07:33 +00: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 7c3d7d882a Merge branch '1.5.x' 2016-11-01 16:25:07 +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 f28fa3e1ab Merge branch '1.5.x' 2016-11-01 16:48:38 +01:00
Stephane Nicoll a733c62689 Fix typo 2016-11-01 16:48:24 +01:00