From 55bcb7b1ae36115cba099d49fd7ae56c1d452618 Mon Sep 17 00:00:00 2001
From: cdfive <176402936@qq.com>
Date: Sat, 2 Mar 2019 12:19:47 +0800
Subject: [PATCH 1/3] add spring-context-support 1.0.2 and netty-all
 4.1.31.Final dependency, and remove spring-context 5.0.7.RELEASE dependency

---
 sentinel-demo/sentinel-demo-dubbo/pom.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/sentinel-demo/sentinel-demo-dubbo/pom.xml b/sentinel-demo/sentinel-demo-dubbo/pom.xml
index 3cb299c318..07a7dcec1e 100644
--- a/sentinel-demo/sentinel-demo-dubbo/pom.xml
+++ b/sentinel-demo/sentinel-demo-dubbo/pom.xml
@@ -12,16 +12,21 @@
     <artifactId>sentinel-demo-dubbo</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.0.7.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
             <version>2.6.5</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.31.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.spring</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>1.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-dubbo-adapter</artifactId>

From 727387db3e26a732848a7b85fde19f0983d66b9a Mon Sep 17 00:00:00 2001
From: xiejihan <176402936@qq.com>
Date: Wed, 6 Mar 2019 19:02:00 +0800
Subject: [PATCH 2/3] Add comment for dependency

---
 sentinel-demo/sentinel-demo-dubbo/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sentinel-demo/sentinel-demo-dubbo/pom.xml b/sentinel-demo/sentinel-demo-dubbo/pom.xml
index 07a7dcec1e..0347aa130c 100644
--- a/sentinel-demo/sentinel-demo-dubbo/pom.xml
+++ b/sentinel-demo/sentinel-demo-dubbo/pom.xml
@@ -12,21 +12,32 @@
     <artifactId>sentinel-demo-dubbo</artifactId>
 
     <dependencies>
+        <!-- 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 module -->
+        <!-- The dubbo-config 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>

From 8b3ac2f45baa44d5b7668bc689267cb407ac4446 Mon Sep 17 00:00:00 2001
From: xiejihan <176402936@qq.com>
Date: Wed, 6 Mar 2019 19:10:25 +0800
Subject: [PATCH 3/3] improve comment, modify dubbo-config to
 dubbo-config-spring

---
 sentinel-demo/sentinel-demo-dubbo/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sentinel-demo/sentinel-demo-dubbo/pom.xml b/sentinel-demo/sentinel-demo-dubbo/pom.xml
index 0347aa130c..0d8b54600e 100644
--- a/sentinel-demo/sentinel-demo-dubbo/pom.xml
+++ b/sentinel-demo/sentinel-demo-dubbo/pom.xml
@@ -28,8 +28,8 @@
             <version>4.1.31.Final</version>
         </dependency>
 
-        <!-- As demo use @DubboComponentScan to config, which is implemented in dubbo-config module -->
-        <!-- The dubbo-config module is optional and it depends spring-context-support, so add it explicitly-->
+        <!-- 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>