diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml index aaea1c637c..98e8958667 100644 --- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml +++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml @@ -32,6 +32,7 @@ 1.8 1.8 2.7.7 + 1.0.11 4.3.16.RELEASE 4.12 1.7.25 @@ -63,6 +64,12 @@ pom + + com.alibaba.spring + spring-context-support + ${alibaba_spring_context_support_version} + + junit junit @@ -78,6 +85,11 @@ + + com.alibaba.spring + spring-context-support + + org.apache.dubbo dubbo diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java index 2a2f98929d..c61f3f4850 100644 --- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java +++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java @@ -19,19 +19,19 @@ import org.apache.dubbo.samples.configcenter.api.DemoService; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:spring/configcenter-consumer.xml") +@EnableDubbo public class DemoServiceIT { - @Autowired - @Qualifier("demoService") + @Reference(id = "demoService") private DemoService demoService; @Test diff --git a/test/dubbo-test-runner/src/docker/Dockerfile b/test/dubbo-test-runner/src/docker/Dockerfile index c99668ac90..f21b8948dc 100644 --- a/test/dubbo-test-runner/src/docker/Dockerfile +++ b/test/dubbo-test-runner/src/docker/Dockerfile @@ -43,7 +43,7 @@ ENV JAVA_OPTS="" \ APP_DEPENDENCY_DIR="/usr/local/dubbo/app/dependency" \ SERVICE_NAME="" \ SERVICE_TYPE="app" \ - WAIT_TIMEOUT=60 \ + WAIT_TIMEOUT=180 \ WAIT_PORTS_BEFORE_RUN="" \ RUN_DELAY=0 \ APP_MAIN_CLASS="" \