(dubbo) branch 3.3 updated: fix DubboAutoConfiguration and DubboRelaxedBinding2AutoConfiguration init too early, (#13461)

[crazyhzm]

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

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


The following commit(s) were added to refs/heads/3.3 by this push:
     new ad803e1c84 fix DubboAutoConfiguration and 
DubboRelaxedBinding2AutoConfiguration init too early, (#13461)
ad803e1c84 is described below

commit ad803e1c84f3ddb2404c912de5ff2d39b4e535a6
Author: foghost <foghost...@gmail.com>
AuthorDate: Wed Dec 13 16:23:14 2023 +0800

    fix DubboAutoConfiguration and DubboRelaxedBinding2AutoConfiguration init 
too early, (#13461)
    
    can not be processed AOT in spring native image scenario
---
 .../boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java       | 2 +-
 .../apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
 
b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
index 8883a94464..1cc1d70cd5 100644
--- 
a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
+++ 
b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
@@ -51,7 +51,7 @@ import static 
org.springframework.beans.factory.config.ConfigurableBeanFactory.S
  * @see DubboRelaxedBindingAutoConfiguration
  * @since 2.7.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(prefix = DUBBO_PREFIX, name = "enabled", matchIfMissing 
= true)
 @ConditionalOnClass(name = 
"org.springframework.boot.context.properties.bind.Binder")
 @AutoConfigureBefore(DubboRelaxedBindingAutoConfiguration.class)
diff --git 
a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
 
b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
index acf60f04df..52825ad6dc 100644
--- 
a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
+++ 
b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
@@ -62,7 +62,7 @@ public class DubboAutoConfiguration {
     @ConditionalOnProperty(prefix = DUBBO_SCAN_PREFIX, name = 
BASE_PACKAGES_PROPERTY_NAME)
     @ConditionalOnBean(name = BASE_PACKAGES_BEAN_NAME)
     @Bean
-    public ServiceAnnotationPostProcessor serviceAnnotationBeanProcessor(
+    public static ServiceAnnotationPostProcessor 
serviceAnnotationBeanProcessor(
             @Qualifier(BASE_PACKAGES_BEAN_NAME) Set<String> packagesToScan) {
         ServiceAnnotationPostProcessor serviceAnnotationPostProcessor;
         try {