Merge branch '3.2.x'

Closes gh-40959
This commit is contained in:
Scott Frederick 2024-05-30 15:16:27 -05:00
commit fa131fa6a0
3 changed files with 5 additions and 6 deletions

View File

@ -90,8 +90,7 @@ public class LiquibaseAutoConfiguration {
@Bean
@ConditionalOnMissingBean(LiquibaseConnectionDetails.class)
PropertiesLiquibaseConnectionDetails liquibaseConnectionDetails(LiquibaseProperties properties,
ObjectProvider<JdbcConnectionDetails> jdbcConnectionDetails) {
PropertiesLiquibaseConnectionDetails liquibaseConnectionDetails(LiquibaseProperties properties) {
return new PropertiesLiquibaseConnectionDetails(properties);
}

View File

@ -28,9 +28,9 @@ import org.springframework.util.StringUtils;
/**
* A configuration property name composed of elements separated by dots. User created
* names may contain the characters "{@code a-z}" "{@code 0-9}") and "{@code -}", they
* must be lower-case and must start with an alphanumeric character. The "{@code -}" is
* used purely for formatting, i.e. "{@code foo-bar}" and "{@code foobar}" are considered
* names may contain the characters "{@code a-z}" "{@code 0-9}" and "{@code -}", they must
* be lower-case and must start with an alphanumeric character. The "{@code -}" is used
* purely for formatting, i.e. "{@code foo-bar}" and "{@code foobar}" are considered
* equivalent.
* <p>
* The "{@code [}" and "{@code ]}" characters may be used to indicate an associative

View File

@ -60,7 +60,7 @@ public class Encoding {
private Boolean forceResponse;
/**
* Mapping of locale to charset for response encoding..
* Mapping of locale to charset for response encoding.
*/
private Map<Locale, Charset> mapping;