fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,180 Commits 22 Branches 339 Tags
Commit Graph

4599 Commits

Author SHA1 Message Date
Andy Wilkinson
19a494a94d Merge branch '2.0.x' 2018-07-10 10:27:39 +01:00
Andy Wilkinson
57e2bb9c6a Merge branch '1.5.x' into 2.0.x 2018-07-10 10:27:28 +01:00
Stephane Nicoll
0b48e223f3 Merge branch '2.0.x' 2018-07-09 10:50:18 +02:00
Johnny Lim
ab6adc8265 Polish 
Closes gh-13616
 2018-07-09 10:45:01 +02:00
dreis2211
5fcba490d2 Polish conditional expressions 
Closes gh-13583
 2018-07-09 09:15:10 +02:00
Andy Wilkinson
337d2d8e9a Merge branch '2.0.x' 2018-07-04 15:25:33 +01:00
Andy Wilkinson
58be01a790 Try to make Jest auto-configuration tests more robust 2018-07-04 15:25:10 +01:00
Andy Wilkinson
18904ec291 Upgrade to Mysql 8.0.11 
Closes gh-13688
 2018-07-03 20:04:55 +01:00
Andy Wilkinson
757c6a9619 Upgrade to Mongodb 3.8.0 
Closes gh-13677
 2018-07-03 17:30:48 +01:00
Andy Wilkinson
b6b37c91bb Upgrade to Flyway 5.1.3 
Closes gh-13672
 2018-07-03 17:30:48 +01:00
Andy Wilkinson
2348047450 Upgrade to Elasticsearch 6.3.0 
Closes gh-13671
 2018-07-03 17:30:48 +01:00
Andy Wilkinson
1d4ec56b08 Upgrade to Solr 7.4.0 
Closes gh-13667
 2018-07-03 17:30:48 +01:00
Andy Wilkinson
304598e4bc Upgrade to Artemis 2.6.2 
Closes gh-13663
 2018-07-03 16:42:30 +01:00
Andy Wilkinson
706945d2ce Upgrade to Embedded Mongo 2.1.1 
Closes gh-13657
 2018-07-03 14:33:21 +01:00
Madhura Bhave
4eff07f6c0 Merge branch '2.0.x' 2018-06-28 12:49:34 -07:00
Madhura Bhave
fddc9e9c7e Support multiple paths in DispatcherServletPathProvider 
Closes gh-13603
 2018-06-28 12:36:58 -07:00
Madhura Bhave
598b1f4300 Merge branch '2.0.x' 2018-06-27 11:21:18 -07:00
Madhura Bhave
a1491be636 Refine DispatcherServletPathProvider creation 
Closes gh-13527
 2018-06-27 11:06:56 -07:00
Andy Wilkinson
5c3b4333f8 Merge branch '2.0.x' 2018-06-21 17:31:24 +01:00
Andy Wilkinson
30f0fd1fe4 Merge branch '1.5.x' into 2.0.x 2018-06-21 17:31:16 +01:00
Stephane Nicoll
56a7aa552f Polish 2018-06-21 10:40:33 +02:00
Johnny Lim
bb60edaca6 Polish 
Closes gh-13534
 2018-06-21 09:24:36 +02:00
Stephane Nicoll
d4d169277d Merge branch '2.0.x' 2018-06-21 09:23:43 +02:00
Johnny Lim
b9ea0fd5a7 Polish 
See gh-13534
 2018-06-21 09:20:50 +02:00
Andy Wilkinson
c90f589906 Merge branch '2.0.x' 2018-06-20 13:57:05 +01:00
Andy Wilkinson
e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
Stephane Nicoll
8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template 
Closes gh-13529
 2018-06-20 09:28:00 +02:00
Stephane Nicoll
65cc7c72f4 Harmonize JNDI lookups to enable resourceRef 
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.

This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.

Closes gh-12803
 2018-06-19 21:51:18 +02:00
Stephane Nicoll
3fdb2b3c85 Merge branch '2.0.x' 2018-06-19 20:59:43 +02:00
Stephane Nicoll
864a6b3e91 Merge branch '1.5.x' into 2.0.x 2018-06-19 20:59:27 +02:00
Stephane Nicoll
9d3ba14686 Fix conditions for CachingConnectionFactory support 
Closes gh-12161
 2018-06-19 19:58:48 +02:00
Stephane Nicoll
8365d53554 Add support for JMS session caching 
This commit adds support for CachingConnectionFactory for both Artemis
and ActiveMQ. If connection pooling is not enabled explicitly, sessions,
producers and consumers are cached. The factory can be further
customized, including reverting to the raw ConnectionFactory, using the
`spring.jms.*` namespace.

Closes gh-12161
 2018-06-19 15:17:00 +02:00
Stephane Nicoll
0ef54a79b1 Add support for connection pooling with Artemis 
This commit expands ActiveMQ's connection pooling to artemis. The same
pooling features are now shared by the two brokers and a
PooledConnectionFactory can be auto-configured when the necessary jar is
present.

Closes gh-13523
 2018-06-19 15:05:32 +02:00
Brian Clozel
28c1bc9986 Fix DefaultErrorViewResolver after HttpStatus changes 
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
 2018-06-19 15:02:45 +02:00
Stephane Nicoll
6970f19ce3 Merge branch '2.0.x' 2018-06-19 14:12:25 +02:00
Stephane Nicoll
7ae82b070b Stop calling Charset.availableCharsets() early 
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.

Closes gh-13423
 2018-06-19 14:12:00 +02:00
Johnny Lim
fb834898ab Use final keywords for Map fields in JacksonProperties 
Closes gh-13517
 2018-06-19 09:13:33 +02:00
Stephane Nicoll
165d993e5d Merge branch '2.0.x' 2018-06-18 17:54:39 +02:00
Stephane Nicoll
62c93a4b9a Add missing @ConditionalOnClass check on RedisCacheConfiguration 
Closes gh-13508
 2018-06-18 17:54:10 +02:00
Johnny Lim
ec845c93f2 Polish HibernateProperties and its test 
Closes gh-13484
 2018-06-15 13:44:35 +02:00
Brian Clozel
cb6c8f76e2 Configure X-Forwarded-* support with Reactor Netty 
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.

Closes gh-10900
 2018-06-13 14:55:33 +02:00
Madhura Bhave
87506248b0 Merge branch '2.0.x' 2018-06-07 12:53:37 -07:00
Madhura Bhave
4194baad91 Don't log p/w when AuthenticationManagerBuilder configured 
Fixes gh-12872
 2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165 Make generated password output consistent 2018-06-07 12:39:46 -07:00
Stephane Nicoll
34167dc163 Polish 2018-06-07 13:34:18 +02:00
Brian Clozel
fe3de2816c Merge branch '2.0.x' 2018-06-06 14:07:58 +02:00
Brian Clozel
7cbbd95fc9 Ignore invalid Accept headers in WebFlux error handling 
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.

This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.

Closes: gh-13372
 2018-06-06 14:02:04 +02:00
Stephane Nicoll
ab19db19a3 Move Hibernate settings to a dedicated class 
Closes gh-1327
 2018-06-06 14:00:35 +02:00
Phillip Webb
e0ae805924 Update copyright header 2018-06-05 17:45:09 -07:00
Phillip Webb
66be6c3396 Polish 2018-06-05 17:44:51 -07:00