Update dependencies

Signed-off-by: Eric Zhao <[email protected]>
biliroy · Sep 26, 2018 · cf1cf8a · cf1cf8a
1 parent 9e012d2
commit cf1cf8a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>
diff --git 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
@@ -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
@@ -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>