Skip to content

Commit

Permalink
Merge branch '3.2.x'
Browse files Browse the repository at this point in the history
Closes gh-40959
  • Loading branch information
scottfrederick committed May 30, 2024
2 parents abb1df4 + c369098 commit fa131fa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ public static class LiquibaseConfiguration {

@Bean
@ConditionalOnMissingBean(LiquibaseConnectionDetails.class)
PropertiesLiquibaseConnectionDetails liquibaseConnectionDetails(LiquibaseProperties properties,
ObjectProvider<JdbcConnectionDetails> jdbcConnectionDetails) {
PropertiesLiquibaseConnectionDetails liquibaseConnectionDetails(LiquibaseProperties properties) {
return new PropertiesLiquibaseConnectionDetails(properties);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

/**
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit fa131fa

Please sign in to comment.