root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
23,627 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

23627 Commits

Author SHA1 Message Date
Andy Wilkinson 92b4e60ecd Upgrade to Rxjava2 2.2.13 
Closes gh-18596
 2019-10-15 13:48:19 +01:00
Andy Wilkinson 608f02f060 Upgrade to Unboundid Ldapsdk 4.0.12 
Closes gh-18595
 2019-10-15 13:48:19 +01:00
Andy Wilkinson 8091183c1f Upgrade to Hazelcast 3.12.3 
Closes gh-18594
 2019-10-15 13:48:19 +01:00
Andy Wilkinson eafa595ed3 Upgrade to Gson 2.8.6 
Closes gh-18592
 2019-10-15 13:48:19 +01:00
Stephane Nicoll 0bc5803e34 Merge branch '2.1.x' 
Closes gh-18603
 2019-10-15 14:38:59 +02:00
Stephane Nicoll e4ba6049ff Clarify scope of "@SpringBootTest#classes" 
See gh-18229
 2019-10-15 14:36:28 +02:00
Stephane Nicoll 2bf8073446 Polish 
See gh-18440
 2019-10-15 14:08:38 +02:00
Andy Wilkinson b240c810a8 Fix @ConfigurationProperties on @Bean methods without metadata caching 
Due to a current limitation of Spring Framework, when bean metadata
caching is disabled, a merged bean definition may have a null
resolved factory method that would have been non-null if bean metadata
caching was enabled. Configuration property binding for @Bean methods
annotated with @ConfigurationProperties relied upon the resolved
factory method being enabled to find the @ConfigurationProperties
annotation and trigger property binding. As a result, when bean
metadata caching is disabled on the bean factory, such
@ConfigurationProperties beans would not be bound.

This commit works around the limitation by adding a fallback that
performs a reflection-based search for the factory method when the
resolved factory method on the bean definition is null. This allows
the bean's factory method and any @ConfigurationProperties annotation
on it to be found, ensuring that propoerty binding is then performed.

Fixes gh-18440
 2019-10-15 11:21:53 +01:00
Stephane Nicoll 3dac8e9abd Merge pull request #18477 from dsyer 
* pr/18477:
  Polish "Add some more notes on running exploded jar files"
  Add some more notes on running exploded jar files

Closes gh-18477
 2019-10-15 10:03:09 +02:00
Stephane Nicoll 4efb4d1dd3 Polish "Add some more notes on running exploded jar files" 
See gh-18477
 2019-10-15 10:02:53 +02:00
Dave Syer 3f2dd30808 Add some more notes on running exploded jar files 
See gh-18477
 2019-10-15 10:01:23 +02:00
Stephane Nicoll 391eb279df Merge branch '2.1.x' 
Closes gh-18588
 2019-10-15 08:51:31 +02:00
Stephane Nicoll c5e14a89b1 Merge pull request #18581 from polarbear567 
* pr/18581:
  Polish "Add metadata entry for spring.main.register-shutdown-hook"
  Add metadata entry for spring.main.register-shutdown-hook

Closes gh-18581
 2019-10-15 08:46:15 +02:00
Stephane Nicoll 22f44917ca Polish "Add metadata entry for spring.main.register-shutdown-hook" 
See gh-18581
 2019-10-15 08:41:07 +02:00
leoli 9b781449cf Add metadata entry for spring.main.register-shutdown-hook 
See gh-18581
 2019-10-15 08:37:08 +02:00
Stephane Nicoll 75bd15650f Merge branch '2.1.x' 
Closes gh-18587
 2019-10-15 08:33:51 +02:00
Stephane Nicoll 34287fd556 Merge pull request #18578 from rhamedy 
* pr/18578:
  Polish "Clarify formatting recommendations for configuration property javadoc"
  Clarify formatting recommendations for configuration property javadoc

Closes gh-18578
 2019-10-15 08:33:32 +02:00
Stephane Nicoll f05d7902e2 Polish "Clarify formatting recommendations for configuration property javadoc" 
See gh-18578
 2019-10-15 08:32:48 +02:00
Rafiullah Hamedy 1f9b68707f Clarify formatting recommendations for configuration property javadoc 
This commit adds a note to spring-boot-features.adoc to clarify that
using javadoc tags to format configuration property descriptions is not
supported.

See gh-18578
 2019-10-15 08:29:51 +02:00
Stephane Nicoll 98f676ca46 Merge branch '2.1.x' 
Closes gh-18586
 2019-10-15 08:25:25 +02:00
Stephane Nicoll f6d5f7777f Merge pull request #18580 from contextshuffling 
* pr/18580:
  Use LinkedHashSet for deterministic order in test assertions

Closes gh-18580
 2019-10-15 08:25:07 +02:00
contextshuffling efedd80d4b Use LinkedHashSet for deterministic order in test assertions 
See gh-18580
 2019-10-15 08:20:53 +02:00
Stephane Nicoll 9c6e5f0904 Merge branch '2.1.x' 
Closes gh-18585
 2019-10-15 08:15:42 +02:00
Stephane Nicoll 4d181c5b6b Merge pull request #18579 from dreis2211 
* pr/18579:
  Rename tests to match Surefire expectations

Closes gh-18579
 2019-10-15 08:14:17 +02:00
dreis2211 abfb87d1a3 Rename tests to match Surefire expectations 
See gh-18579
 2019-10-15 08:11:47 +02:00
Phillip Webb e20aa7dc73 Clarify ConfigurationPropertiesBean Javadoc 
Update the `ConfigurationPropertiesBean` Javadoc to clarify its purpose.

Closes gh-18487
 2019-10-14 20:50:42 -07:00
Andy Wilkinson 3fc51f8063 Isolate the effects of initializing Reactor's debug agent in the tests 2019-10-14 20:08:59 +01:00
Andy Wilkinson e7efe0cbfe Merge branch '2.1.x' 
Closes gh-18576
 2019-10-14 14:12:57 +01:00
Andy Wilkinson bc6de8d572 Merge pull request #18575 from wycm 
* gh-18575:
  Make the logger static final

Closes gh-18575
 2019-10-14 14:12:47 +01:00
王洋 152568521e Make the logger static final 
See gh-18575
 2019-10-14 14:12:26 +01:00
Andy Wilkinson 4bc3931a23 Merge pull request #18573 from sdeleuze 
* gh-18573:
  Polish "Update Kotlin-related reference documentation"
  Update Kotlin-related reference documentation

Closes gh-18573
 2019-10-14 11:42:35 +01:00
Andy Wilkinson 65818038fe Polish "Update Kotlin-related reference documentation" 
See gh-18573
 2019-10-14 11:41:03 +01:00
Sebastien Deleuze c6c9818285 Update Kotlin-related reference documentation 
See gh-18573
 2019-10-14 11:40:38 +01:00
Andy Wilkinson c75b06c76c Remove @ImmutableConfigurationProperties 
Closes gh-18563
 2019-10-14 11:29:09 +01:00
Andy Wilkinson 1a7a3118d7 Merge pull request #18571 from dreis2211 
* gh-18571:
  Polish "Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration"
  Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration

Closes gh-18571
 2019-10-14 09:35:53 +01:00
Andy Wilkinson cf62dc862b Polish "Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration" 
See gh-18571
 2019-10-14 09:34:53 +01:00
dreis2211 35dc4817dd Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration 
See gh-18571
 2019-10-14 09:34:10 +01:00
Stephane Nicoll 8108b556ad Fix resource cleanup in test 
Closes gh-18569
 2019-10-13 13:41:50 +02:00
Stephane Nicoll f7959bcd00 Merge branch '2.1.x' 
Closes gh-18567
 2019-10-13 08:45:44 +02:00
Stephane Nicoll e05c48986b Merge pull request #18546 from tedyoung 
* pr/18546:
  Fix incorrect backslash escape in documentation sample

Closes gh-18546
 2019-10-13 08:45:02 +02:00
Ted M. Young f553784ebc Fix incorrect backslash escape in documentation sample 
See gh-18546
 2019-10-13 08:10:14 +02:00
Stephane Nicoll f6901a505e Merge pull request #18558 from jaferkhan 
* pr/18558:
  Fix package in AOP pointcut

Closes gh-18558
 2019-10-13 08:08:05 +02:00
Jafer Khan 56840f32fe Fix package in AOP pointcut 
See gh-18558
 2019-10-13 08:06:13 +02:00
Stephane Nicoll 53b0569dae Merge pull request #18557 from dreis2211 
* pr/18557:
  Polish
  Remove usage of @InjectMocks

Closes gh-18557
 2019-10-12 16:56:47 +01:00
dreis2211 d8de6fff53 Polish 
See gh-18557
 2019-10-12 16:55:07 +01:00
dreis2211 3174f06bf2 Remove usage of @InjectMocks 
See gh-18557
 2019-10-12 16:54:57 +01:00
Stephane Nicoll 498ae649a8 Merge pull request #18559 from izeye 
* pr/18559:
  Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable()

Closes gh-18559
 2019-10-12 16:53:51 +01:00
Johnny Lim 887c3b71f3 Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable() 
See gh-18559
 2019-10-12 16:51:53 +01:00
Andy Wilkinson 9a89039172 Provide a marker artifact for Boot's Gradle plugin 
Closes gh-18514
 2019-10-11 16:51:29 -05:00
Stephane Nicoll 61a914fa28 Polish 2019-10-11 10:39:23 -05:00