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

661 Commits

Author SHA1 Message Date
Andy Wilkinson
889f1bce3f Merge branch '2.0.x' 2018-07-11 17:13:59 +01:00
Andy Wilkinson
c489c6c5f6 Polish test following forward merge 2018-07-11 17:13:45 +01:00
Andy Wilkinson
f32ab6eade Merge branch '2.0.x' 2018-07-11 16:51:58 +01:00
Andy Wilkinson
67dfa0a720 Merge branch '1.5.x' into 2.0.x 2018-07-11 16:51:43 +01:00
Stephane Nicoll
59749d53b8 Merge branch '2.0.x' 2018-07-11 11:24:06 +02:00
Stephane Nicoll
48819253eb Fix dependency order between JdbcTemplate and database migration tools 
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.

This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.

Closes gh-13155
 2018-07-11 11:23:44 +02:00
Stephane Nicoll
8194dc4aea Merge branch '2.0.x' 2018-07-10 19:45:36 +02:00
Stephane Nicoll
177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 2018-07-10 19:45:20 +02:00
Andy Wilkinson
a5b3d549b9 Ignore Data Elasticsearch test that fails due to DATAES-470 2018-07-10 15:58:18 +01:00
Andy Wilkinson
43e2df105c Align with latest changes in Spring Data REST 2018-07-10 15:58:18 +01:00
Andy Wilkinson
cf3b1f6653 Start building against Spring HATEOAS 0.25.0 snapshots 
See gh-13742
 2018-07-10 15:58:18 +01:00
Andy Wilkinson
c1a81cfca0 Prohibit bean overriding by default and analyze override failures 
Closes gh-13609
 2018-07-10 12:28:18 +01:00
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