1. 25 Nov, 2020 5 commits
  2. 23 Nov, 2020 4 commits
  3. 20 Nov, 2020 11 commits
    • Andy Wilkinson's avatar
      Merge branch '2.3.x' · e4380275
      Andy Wilkinson authored
      Closes gh-24224
      e4380275
    • Andy Wilkinson's avatar
      Only run deployment tests when war has material changes · 4e9f7026
      Andy Wilkinson authored
      Closes gh-24137
      4e9f7026
    • Andy Wilkinson's avatar
      Merge branch '2.3.x' · 11c81ad2
      Andy Wilkinson authored
      Closes gh-24223
      11c81ad2
    • Andy Wilkinson's avatar
      Merge branch '2.2.x' into 2.3.x · 7efa1e47
      Andy Wilkinson authored
      Closes gh-24222
      7efa1e47
    • Andy Wilkinson's avatar
      12f2529b
    • Andy Wilkinson's avatar
      Merge branch '2.3.x' · 1f3012b4
      Andy Wilkinson authored
      Closes gh-24220
      1f3012b4
    • Andy Wilkinson's avatar
      Merge branch '2.2.x' into 2.3.x · 0ed7f7f4
      Andy Wilkinson authored
      Closes gh-24219
      0ed7f7f4
    • Andy Wilkinson's avatar
      Merge pull request #24095 from artembilan · fbf4c8cd
      Andy Wilkinson authored
      * gh-24095:
        Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
        Ensure that MeterRegistry bean is defined before SI looks for it
      
      Closes gh-24095
      fbf4c8cd
    • Andy Wilkinson's avatar
      08b9d1da
    • Artem Bilan's avatar
      Ensure that MeterRegistry bean is defined before SI looks for it · 7d712aaa
      Artem Bilan authored
      Previously, it was possible for Spring Integration, including its
      built-in Micrometer support, to be auto-configured before the
      Micrometer auto-configuration had defined the MeterRegistry bean. This
      resulted in missing Spring Integration metrics.
      
      Spring Integration is unusual in having its own built-in Micrometer
      support that it configures itself. Rather than providing
      auto-configuration for Integration's Micrometer support (Which isn't
      needed), this commit introduces some auto-configuration that just
      affects the ordering of the auto-configuration classes. This ordering
      ensures that the MeterRegistry bean has been defined by Spring
      Integration is auto-configured. This ensures that the MeterRegistry
      bean is known to the BeanFactory when Spring Integration goes looking
      for it.
      
      See gh-24095
      7d712aaa
    • Andy Wilkinson's avatar
      Require bean name match for Locale(Context)Resolver to back off · 4a7bc3d0
      Andy Wilkinson authored
      Web MVC and WebFlux look up by name the Locale(Context)Resolver beans
      that they use. Previously, the auto-configured resolvers for MVC and
      WebFlux would back off when any bean of the required type was defined,
      irrespective of its name. If the name of the user's bean didn't match
      the name used by MVC and WebFlux to find the custom resolver, the
      custom resolver would be ignored and MVC and WebFlux would use their
      defaults. There was no indication of this happening in the condition
      evaluation report as all it would show is that the auto-configured
      resolver had backed off in favour of the custom resolver. It wouldn't
      show anything to explain why the custom resolver had not been used.
      
      This commit updates the auto-configured resolvers to be conditional
      on a missing bean of the name required by MVC and WebFlux. If the
      user then defines a custom resolver with a different name, the
      condition evaluation report will show that the auto-configured
      resolver remained as the bean name didn't match.
      
      Fixes gh-24209
      4a7bc3d0
  4. 18 Nov, 2020 19 commits
  5. 17 Nov, 2020 1 commit
    • Phillip Webb's avatar
      Add CharSequenceToObjectConverter support · e8244d8d
      Phillip Webb authored
      Update `ApplicationConversionService` with support for converting
      `CharSequence` source types by using existing `String` based converters.
      
      The addition is primarily to allow `ConfigTreePropertySource` values
      to be converted correctly.
      
      Closes gh-24171
      e8244d8d