Commit Graph

12262 Commits (6a7f1f1c56208624360bc6dc291499231943407d)

Author SHA1 Message Date
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
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 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 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
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 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
Andy Wilkinson d9ce30b15c Merge branch '2.3.x' into 2.4.x
See gh-25825
4 years ago
Andy Wilkinson 8b6eef6f1d Consistent use of @deprecated since
See gh-25808
4 years ago
Phillip Webb a0f5169966 Polish 4 years ago
Phillip Webb 363f5829d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25825
4 years ago
Phillip Webb 26dd1b9a26 Update deprecations with for removal targets
Update all deprecation tags to include a removal target.

Closes gh-25808
4 years ago
Andy Wilkinson a025f3d252 Merge branch '2.3.x' into 2.4.x
Closes gh-25822
4 years ago
Andy Wilkinson 896f20e1d3 Improve diagnostics of ClassPathFileSystemWatcherTests
Closes gh-25821
4 years ago
Stephane Nicoll 8bb4020bd4 Polish
See gh-25819
4 years ago
Andy Wilkinson 403e747c46 Use constructor injection in SpringBootRepositoryRestConfigurer
Closes gh-25819
4 years ago
Stephane Nicoll d1aaee46bb Merge branch '2.3.x' into 2.4.x
Closes gh-25812
4 years ago
dreis2211 be4491959b Fix flaky QuartzAutoConfigurationTests
See gh-25810
4 years ago
Scott Frederick 4015d70f00 Merge branch '2.3.x' into 2.4.x
Closes gh-25789
4 years ago
Scott Frederick 3ad5f1013a Fix Maven image building with classifiers
Fixes gh-25736
4 years ago
Andy Wilkinson af7e4e211c Support all known endpoint types
Previously, the configuration metadata annotation processor only
declared support for `@Endpoint` and none of the other more
specialized `@…Endpoint` annotations that are meta-annotated with
`@Endpoint` such as `@WebEndpoint` and `@JmxEndpoint. This would
result in missing metadata if a full or incremental build only
compiled classes annotated with one of the more specialized
`@…Endpoint` annotations as the annotation processor would not be
called.

This commit updates the processor's supported annotation types to
include every known `@…Endpoint` annotation. The test processor has
also been similarly updated to align its behaviour with that of the
main processor.

Fixes gh-25388
4 years ago
Phillip Webb 35aeae5a4f Deprecate Bootstrapper
Deprecate the `Bootstrapper` interface entirely and provide a
`BootstrapRegistryInitializer` alternative so that people can migrate.

Unfortunately our previous attempt to fix the typo in the `Bootstrapper`
interface didn't provide us a way to remove the deprecated method
without impacting users. It was also problematic for people who were
implementing `Bootstrapper` rather than using a lambda since they needed
to introduce the deprecated method.

We unfortunately can't see a way to fix the original typo without
introducing a new interface.

Fixes gh-25735
4 years ago
Phillip Webb ddf5c9f5d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25786
4 years ago
Phillip Webb 88b74097ba Polish 'Ignore quality value when removing MediaType.ALL'
See gh-25778
4 years ago
Fábio Ramon 3090a3a71f Ignore quality value when removing MediaType.ALL
Update the default reactive exception handler so that `MediaType.ALL`
is removed regardless of any quality setting. Prior to this commit,
the "match-all" media type was not properly ignored if it has a quality
value and would show HTML content if the accept header was
`application/json, */*;q=0.9`.

See gh-25778
4 years ago
Phillip Webb 5274cf2459 Merge branch '2.3.x' into 2.4.x
Closes gh-25784
4 years ago
Phillip Webb 130cc5b036 Chain caught InvalidEndpointRequestExceptions
Update `AbstractWebMvcEndpointHandlerMapping` to chain any caught
InvalidEndpointRequestExceptions so that a more complete stacktrace
is available. The exception has also been updated to a
`ResponseStatusException` so that the reason can be propagated.

Fixes gh-25642
4 years ago
Phillip Webb ca9fae6b47 Merge branch '2.3.x' into 2.4.x
Closes gh-25774
4 years ago
Phillip Webb ec21202d54 Delete unpacked jars when the JVM exits
Update `JarFileArchive` so that any unpacked files are now deleted when
the JVM exits.

Closes gh-25773
4 years ago
Phillip Webb 05f61bccea Align unpack logic with Files.createTempDirectory
Update `JarFileArchive` to align the way that it creates temp files and
folders with the way that `Files.createTempDirectory` works.

Closes gh-25772
4 years ago
Phillip Webb b8873578ca Add missing @Deprecated annotations 4 years ago
Phillip Webb 9af6c895c9 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 2b591387b8 Restore tomcat-embed TldPatterns
Restore tomcat-embed-core-* and tomcat-embed-logging-* patterns which
were inadvertently removed in commit 0ec8d281ef.

See gh-25764
4 years ago
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 82127fdaa3 Update copyright year of changed files 4 years ago
Phillip Webb 56674b9031 Merge branch '2.3.x' into 2.4.x
Closes gh-25770
4 years ago
Phillip Webb 0ec8d281ef Align TldPatterns with Tomcat default
Update `TldPatterns` to align with the latest default shipped by Tomcat.
This commit also introduces a test to ensure that we will remain aligned
going forwards.

Closes gh-25764
4 years ago
Andy Wilkinson 96ba9ae47f Merge branch '2.3.x' into 2.4.x
Closes gh-25768
4 years ago
Andy Wilkinson 62023104de Test auto-configured MockRestServiceServer with metrics and a root URI
Closes gh-25741
4 years ago
Andy Wilkinson 33cf8b3bc4 Merge branch '2.3.x' into 2.4.x
Closes gh-25765
4 years ago
Andy Wilkinson bf6f36a783 Apply any root URI to RestTemplate metric's URI tag
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.

This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.

Fixes gh-25744
4 years ago
Stephane Nicoll 2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
4 years ago
Stephane Nicoll c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
4 years ago
bono007 674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
4 years ago
Scott Frederick 6f860b441b Merge branch '2.3.x' into 2.4.x
Closes gh-25700
4 years ago
Stephane Nicoll 072c858d0e Upgrade to Spring Batch 4.3.2
Closes gh-25579
4 years ago
Stephane Nicoll 8e35d6a5fc Upgrade to Spring Integration 5.4.5
Closes gh-25646
4 years ago
Scott Frederick e4fa39df01 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
4 years ago
Andy Wilkinson 0d7a60f8cf Upgrade to Spring AMQP 2.3.6
Closes gh-25647
4 years ago
Andy Wilkinson 5005bd3ded Upgrade to Spring Kafka 2.6.7
Closes gh-25578
4 years ago
Stephane Nicoll 6f9352bda9 Fix description of management.metrics.export.influx.db
Closes gh-25723
4 years ago
Stephane Nicoll 42994349fe Merge branch '2.3.x' into 2.4.x
Closes gh-25724
4 years ago
Stephane Nicoll 446e838b1b Fix description of management.metrics.export.influx.db
Closes gh-25723
4 years ago
Stephane Nicoll 606c871d4a Upgrade to Spring Data 2020.0.6
Closes gh-25547
4 years ago
Stephane Nicoll 052624ffb2 Upgrade to Lettuce 6.0.3.RELEASE
Closes gh-25720
4 years ago
Stephane Nicoll a8667daf52 Upgrade to Kotlin Coroutines 1.4.3
Closes gh-25719
4 years ago
Andy Wilkinson 758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
4 years ago
Andy Wilkinson c815195f13 Polish 4 years ago
Andy Wilkinson 5595fd4017 Merge branch '2.3.x' into 2.4.x
Closes gh-25715
4 years ago
Andy Wilkinson 0e0418546b Test spring-boot:build-image when repackage is also invoked
Closes gh-25714
4 years ago
Andy Wilkinson ed4e419b0c Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit eaa510872a, reversing
changes made to 3e69522e2d.

See gh-25700
4 years ago
Andy Wilkinson ae2ff7849b Revert "Fail fast when finalName is misconfigured"
This reverts commit 263b7c20e4.

See gh-25590
4 years ago
Scott Frederick eaa510872a Merge branch '2.3.x' into 2.4.x
Closes gh-25700
4 years ago
Scott Frederick 263b7c20e4 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
4 years ago
Andy Wilkinson 3e69522e2d Merge branch '2.3.x' into 2.4.x
Closes gh-25702
4 years ago
Andy Wilkinson f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1
Closes gh-25558
4 years ago
Andy Wilkinson 2560f261cd Merge branch '2.3.x' into 2.4.x
Closes gh-25692
4 years ago
Andy Wilkinson a832cc9ccd Polish "Improve error message when no resources exist at a script location"
See gh-25620
4 years ago
Yuta Saito 42841b895f Improve error message when no resources exist at a script location
See gh-25620
4 years ago
Andy Wilkinson 226ee61dea Create exception reporters when needed so they pick up current state
Fixes gh-25691
4 years ago
Andy Wilkinson f9db1968bf Upgrade to Micrometer 1.6.5
Closes gh-25543
4 years ago
Andy Wilkinson af23da1dff Upgrade to Spring HATEOAS 1.2.5
Closes gh-25545
4 years ago
Stephane Nicoll e100291043 Upgrade to Spring Framework 5.3.5
Closes gh-25541
4 years ago
Stephane Nicoll c8fbbe9eaa Upgrade to Reactor 2020.0.5
Closes gh-25539
4 years ago
Stephane Nicoll 6b9032b4d3 Document that Java 16 is supported
Closes gh-25527
4 years ago
Stephane Nicoll 9aa1ce235f Document DataSource implementations supported by DataSourceBuilder
Closes gh-25333
4 years ago
Stephane Nicoll c66db586bf Upgrade to Undertow 2.2.5.Final
Closes gh-25641
4 years ago
Stephane Nicoll bf4ebcf6ea Upgrade to Tomcat 9.0.44
Closes gh-25640
4 years ago
Stephane Nicoll e0b54cb102 Upgrade to Sun Mail 1.6.6
Closes gh-25639
4 years ago
Stephane Nicoll 0c67a6ad2c Upgrade to R2DBC Bom Arabba-SR9
Closes gh-25638
4 years ago
Stephane Nicoll 97e54fc48c Upgrade to Postgresql 42.2.19
Closes gh-25637
4 years ago