Index: build.gradle
===================================================================
diff -u -r12331 -r12335
--- build.gradle	(.../build.gradle)	(revision 12331)
+++ build.gradle	(.../build.gradle)	(revision 12335)
@@ -18,16 +18,17 @@
     
     ext.packageName = 'com.forgon'
     
-    ext.jdkversion = 1.7
-	ext.aspectjVersion = '1.7.4'
-	ext.springVersion = '3.2.14.RELEASE'
-	ext.struts2Version = '2.2.3.1'
+    ext.jdkversion = 1.8
+	ext.springVersion = '4.2.4.RELEASE'
+	ext.springSecurityVersion = '3.2.9.RELEASE'
+	ext.hibernateVersion = '4.3.11.Final'
+	ext.struts2Version = '2.3.24.1'
+	ext.cxfVersion = '3.1.5'
 	ext.encoding = 'UTF-8'
 	ext.webAppLibDir = "../ssts-web/src/main/webapp/WEB-INF/lib"
 
 
     compileJava {
-		// Uses JDK 7
 		sourceCompatibility = jdkversion
 		targetCompatibility = jdkversion
 		
@@ -43,7 +44,6 @@
 	}
 	
 	compileTestJava {
-		// Uses JDK 7
 		sourceCompatibility = jdkversion
 		targetCompatibility = jdkversion
 		
@@ -114,7 +114,7 @@
         
 	}
 
-    version = '4.0.33'
+    version = '4.1.0'
     group = 'com.forgon'
 
 	/*
@@ -142,35 +142,41 @@
 	    compile group: 'org.apache.struts', name: 'struts2-spring-plugin', version:struts2Version
 	    compile group: 'org.apache.struts', name: 'struts2-convention-plugin', version:struts2Version
 	    compile group: 'org.apache.struts', name: 'struts2-jasperreports-plugin', version:struts2Version
+	    compile group: 'org.apache.struts', name: 'struts2-java8-support-plugin', version:struts2Version
 	    
-	    //runtime group: 'org.apache.struts.xwork', name: 'xwork-core', version:struts2Version
+	    compile 'org.freemarker:freemarker:2.3.23'
 	    
-	    compile group: 'opensymphony', name: 'xwork-core', version:'2.2.3.1'
+	    compile 'org.ow2.asm:asm:5.0.4'
+	    compile 'org.ow2.asm:asm-tree:5.0.4'
+	    compile 'org.ow2.asm:asm-util:5.0.4'
+	    compile 'org.ow2.asm:asm-all:5.0.4'
 	    
+	    compile group: 'org.apache.struts.xwork', name: 'xwork-core', version:'2.3.24.1'
+
+	    compile group: 'org.aspectj', name: 'aspectjrt', version:'1.8.8'
+	    compile group: 'org.aspectj', name: 'aspectjtools', version:'1.8.8'
+	    compile group: 'org.aspectj', name: 'aspectjweaver', version:'1.8.8'
 	    
-	    compile group: 'org.aspectj', name: 'aspectjrt', version:'1.7.4'
-	    compile group: 'org.aspectj', name: 'aspectjtools', version:'1.7.4'
-	    compile group: 'org.aspectj', name: 'aspectjweaver', version:'1.7.4'
-	    
 	    compile 'aopalliance:aopalliance:1.0'
-	    
-	    
 	    compile group: 'org.directwebremoting', name: 'dwr', version:'2.0.5'
 	
-		compile group: 'net.sf.ehcache', name: 'ehcache-core', version:'2.4.2'
-		compile group: 'net.sf.ehcache', name: 'ehcache-terracotta', version:'2.4.2'
+		compile group: 'net.sf.ehcache', name: 'ehcache-core', version:'2.6.11'
+		compile group: 'net.sf.ehcache', name: 'ehcache-terracotta', version:'2.6.11'
 	
-	    compile group: 'org.hibernate', name: 'hibernate-core', version:'3.3.2.GA'
-	    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version:'3.3.2.GA'
+	    compile group: 'org.hibernate', name: 'hibernate-core', version:hibernateVersion
+	    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version:hibernateVersion
+	    compile group: 'org.hibernate', name: 'hibernate-commons-annotations', version:'4.0.5.Final'
+	    compile group: 'org.hibernate', name: 'hibernate-ehcache', version:hibernateVersion
 	    
-	    compile group: 'org.hibernate', name: 'hibernate-annotations', version:'3.3.1.GA'
-	    compile group: 'org.hibernate', name: 'hibernate-commons-annotations', version:'3.3.0.ga'
-	    compile group: 'org.hibernate', name: 'hibernate-ehcache', version:'3.3.2.GA'
+	    compile 'org.javassist:javassist:3.20.0-GA'
 	    
-	    compile group: 'org.hibernate.javax.persistence', name: 'hibernate-jpa-2.0-api', version:'1.0.1.Final'
+	    // Hibernate4采用了Jboss Logging
+	    compile 'org.jboss.logging:jboss-logging:3.3.0.Final'
 	    
+	    compile group: 'org.hibernate.javax.persistence', name: 'hibernate-jpa-2.1-api', version:'1.0.0.Final'
 	    
 	    
+	    
 	    compile group: 'org.springframework', name: 'spring-core', version:springVersion
 	    compile group: 'org.springframework', name: 'spring-beans', version:springVersion
 	    compile group: 'org.springframework', name: 'spring-orm', version:springVersion
@@ -189,17 +195,20 @@
 	    
 	    compile group: 'org.springframework', name: 'spring-ldap', version:'1.1.2'
 	    
-	    compile group: 'org.springframework.security', name: 'spring-security-core', version:'2.0.4'
-	    compile group: 'org.springframework.security', name: 'spring-security-core-tiger', version:'2.0.4'
-	    compile group: 'org.springframework.security', name: 'spring-security-taglibs', version:'2.0.4'
-	    compile group: 'org.springframework.security', name: 'spring-security-acl', version:'2.0.4'
 	    
-	    compile group: 'struts-menu', name: 'struts-menu', version:'2.4.3'
+        compile 'org.springframework.security:spring-security-web:' + springSecurityVersion
+        compile 'org.springframework.security:spring-security-core:' + springSecurityVersion
+        compile 'org.springframework.security:spring-security-config:' + springSecurityVersion
+		compile 'org.springframework.security:spring-security-acl:' + springSecurityVersion
+		compile 'org.springframework.security:spring-security-ldap:' + springSecurityVersion
+		compile 'org.springframework.security:spring-security-taglibs:' + springSecurityVersion
 	
-		compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:'2.4.1'
-		compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.4.1'
-		compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:'2.4.1'
-		compile 'com.fasterxml.jackson.datatype:jackson-datatype-hibernate3:2.4.1'
+		compile group: 'struts-menu', name: 'struts-menu', version:'2.4.3'
+	
+		compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:'2.7.1'
+		compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.7.1'
+		compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:'2.7.1'
+		compile 'com.fasterxml.jackson.datatype:jackson-datatype-hibernate4:2.4.1'
 		
 		
 		compile 'net.sf.json-lib:json-lib:2.4:jdk15'
@@ -213,44 +222,68 @@
 	
 		compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.1'
 		compile group: 'org.apache.commons', name: 'commons-collections4', version:'4.0'
+		compile 'org.apache.commons:commons-compress:1.10'
+		
 		compile 'com.opencsv:opencsv:3.5'
 		
 		compile group: 'commons-collections', name: 'commons-collections', version:'2.1.1'
-		compile group: 'commons-collections', name: 'commons-collections', version:'3.2.1'
+		compile group: 'commons-collections', name: 'commons-collections', version:'3.2.2'
 		
 		compile group: 'commons-io', name: 'commons-io', version:'2.4'
 		compile group: 'commons-fileupload', name: 'commons-fileupload', version:'1.2.2'
 		compile group: 'commons-beanutils', name: 'commons-beanutils', version:'1.9.2'
 		compile group: 'commons-digester', name: 'commons-digester', version:'1.8'
 	    compile group: 'commons-logging', name: 'commons-logging', version:'1.0.2'
 	    compile group: 'commons-betwixt', name: 'commons-betwixt', version:'0.8'
+	    compile 'commons-codec:commons-codec:1.10'
 	    
 		
 		compile group: 'org.apache.servicemix.specs', name: 'org.apache.servicemix.specs.jsr311-api-1.1.1', version:'2.4.0'
 		compile group: 'org.apache.ws.security', name: 'wss4j', version:'1.6.6'
 		
 		
-		compile group: 'org.compass-project', name: 'compass', version:'2.0.0'
-		
 		compile group: 'net.sf.jasperreports', name: 'jasperreports', version:'4.7.0'
-		compile group: 'jfree', name: 'jfreechart', version:'1.0.12'
-		compile group: 'jfree', name: 'jcommon', version:'1.0.15'
+		compile group: 'org.jfree', name: 'jfreechart', version:'1.0.19'
+		compile group: 'org.jfree', name: 'jcommon', version:'1.0.23'
 		compile group: 'jasperreports', name: 'jasperreports-chart-themes', version:'4.7.0'
 		
 		compile 'net.sourceforge.jexcelapi:jxl:2.6.12'
 	
-	    compile group: 'javax.servlet', name: 'jstl', version:'1.1.2'
 	    compile group: 'taglibs', name: 'standard', version:'1.1.2'
 	    compile group: 'informa', name: 'informa', version:'0.6.0'
 	    
 	
-	    
+	    // spring 4不支持该版本的POI，要3.8以上版本，需要验证处理
 	    compile group: 'org.apache.poi', name: 'poi', version:'3.6'
 	    
+	    compile 'org.apache.logging.log4j:log4j-core:2.5'
+	    compile 'org.apache.logging.log4j:log4j-api:2.5'
+	    //compile 'org.apache.logging.log4j:log4j-jcl:2.5'
+	    //compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.5'
+	    
+	    compile 'org.slf4j:slf4j-api:1.7.14'
+	    compile 'org.slf4j:slf4j-simple:1.7.14'
+	    
+	    
 	    compile group: 'log4j', name: 'log4j', version:'1.2.13'
 	    
-	    compile group: 'cxf', name: 'cxf', version:'2.6.16'
 	    
+	    compile 'javax.ws.rs:javax.ws.rs-api:2.0.1'
+	    
+	    
+	    //compile group: 'cxf', name: 'cxf', version:'2.6.16'
+	    compile 'org.apache.cxf:cxf-core:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-wsdl:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-databinding-jaxb:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-bindings-soap:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-frontend-jaxws:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-frontend-jaxrs:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-frontend-simple:' + cxfVersion
+	    compile 'org.apache.cxf:cxf-rt-transports-http:' + cxfVersion
+	    
+	    //compile 'org.apache.cxf:apache-cxf:' + cxfVersion
+	    
+	    
 	    compile group: 'com.google.zxing', name: 'core', version:'2.0'
 	    compile group: 'com.google.zxing', name: 'javase', version:'2.0'
 	    
@@ -267,17 +300,15 @@
 	    
 	    compile group: 'backport-util-concurrent', name: 'backport-util-concurrent', version:'3.1'
 	    
-	    compile group: 'jboss', name: 'jbpm', version:'3.1.4'
+	    compile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.0.1'
+	    //compile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
 	    
-	    compile group: 'org.springmodules', name: 'spring-modules-jbpm31', version:'0.8'
-	
-	    compile group: 'javax.servlet', name: 'servlet-api', version:'2.4'
-	    compile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
-	    
+	    compile group: 'javax.servlet', name: 'jstl', version:'1.2'
 	    compile group: 'javax.servlet', name: 'jsp-api', version:'2.0'
 	    
-	    compile group: 'junit', name: 'junit', version:'4.8.2'
-	    compile 'org.testng:testng:6.9.4'
+	    compile group: 'junit', name: 'junit', version:'4.12'
+	    
+	    compile 'org.testng:testng:6.9.10'
 	    compile 'com.beust:jcommander:1.48'
 	    
 	    compile 'net.jodah:concurrentunit:0.4.2'