You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/11/04 09:02:52 UTC

[dubbo] branch 3.0 updated: [3.0] Fix WelcomeLogoApplicationListener not triggered (#9192)

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 690d397  [3.0] Fix WelcomeLogoApplicationListener not triggered (#9192)
690d397 is described below

commit 690d397f5e8da2968fe9fe65cd56e63aa81827d3
Author: stone 98 <35...@users.noreply.github.com>
AuthorDate: Thu Nov 4 17:02:39 2021 +0800

    [3.0] Fix WelcomeLogoApplicationListener not triggered (#9192)
---
 .../spring/boot/autoconfigure/DubboListenerAutoConfiguration.java  | 7 -------
 .../autoconfigure/src/main/resources/META-INF/spring.factories     | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboListenerAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboListenerAutoConfiguration.java
index 9f4f390..f55a7ce 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboListenerAutoConfiguration.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboListenerAutoConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.dubbo.spring.boot.autoconfigure;
 
 import org.apache.dubbo.spring.boot.context.event.AwaitingNonWebApplicationListener;
 import org.apache.dubbo.spring.boot.context.event.DubboConfigBeanDefinitionConflictApplicationListener;
-import org.apache.dubbo.spring.boot.context.event.WelcomeLogoApplicationListener;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -44,12 +43,6 @@ public class DubboListenerAutoConfiguration {
 
     @ConditionalOnMissingBean
     @Bean
-    public WelcomeLogoApplicationListener welcomeLogoApplicationListener() {
-        return new WelcomeLogoApplicationListener();
-    }
-
-    @ConditionalOnMissingBean
-    @Bean
     public AwaitingNonWebApplicationListener awaitingNonWebApplicationListener() {
         return new AwaitingNonWebApplicationListener();
     }
diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories
index c993207..b959a23 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories
@@ -2,6 +2,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration,\
 org.apache.dubbo.spring.boot.autoconfigure.DubboRelaxedBindingAutoConfiguration,\
 org.apache.dubbo.spring.boot.autoconfigure.DubboListenerAutoConfiguration
+org.springframework.context.ApplicationListener=\
+org.apache.dubbo.spring.boot.context.event.WelcomeLogoApplicationListener
 org.springframework.boot.env.EnvironmentPostProcessor=\
 org.apache.dubbo.spring.boot.env.DubboDefaultPropertiesEnvironmentPostProcessor
 org.springframework.context.ApplicationContextInitializer=\