1. 07 Apr, 2021 14 commits
  2. 06 Apr, 2021 20 commits
  3. 05 Apr, 2021 4 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 branch '2.4.x' · d578e20b
      Stephane Nicoll authored
      Closes gh-25883
      d578e20b
    • 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 2 commits