root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
17,467 Commits 23 Branches 356 Tags 278 MiB
Commit Graph

17467 Commits

Author SHA1 Message Date
Stephane Nicoll 48962718d1 Merge branch '2.0.x' 2018-07-16 10:37:43 +02:00
Stephane Nicoll 1ca8808a97 Merge pull request #13776 from izeye:polish-20180715 
* pr/13776:
  Polish
 2018-07-16 10:37:24 +02:00
Johnny Lim 068e22d60b Polish 
See gh-13776
 2018-07-16 10:34:00 +02:00
Stephane Nicoll 635986299c Merge branch '2.0.x' 2018-07-16 10:28:49 +02:00
Stephane Nicoll f325ee9406 Merge pull request #13774 from izeye:composite-property-sources 
* pr/13774:
  Remove a List creation in CompositePropertySources.iterator()
 2018-07-16 10:26:57 +02:00
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 dade7cc3c6 Merge pull request #13625 from 72MiguelGomes:13550/AddSupportSpringLiquibase3.6.2 
* pr/13625:
  Polish "Upgrade to Liquibase 3.6.2"
  Upgrade to Liquibase 3.6.2
 2018-07-13 11:42:04 +02: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
Stephane Nicoll 2dc0488af7 Merge pull request #13706 from izeye:duplicate-empty-path 
* pr/13706:
  Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
 2018-07-13 09:36:10 +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 e556c04d83 Remove class file 2018-07-13 09:21:27 +02:00
Stephane Nicoll 6602fa3c90 Clean line breaks in configuration metadata descriptions. 
Closes gh-13601
 2018-07-13 09:19:17 +02:00
Stephane Nicoll 8fc1e0ed4e Merge branch '2.0.x' 2018-07-13 07:55:59 +02:00
Stephane Nicoll ed609f6395 Merge pull request #13762 from dreis2211:fix-typos-2 
* pr/13762:
  Fix typos
 2018-07-13 07:55:40 +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
Andy Wilkinson 349b6a8f73 Merge pull request #13757 from Johnny Lim 
* gh-13757:
  Remove @since tag from getServlet()
 2018-07-12 09:36:26 +01: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
Stephane Nicoll 2e768c4e93 Merge branch '2.0.x' 2018-07-12 08:55:24 +02:00
Stephane Nicoll 510c99cc0e Merge branch '1.5.x' into 2.0.x 2018-07-12 08:55:10 +02:00
Stephane Nicoll c23c18dc34 Merge pull request #13755 from izeye:patch-49 
* pr/13755:
  Fix typo
 2018-07-12 08:51:32 +02:00
Johnny Lim e7cb1c63bb Fix typo 
Closes gh-13755
 2018-07-12 08:51:11 +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 6dc14af92d Update view of bean types when an override is detected 
Previously, when a bean was overridden and its type changes,
BeanTypeRegistry could be left with a stale view of the bean's type.
This would lead to incorrect bean condition evaluation as conditions
would match or not match based on the bean's old type.

This commit updates the type registry to refresh its view of a bean's
type when its definition changes.

Closes gh-13588
 2018-07-11 16:46:37 +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