Skip to content

Commit fa131fa

Browse files
Merge branch '3.2.x'
Closes gh-40959
2 parents abb1df4 + c369098 commit fa131fa

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ public static class LiquibaseConfiguration {
9090

9191
@Bean
9292
@ConditionalOnMissingBean(LiquibaseConnectionDetails.class)
93-
PropertiesLiquibaseConnectionDetails liquibaseConnectionDetails(LiquibaseProperties properties,
94-
ObjectProvider<JdbcConnectionDetails> jdbcConnectionDetails) {
93+
PropertiesLiquibaseConnectionDetails liquibaseConnectionDetails(LiquibaseProperties properties) {
9594
return new PropertiesLiquibaseConnectionDetails(properties);
9695
}
9796

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

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

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/Encoding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class Encoding {
6060
private Boolean forceResponse;
6161

6262
/**
63-
* Mapping of locale to charset for response encoding..
63+
* Mapping of locale to charset for response encoding.
6464
*/
6565
private Map<Locale, Charset> mapping;
6666

0 commit comments

Comments
 (0)