Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update spring cloud 2023.0.5 & spring boot 3.3.7 #3937

Open
wants to merge 1 commit into
base: 2023.x
Choose a base branch
from
Open

Update spring cloud 2023.0.5 & spring boot 3.3.7 #3937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.3</version>
<version>4.1.5</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -83,10 +83,10 @@
<revision>2023.0.3.2</revision>

<!-- Spring Cloud -->
<spring.cloud.version>2023.0.3</spring.cloud.version>
<spring.cloud.version>2023.0.5</spring.cloud.version>

<!-- Spring Boot -->
<spring-boot.version>3.2.9</spring-boot.version>
<spring-boot.version>3.3.7</spring-boot.version>

<!-- Maven Plugin Versions -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>4.1.0</version>
<version>4.1.5</version>
<relativePath/>
</parent>

Expand Down
3 changes: 2 additions & 1 deletion ...ing-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
Expand Down Expand Up @@ -600,7 +601,7 @@ protected String resolveKey(String key) {
Matcher matcher = PATTERN.matcher(key);
StringBuffer sb = new StringBuffer();
while (matcher.find()) {
matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
matcher.appendReplacement(sb, matcher.group(1).toUpperCase(Locale.ROOT));
}
matcher.appendTail(sb);
return sb.toString();
Expand Down
3 changes: 2 additions & 1 deletion ...-nacos-config/src/main/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;

import com.alibaba.cloud.nacos.NacosConfigManager;
import com.alibaba.cloud.nacos.NacosConfigProperties;
Expand Down Expand Up @@ -124,7 +125,7 @@ private ConfigPreference getPreference(ConfigDataLoaderContext context,
String specificPreference = resource.getConfig().getPreference();
if (specificPreference != null) {
try {
preference = ConfigPreference.valueOf(specificPreference.toUpperCase());
preference = ConfigPreference.valueOf(specificPreference.toUpperCase(Locale.ROOT));
}
catch (IllegalArgumentException ignore) {
// illegal preference value, just ignore.
Expand Down
3 changes: 2 additions & 1 deletion ...ibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.net.NetworkInterface;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
Expand Down Expand Up @@ -707,7 +708,7 @@ private String resolveKey(String key) {
Matcher matcher = PATTERN.matcher(key);
StringBuffer sb = new StringBuffer();
while (matcher.find()) {
matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
matcher.appendReplacement(sb, matcher.group(1).toUpperCase(Locale.ROOT));
}
matcher.appendTail(sb);
return sb.toString();
Expand Down
3 changes: 2 additions & 1 deletion ...ba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;

import com.alibaba.csp.sentinel.Entry;
Expand Down Expand Up @@ -99,7 +100,7 @@ else if ("toString".equals(method.getName())) {
result = methodHandler.invoke(args);
}
else {
String resourceName = methodMetadata.template().method().toUpperCase()
String resourceName = methodMetadata.template().method().toUpperCase(Locale.ROOT)
+ ":" + hardCodedTarget.url() + methodMetadata.template().path();
Entry entry = null;
try {
Expand Down
1 change: 0 additions & 1 deletion spring-cloud-alibaba-tests/nacos-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>4.1.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Loading