Merge pull request #1 from xydonne/yjmyzz-dubbox

bugfix hibernate-validator & make zkclient-0.8.1 to zkclient-0.8 & update webx to 3.1.6
xydonne · Jun 17, 2016 · 1bf93b8 · 1bf93b8
2 parents 8dd6c42 + e049153
commit 1bf93b8
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 5 deletions.
diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml
@@ -20,7 +20,7 @@
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-parent</artifactId>
         <!--注:dubbo-admin用的web框架,不支持最新的spring,所以该项目仍然维护2.8.4-->
-        <version>2.8.4</version>
+        <version>2.8.4a</version>
     </parent>
     <artifactId>dubbo-admin</artifactId>
     <packaging>war</packaging>
@@ -32,7 +32,7 @@
         <eclipse.useProjectReferences>false</eclipse.useProjectReferences>
         <skip_maven_deploy>false</skip_maven_deploy>
         <maven-jetty-plugin_version>8.1.15.v20140411</maven-jetty-plugin_version>
-        <spring.bom.version>3.2.7.RELEASE</spring.bom.version>
+        <spring.bom.version>3.2.16.RELEASE</spring.bom.version>
     </properties>
     <dependencies>
         <dependency>
@@ -133,9 +133,23 @@
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
+            <!-- 配置Tomcat插件 -->
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <port>8080</port>
+                    <path>/</path>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>

diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml
@@ -143,6 +143,14 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>javax.el</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>

diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -149,6 +149,14 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>javax.el</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
 		<sorcerer_version>0.8</sorcerer_version>
 		<zookeeper_version>3.4.6</zookeeper_version>
 		<!--<zkclient_version>0.1</zkclient_version>-->
-		<zkclient_version>0.8.1</zkclient_version>
+		<zkclient_version>0.8</zkclient_version>
 		<curator_version>2.5.0</curator_version>
 		<jedis_version>2.1.0</jedis_version>
 		<xmemcached_version>1.3.6</xmemcached_version>
@@ -114,15 +114,18 @@
 		<hessian_version>4.0.7</hessian_version>
 		<servlet_version>3.1.0</servlet_version>
 		<jetty_version>6.1.26</jetty_version>
-		<validation_version>1.0.0.GA</validation_version>
+		<validation_version>1.1.0.Final</validation_version>
 		<!--<hibernate_validator_version>4.2.0.Final</hibernate_validator_version>-->
 		<hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
+		<javax.el-api_version>2.2.4</javax.el-api_version>
+		<javax.el_version>2.2.4</javax.el_version>
+		<velocity_version>1.7</velocity_version>
 		<jcache_version>0.4</jcache_version>
 		<sca_version>2.0-M5.1</sca_version>
 		<guice_version>3.0</guice_version>
 		<cglib_version>2.2</cglib_version>
 		<!--<webx_version>3.0.8</webx_version>-->
-		<webx_version>3.0.8</webx_version>
+		<webx_version>3.1.6</webx_version>
         <!--<jackson_version>2.3.3</jackson_version>-->
 		<jackson_version>2.7.1</jackson_version>
 
@@ -340,11 +343,26 @@
 				<artifactId>hibernate-validator</artifactId>
 				<version>${hibernate_validator_version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.el</groupId>
+				<artifactId>javax.el-api</artifactId>
+				<version>${javax.el-api_version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.web</groupId>
+				<artifactId>javax.el</artifactId>
+				<version>${javax.el_version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.cache</groupId>
 				<artifactId>cache-api</artifactId>
 				<version>${jcache_version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.velocity</groupId>
+				<artifactId>velocity</artifactId>
+				<version>${velocity_version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-sca-api</artifactId>