1. 07 Apr, 2021 4 commits
  2. 06 Apr, 2021 3 commits
  3. 05 Apr, 2021 3 commits
    • Phillip Webb's avatar
      Support profile specific ConfigData imports · 5774ea3f
      Phillip Webb authored
      Update the `ConfigData` import support to allow individual property
      sources to be imported with a higher precedence than profile specific
      imports.
      
      Prior to this commit, imported sources would always have a higher
      precedence than the file that imported them, but a lower precedence
      than any profile-specific variant of the same file.
      
      For example, given an `application.properties` that imports `myconfig`,
      the contributor tree would be as follows:
      
      	ROOT
      	 +- `application.properties`
      	 |    +- myconfig
      	 +- `application-<profile>.properties`
      
      The precedence would be:
      
      	1) `application-<profile>.properties`
      	2) myconfig
      	3) `application.properties`
      
      This works well for most situations, but can be confusing if import is
      for a profile-specific property source. For example:
      
      	ROOT
      	 +- `application.properties`
      	 |    +- myconfig
      	 |    +- myconfig-<profile>
      	 +- `application-<profile>.properties`
      
      Results in the order precedence of:
      
      	1) `application-<profile>.properties`
      	2) myconfig-<profile>
      	3) myconfig
      	4) `application.properties`
      
      This means that whilst `myconfig` overrides `application.properties`,
      `myconfig-profile` does not override `application-<profile>.properties`.
      
      For this specific situation, the preferable order would be:
      
      	1) myconfig-<profile>
      	2) `application-<profile>.properties`
      	3) myconfig
      	4) `application.properties`
      
      To support this alternative ordering a new `PROFILE_SPECIFIC` config
      data option has been added. Additionally, options may now be specified
      on a per-source basis by using the `PropertySourceOptions` interface.
      
      Fixes gh-25766
      5774ea3f
    • Stephane Nicoll's avatar
      Merge pull request #25882 from shakuzen · f289f922
      Stephane Nicoll authored
      * pr/25882:
        Polish HealthIndicators table in docs
      
      Closes gh-25882
      f289f922
    • Tommy Ludwig's avatar
      Polish HealthIndicators table in docs · 3746385f
      Tommy Ludwig authored
      `=======` was showing up in the header of the table, which should not
      be there.
      
      See gh-25882
      3746385f
  4. 04 Apr, 2021 3 commits
  5. 01 Apr, 2021 13 commits
  6. 31 Mar, 2021 2 commits
    • Andy Wilkinson's avatar
      Merge branch '2.3.x' into 2.4.x · 0e4b66a3
      Andy Wilkinson authored
      Closes gh-25844
      0e4b66a3
    • Andy Wilkinson's avatar
      Align PushGatewayManager's exception handling with PushMeterRegistry's · 1a84b061
      Andy Wilkinson authored
      Previously, would log an error for any exception and also stop
      publishing for an UnknownHostException. By constrast, Micrometer's
      PushMeterRegistry treats all exceptions the same, logging a warning
      and continuing with subsequent push attempts.
      
      This commit updates the push gateway manager's behaviour to match
      PushMeterRegistry. UknownHostExceptions no longer receive special
      treatment and push (and delete) failures are now logged as warnings
      rather than errors.
      
      Fixes gh-25804
      1a84b061
  7. 30 Mar, 2021 12 commits