From 33fc154d645fdc8c392a7d9e350c52fe1b17bf41 Mon Sep 17 00:00:00 2001
From: cdfive <31885791+cdfive@users.noreply.github.com>
Date: Wed, 6 Mar 2019 19:59:34 +0800
Subject: [PATCH] Fix Dubbo-related dependencies in sentinel-dubbo-demo (#534)

* Add spring-context-support 1.0.2 and netty-all 4.1.31.Final dependency, and remove spring-context 5.0.7.RELEASE dependency
* Add comment for dependency
---
 sentinel-demo/sentinel-demo-dubbo/pom.xml | 26 ++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/sentinel-demo/sentinel-demo-dubbo/pom.xml b/sentinel-demo/sentinel-demo-dubbo/pom.xml
index 3cb299c3..0d8b5460 100644
--- a/sentinel-demo/sentinel-demo-dubbo/pom.xml
+++ b/sentinel-demo/sentinel-demo-dubbo/pom.xml
@@ -12,16 +12,32 @@
     <artifactId>sentinel-demo-dubbo</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.0.7.RELEASE</version>
-        </dependency>
+        <!-- Demo use dubbo 2.6.5, since it supports jdk1.6 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
             <version>2.6.5</version>
         </dependency>
+
+        <!-- As dubbo provide qos plugin since 2.5.8 and is enable by default -->
+        <!-- The dubbo-qos module is optional and it depends netty4, so add it explicitly -->
+        <!-- @see http://dubbo.apache.org/zh-cn/docs/user/references/qos.html -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.31.Final</version>
+        </dependency>
+
+        <!-- As demo use @DubboComponentScan to config, which is implemented in dubbo-config-spring module -->
+        <!-- The dubbo-config-spring module is optional and it depends spring-context-support, so add it explicitly-->
+        <!-- @see https://github.com/apache/incubator-dubbo/issues/2869 -->
+        <dependency>
+            <groupId>com.alibaba.spring</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+
+        <!-- sentinel adapter and transport -->
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-dubbo-adapter</artifactId>