zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #8169: Upgrade spring-boot version to 2.6.6 (#8184)

Browse Source
This commit is contained in:
liqipeng 2022-06-06 11:28:32 +08:00 committed by GitHub
parent 9d9a26ace3
commit 4c23846cd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/alibaba/nacos/core/code/SpringApplicationRunListener.java
View File

@ -19,6 +19,7 @@ package com.alibaba.nacos.core.code;
import com.alibaba.nacos.core.listener.LoggingApplicationListener; import com.alibaba.nacos.core.listener.LoggingApplicationListener;
import com.alibaba.nacos.core.listener.NacosApplicationListener; import com.alibaba.nacos.core.listener.NacosApplicationListener;
import com.alibaba.nacos.core.listener.StartingApplicationListener; import com.alibaba.nacos.core.listener.StartingApplicationListener;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.event.EventPublishingRunListener; import org.springframework.boot.context.event.EventPublishingRunListener;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
@ -53,14 +54,15 @@ public class SpringApplicationRunListener implements org.springframework.boot.Sp
} }
@Override @Override
public void starting() { public void starting(ConfigurableBootstrapContext bootstrapContext) {
for (NacosApplicationListener nacosApplicationListener : nacosApplicationListeners) { for (NacosApplicationListener nacosApplicationListener : nacosApplicationListeners) {
nacosApplicationListener.starting(); nacosApplicationListener.starting();
} }
} }
@Override @Override
public void environmentPrepared(ConfigurableEnvironment environment) { public void environmentPrepared(ConfigurableBootstrapContext bootstrapContext,
ConfigurableEnvironment environment) {
for (NacosApplicationListener nacosApplicationListener : nacosApplicationListeners) { for (NacosApplicationListener nacosApplicationListener : nacosApplicationListeners) {
nacosApplicationListener.environmentPrepared(environment); nacosApplicationListener.environmentPrepared(environment);
} }

2
pom.xml
View File

@ -125,7 +125,7 @@
<p3c-pmd.version>1.3.0</p3c-pmd.version> <p3c-pmd.version>1.3.0</p3c-pmd.version>
<!-- dependency version --> <!-- dependency version -->
<spring-boot-dependencies.version>2.1.17.RELEASE</spring-boot-dependencies.version> <spring-boot-dependencies.version>2.6.6</spring-boot-dependencies.version>
<servlet-api.version>3.0</servlet-api.version> <servlet-api.version>3.0</servlet-api.version>
<commons-io.version>2.7</commons-io.version> <commons-io.version>2.7</commons-io.version>
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>