modified dubbo-samples-nacos-configcenter for dubbo#8217 (#352)
* modified dubbo-samples-nacos-configcenter for fix dubbo#8217
* reverted configcenter-consumer.xml
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml
index aaea1c6..98e8958 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 @@
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.7</dubbo.version>
+ <alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<slf4j.version>1.7.25</slf4j.version>
@@ -64,6 +65,12 @@
</dependency>
<dependency>
+ <groupId>com.alibaba.spring</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${alibaba_spring_context_support_version}</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -79,6 +86,11 @@
<dependencies>
<dependency>
+ <groupId>com.alibaba.spring</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
</dependency>
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 2a2f989..c61f3f4 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 c99668a..f21b894 100644
--- a/test/dubbo-test-runner/src/docker/Dockerfile
+++ b/test/dubbo-test-runner/src/docker/Dockerfile
@@ -43,7 +43,7 @@
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="" \
