Update spring cloud 2023.0.5 & spring boot 3.3.7

pull/3937/head
jaimy 2 weeks ago
parent 92b81c86d3
commit 50ee0030b5

@ -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>
@ -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>

@ -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>

@ -19,6 +19,7 @@ package com.alibaba.cloud.nacos;
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;
@ -600,7 +601,7 @@ public class NacosConfigProperties {
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();

@ -20,6 +20,7 @@ import java.io.IOException;
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;
@ -124,7 +125,7 @@ public class NacosConfigDataLoader implements ConfigDataLoader<NacosConfigDataRe
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.

@ -22,6 +22,7 @@ import java.net.InetAddress;
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;
@ -707,7 +708,7 @@ public class NacosDiscoveryProperties {
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();

@ -21,6 +21,7 @@ import java.lang.reflect.InvocationTargetException;
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;
@ -99,7 +100,7 @@ public class SentinelInvocationHandler implements InvocationHandler {
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 {

@ -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>

Loading…
Cancel
Save