Johnny Lim
4314dc2972
Remove a List creation in CompositePropertySources.iterator()
...
Closes gh-13774
2018-07-16 10:20:49 +02:00
Andy Wilkinson
ac1f2a5817
Polish
2018-07-14 08:45:34 +01:00
Madhura Bhave
c0574c8437
Update docs to reflect new health & info security
...
See gh-13722
2018-07-13 13:40:01 -07:00
Madhura Bhave
d1b8558430
Make /health and /info insecure by default
...
Closes gh-13722
2018-07-13 13:35:52 -07: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
fa171671b1
Merge branch '2.0.x'
2018-07-13 09:39:29 +02:00
Stephane Nicoll
e6ea28dec5
Polish
2018-07-13 09:36:37 +02:00
Johnny Lim
13202eb278
Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
...
Closes gh-13706
2018-07-13 09:35:34 +02:00
Stephane Nicoll
d17d6374f0
Merge branch '2.0.x'
2018-07-13 09:27:44 +02:00
Stephane Nicoll
174cc2bc4e
Merge branch '1.5.x' into 2.0.x
2018-07-13 09:25:42 +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
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