root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-05-06 16:08:20 +02:00
parent 4a99fa8846 8599ee6c2b
commit 964d67474c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -160,8 +160,8 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
* <p>Default is {@link #DEFAULT_ESCAPE_CHARACTER}. * <p>Default is {@link #DEFAULT_ESCAPE_CHARACTER}.
* @since 6.2 * @since 6.2
*/ */
public void setEscapeCharacter(@Nullable Character escsEscapeCharacter) { public void setEscapeCharacter(@Nullable Character escapeCharacter) {
this.escapeCharacter = escsEscapeCharacter; this.escapeCharacter = escapeCharacter;
} }
/** /**

4
spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -123,7 +123,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
* Specify the escape character to use to ignore placeholder prefix * Specify the escape character to use to ignore placeholder prefix
* or value separator, or {@code null} if no escaping should take * or value separator, or {@code null} if no escaping should take
* place. * place.
* <p>The default is "\". * <p>The default is '\'.
* @since 6.2 * @since 6.2
* @see org.springframework.util.SystemPropertyUtils#ESCAPE_CHARACTER * @see org.springframework.util.SystemPropertyUtils#ESCAPE_CHARACTER
*/ */