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

679 Commits

Author SHA1 Message Date
Brian Clozel
9b60eef0e2 Fix build after SPR-17034 in Spring Framework 
Since SPR-17034, the core container now behaves a bit differently when
dealing with `null` beans.

Given a `null` `HandlerMapping` bean named "resourceHandlerMapping":

* `context.getBean("resourceHandlerMapping", HandlerMapping.class)`
still returns a `NullBean`
* `ListableBeanFactory.getBeansOfType` will return a Map of all existing
beans, not including the `null` ones as values of the map.

Closes gh-13760
 2018-07-16 10:39:56 +02:00
Johnny Lim
1ae420670a Polish 
Closes gh-13776
 2018-07-16 10:38:40 +02:00
Stephane Nicoll
48962718d1 Merge branch '2.0.x' 2018-07-16 10:37:43 +02:00
Johnny Lim
068e22d60b Polish 
See gh-13776
 2018-07-16 10:34:00 +02:00
Andy Wilkinson
ac1f2a5817 Polish 2018-07-14 08:45:34 +01:00
Stephane Nicoll
42bba4e1c5 Document Liquibase default values 
Closes gh-13765
 2018-07-13 13:41:32 +02:00
Andy Wilkinson
c59f31218a Revert "Ignore Data Elasticsearch test that fails due to DATAES-470" 
Closes gh-13744
 2018-07-13 10:59:37 +01:00
Stephane Nicoll
4c7c328972 Polish "Upgrade to Liquibase 3.6.2" 
Closes gh-13625
 2018-07-13 11:40:45 +02:00
Miguel Gomes
b5cb074219 Upgrade to Liquibase 3.6.2 
See gh-13625
 2018-07-13 11:37:26 +02:00
Stephane Nicoll
8fc1e0ed4e Merge branch '2.0.x' 2018-07-13 07:55:59 +02:00
dreis2211
ac8eebfbad Fix typos 
Closes gh-13762
 2018-07-13 07:54:03 +02:00
Brian Clozel
2e5f0c2873 Fix WebMvc auto-conf tests after Framework change 
This commit adapts to a recent Spring Framework change (a40d25a) that
turns no-op Spring MVC beans (infrastructure components that, given
their configuration, won't contribute anything to the application) into
`NullBean` instances.
 2018-07-12 10:04:45 +02:00
Madhura Bhave
dba0e1b778 Merge branch '2.0.x' 2018-07-11 15:26:08 -07:00
Madhura Bhave
d7822ba135 Update copyright header for modified files 2018-07-11 15:25:39 -07:00
Madhura Bhave
34ebf1a97c Merge branch '2.0.x' 2018-07-11 15:23:00 -07:00
Madhura Bhave
c8c32cfa33 Migrate tests to ApplicationContextRunner 2018-07-11 15:06:36 -07:00
Madhura Bhave
6d9fabf5bc Harmonize mongo auto-configuration 
Provides a way to easily exclude `MongoAutoConfiguration` or
`MongoReactiveAutoConfiguration` so that multiple mongo clients
are not present.

Fixes gh-12407
 2018-07-11 13:15:08 -07:00
Andy Wilkinson
cced3514a7 Polish 2018-07-11 17:49:10 +01:00
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