From cf1cf8a59fbcae9b1032624c5595bc45b9abd66c Mon Sep 17 00:00:00 2001
From: Eric Zhao <sczyh16@gmail.com>
Date: Wed, 26 Sep 2018 15:03:19 +0800
Subject: [PATCH] Update dependencies

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
---
 sentinel-adapter/pom.xml                        | 17 -----------------
 sentinel-adapter/sentinel-dubbo-adapter/pom.xml |  6 +++++-
 sentinel-adapter/sentinel-grpc-adapter/pom.xml  |  4 ++++
 sentinel-adapter/sentinel-web-servlet/pom.xml   |  9 ++++++++-
 sentinel-dashboard/pom.xml                      |  2 --
 .../sentinel-datasource-nacos/pom.xml           |  2 +-
 .../sentinel-datasource-zookeeper/pom.xml       |  2 ++
 7 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/sentinel-adapter/pom.xml b/sentinel-adapter/pom.xml
index 1e7d0963..4ce89dc3 100755
--- a/sentinel-adapter/pom.xml
+++ b/sentinel-adapter/pom.xml
@@ -20,12 +20,6 @@
         <module>sentinel-grpc-adapter</module>
     </modules>
 
-    <properties>
-        <servlet.api.version>3.1.0</servlet.api.version>
-        <dubbo.version>2.5.8</dubbo.version>
-        <grpc.version>1.13.1</grpc.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -38,18 +32,7 @@
                 <artifactId>sentinel-extension</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${servlet.api.version}</version>
-                <scope>provided</scope>
-            </dependency>
 
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>dubbo</artifactId>
-                <version>${dubbo.version}</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/sentinel-adapter/sentinel-dubbo-adapter/pom.xml b/sentinel-adapter/sentinel-dubbo-adapter/pom.xml
index 0d71e9f5..0e837499 100755
--- a/sentinel-adapter/sentinel-dubbo-adapter/pom.xml
+++ b/sentinel-adapter/sentinel-dubbo-adapter/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>sentinel-dubbo-adapter</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <dubbo.version>2.5.8</dubbo.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.alibaba.csp</groupId>
@@ -20,6 +24,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
+            <version>${dubbo.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -37,7 +42,6 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.47</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sentinel-adapter/sentinel-grpc-adapter/pom.xml b/sentinel-adapter/sentinel-grpc-adapter/pom.xml
index 9a38f310..8ca8b743 100755
--- a/sentinel-adapter/sentinel-grpc-adapter/pom.xml
+++ b/sentinel-adapter/sentinel-grpc-adapter/pom.xml
@@ -11,6 +11,10 @@
     <artifactId>sentinel-grpc-adapter</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <grpc.version>1.13.1</grpc.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.alibaba.csp</groupId>
diff --git a/sentinel-adapter/sentinel-web-servlet/pom.xml b/sentinel-adapter/sentinel-web-servlet/pom.xml
index 6d0e0421..40b24069 100755
--- a/sentinel-adapter/sentinel-web-servlet/pom.xml
+++ b/sentinel-adapter/sentinel-web-servlet/pom.xml
@@ -8,18 +8,25 @@
         <artifactId>sentinel-adapter</artifactId>
         <version>0.2.0-SNAPSHOT</version>
     </parent>
+
     <artifactId>sentinel-web-servlet</artifactId>
     <packaging>jar</packaging>
+
+    <properties>
+        <servlet.api.version>3.1.0</servlet.api.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet.api.version}</version>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/sentinel-dashboard/pom.xml b/sentinel-dashboard/pom.xml
index a45464c4..9e46aeaa 100755
--- a/sentinel-dashboard/pom.xml
+++ b/sentinel-dashboard/pom.xml
@@ -108,9 +108,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.47</version>
         </dependency>
-
     </dependencies>
 
     <build>
diff --git a/sentinel-extension/sentinel-datasource-nacos/pom.xml b/sentinel-extension/sentinel-datasource-nacos/pom.xml
index 4d13dc1b..32663a9a 100644
--- a/sentinel-extension/sentinel-datasource-nacos/pom.xml
+++ b/sentinel-extension/sentinel-datasource-nacos/pom.xml
@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <nacos.version>0.1.0</nacos.version>
+        <nacos.version>0.2.0</nacos.version>
     </properties>
 
     <dependencies>
diff --git a/sentinel-extension/sentinel-datasource-zookeeper/pom.xml b/sentinel-extension/sentinel-datasource-zookeeper/pom.xml
index addad8d1..f23972d2 100644
--- a/sentinel-extension/sentinel-datasource-zookeeper/pom.xml
+++ b/sentinel-extension/sentinel-datasource-zookeeper/pom.xml
@@ -13,6 +13,8 @@
     <packaging>jar</packaging>
 
     <properties>
+        <java.source.version>1.7</java.source.version>
+        <java.target.version>1.7</java.target.version>
         <zookeeper.version>3.4.13</zookeeper.version>
         <curator.version>4.0.1</curator.version>
         <curator.test.version>2.12.0</curator.test.version>