Commit Graph

30832 Commits (f5009cb0a8c3d76894cd85b9cc9e341eb98179a2)
 

Author SHA1 Message Date
Stephane Nicoll f5009cb0a8 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 2a60503849 Start building against Spring Session Dragonfruit-SR3 snapshots
See gh-25907
4 years ago
Stephane Nicoll e4bf730f0b Start building against Spring Security 5.3.9 snapshots
See gh-25906
4 years ago
Stephane Nicoll b12a725977 Start building against Spring Data Neumann-SR9 snapshots
See gh-25905
4 years ago
Stephane Nicoll 80e893ebae Upgrade to Spring HATEOAS 1.1.5
Closes gh-25904
4 years ago
Stephane Nicoll aab5859fde Start building against Spring Framework 5.2.14 snapshots
See gh-25903
4 years ago
Stephane Nicoll ac1117f1a1 Start building against Reactor Reactor Dysprosium-SR19
See gh-25902
4 years ago
Andy Wilkinson 8cd08c3926 Merge branch '2.3.x' into 2.4.x
Closes gh-25899
4 years ago
Andy Wilkinson 7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
4 years ago
Andy Wilkinson e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
4 years ago
Andy Wilkinson 8048e59fa9 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson b35d1ec6e8 Revert "Use test harness for image building integration tests"
This reverts commit da9d8d6055.

See gh-25838
4 years ago
Phillip Webb 2971bdd9e3 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 51d57e19d0 Attempt to overcome Docker rate limiting on CI
Update the common build script to pull buildpack images early using the
authenticated CLI.

See gh-25838
4 years ago
Andy Wilkinson 1e4f130133 Merge branch '2.3.x' into 2.4.x
Closes gh-25895
4 years ago
Andy Wilkinson 76f74482d4 Make Asciidoctor tasks run when Java examples are updated
Closes gh-25892
4 years ago
Phillip Webb 8a04547454 Fix checkstyle violation
See gh-25766
4 years ago
Phillip Webb 5774ea3f0c Support profile specific ConfigData imports
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
4 years ago
Stephane Nicoll f289f922fd Merge pull request #25882 from shakuzen
* pr/25882:
  Polish HealthIndicators table in docs

Closes gh-25882
4 years ago
Tommy Ludwig 3746385f98 Polish HealthIndicators table in docs
`=======` was showing up in the header of the table, which should not
be there.

See gh-25882
4 years ago
Stephane Nicoll 103155694f Merge pull request #25875 from izeye
* pr/25875:
  Polish contribution
  Polish

Closes gh-25875
4 years ago
Stephane Nicoll db3dfffdca Polish contribution
See gh-25875
4 years ago
izeye 852e5778a3 Polish
See gh-25875
4 years ago
Andy Wilkinson 0005263f76 Merge branch '2.3.x' into 2.4.x
Closes gh-25869
4 years ago
Andy Wilkinson 1b91c1706e Ensure that Cassandra's DriverConfigLoader is only closed once
Fixes gh-25796
4 years ago
Andy Wilkinson ba28f21e27 Merge branch '2.3.x' into 2.4.x
Closes gh-25866
4 years ago
Andy Wilkinson cbf37b3a8b Use main as the branch name in info endpoint example
Closes gh-25865
4 years ago
Andy Wilkinson d82889f42e Merge branch '2.3.x' into 2.4.x
Closes gh-25863
4 years ago
Andy Wilkinson b7df0508ac Merge pull request #25800 from MatejNedic
* gh-25800:
  Polish "Fix no such bean definition with ancestor-defined Validator"
  Fix no such bean definition with ancestor-defined Validator

Closes gh-25800
4 years ago
Andy Wilkinson cf0bd0f959 Polish "Fix no such bean definition with ancestor-defined Validator"
See gh-25800
4 years ago
MatejNedic 8958101510 Fix no such bean definition with ancestor-defined Validator
See gh-25800
4 years ago
Andy Wilkinson d1359220ed Merge branch '2.3.x' into 2.4.x
Closes gh-25861
4 years ago
Andy Wilkinson 7d632ea397 Use ApplicationContextRunner in ValidationAutoConfigurationTests
Closes gh-25859
4 years ago
Stephane Nicoll aa003f23d6 Upgrade Ubuntu version in CI images
Closes gh-25852
4 years ago
Stephane Nicoll 0afd2e2a47 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 9b8a9f8cf1 Upgrade Ubuntu version in CI images
Closes gh-25851
4 years ago
Andy Wilkinson 0e4b66a3ea Merge branch '2.3.x' into 2.4.x
Closes gh-25844
4 years ago
Andy Wilkinson 1a84b0610e Align PushGatewayManager's exception handling with PushMeterRegistry's
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
4 years ago
Scott Frederick 586ce00e06 Merge branch '2.3.x' into 2.4.x
Closes gh-25839
4 years ago
Scott Frederick da9d8d6055 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
4 years ago
Andy Wilkinson 563b8a8cec Merge branch '2.3.x' into 2.4.x
See gh-25836
4 years ago
Andy Wilkinson e94f8bba62 Ensure that upstream jars have been built
See gh-25835
4 years ago
Andy Wilkinson 38a4f135a9 Merge branch '2.3.x' into 2.4.x
Closes gh-25836
4 years ago
Andy Wilkinson ca9a619259 Defer processing of zipTree source until execution time
Closes gh-25835
4 years ago
Andy Wilkinson 7a846ad41f Merge branch '2.3.x' into 2.4.x
Closes gh-25832
4 years ago
Andy Wilkinson fef24a300b Merge pull request #25621 from robert-smith-911
* gh-25621:
  Polish "Document Failsafe configuration when not using starter parent"
  Document Failsafe configuration when not using starter parent

Closes gh-25621
4 years ago
Andy Wilkinson 5a086321c6 Polish "Document Failsafe configuration when not using starter parent"
See gh-25621
4 years ago
robert-smith-911 0d79fd3e01 Document Failsafe configuration when not using starter parent
See gh-25621
4 years ago
Phillip Webb a28a3ae090 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 9c8a97809d Consistent use of @deprecated since
Restore the patch version number for consistency with `@since`
tags.

See gh-25808
4 years ago