Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,445 Commits 23 Branches 0 Tags
8fc1e0ed4eccd9ccaa22e02ca5972d36433354c0
Commit Graph

2642 Commits

Author SHA1 Message Date
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
Stephane Nicoll
04bca3f37f Merge branch '2.0.x' 2018-07-12 16:58:16 +02:00
Stephane Nicoll
19709f7dea Polish 2018-07-12 16:57:52 +02:00
Johnny Lim
1b3fa3ff0d Remove @since tag from getServlet() 
Closes gh-13757
 2018-07-12 09:36:13 +01: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
1ea91ece23 Merge branch '2.0.x' 2018-07-11 17:49:19 +01:00
Andy Wilkinson
cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Andy Wilkinson
6a48a440b2 Annotate our test annotations with @ExtendWith(SpringExtension.class) 
Closes gh-13739
 2018-07-11 17:25:21 +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
Andy Wilkinson
7b4096ab50 Merge branch '2.0.x' 2018-07-11 14:39:04 +01:00
Andy Wilkinson
44273ee093 Merge branch '1.5.x' into 2.0.x 2018-07-11 14:38:49 +01:00
Stephane Nicoll
611f2332e6 Polish Flyway keys 2018-07-11 14:56:36 +02:00
Stephane Nicoll
29fcb10f8d Polish 2018-07-11 14:51:24 +02: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
42f4f2ded8 Merge branch '2.0.x' 2018-07-11 10:13:57 +02:00
Stephane Nicoll
331775d6c0 Document latest version of gradle-git-properties plugin 
Closes gh-13747
 2018-07-11 10:13:41 +02:00
Andy Wilkinson
8cc0d5577e Avoid unwanted bean overrides in spring-boot-test-autoconfigure 
See gh-13609
 2018-07-10 19:54:48 +01:00
Johnny Lim
f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch() 
Closes gh-13707
 2018-07-10 11:36:47 -07: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
87b72cc981 Polish DevTools auto-configuration tests to avoid bean overrides 
See gh-13609
 2018-07-10 16:31:11 +01:00
Stephane Nicoll
5fcf45c4d0 Merge branch '2.0.x' 2018-07-10 17:07:46 +02:00
Stephane Nicoll
3423c5dddb Detect DispatcherServlets registered via ServletRegistrationBean 
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.

This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.

Closes gh-13186
 2018-07-10 17:06:36 +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
Stephane Nicoll
8426e3c2c9 Merge branch '2.0.x' 2018-07-10 15:58:39 +02:00
Johnny Lim
46e6aa5963 Fix query string encoding in TraceableHttpServletRequest 
Closes gh-13545
 2018-07-10 15:56:10 +02:00
dreis2211
be837ccb4b Use PropertySources.stream() where possible 
Closes gh-13724
 2018-07-10 15:35:03 +02:00
Stephane Nicoll
8c691273e3 Merge branch '2.0.x' 2018-07-10 15:31:56 +02:00
Johnny Lim
0de8317979 Separate logging from getUrlMappings() 
Closes gh-13710
 2018-07-10 15:27:43 +02: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
cdd9c92ba2 Start building against snapshots for Spring Data Lovelace RC1 
See gh-13740
 2018-07-10 11:42:37 +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
Johnny Lim
b87b23a44f Fix parameter order for RequestMatcherAssert.doesNotMatch() 
Closes gh-13707
 2018-07-09 15:20:18 -07:00
Madhura Bhave
63ae682a95 Merge branch '2.0.x' 2018-07-09 14:16:17 -07:00
Madhura Bhave
4e7719f1c7 Fix typo 2018-07-09 14:15:19 -07:00
Andy Wilkinson
063e8e4dc6 Revert "Prohibit bean overriding by default and analyze override failures" 
This reverts commit 710cdbab92.
 2018-07-09 17:58:49 +01:00
Andy Wilkinson
710cdbab92 Prohibit bean overriding by default and analyze override failures 
Closes gh-13609
 2018-07-09 13:50:16 +01:00