From 6a1b4dd157f6898e4a94df60574c340fe2fc2155 Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Fri, 24 May 2013 10:31:42 +0800
Subject: [PATCH] updated version of spring data and removed unused
 dependencies

---
 pom.xml                         | 27 ++++++---------------------
 src/main/webapp/WEB-INF/web.xml |  6 +++---
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1454c37db..2ddaeb709 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,15 +16,14 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Spring -->
-		<spring-framework.version>3.2.2.RELEASE</spring-framework.version>
-		<spring-data-jpa.version>1.3.1.RELEASE</spring-data-jpa.version>
+		<spring-framework.version>3.2.3.RELEASE</spring-framework.version>
+		<spring-data-jpa.version>1.3.2.RELEASE</spring-data-jpa.version>
 
 
 		<!-- Java EE / Java SE dependencies -->
 		<jsp.version>2.2</jsp.version>
 		<jstl.version>1.2</jstl.version>
 		<servlet.version>2.5</servlet.version>
-		<javax-el.version>2.2</javax-el.version>
 		<jaxb-impl.version>2.2.7</jaxb-impl.version>
 
 		<!-- Hibernate / JPA -->
@@ -136,12 +135,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
 			<version>${spring-framework.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>quartz</groupId>
-					<artifactId>quartz</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -194,6 +187,8 @@
 			<artifactId>rome</artifactId>
 			<version>${rome.version}</version>
 		</dependency>
+		
+		<!-- Date and Time -->
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
@@ -218,25 +213,14 @@
 			<version>${hsqldb.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.glassfish.web</groupId>
-			<artifactId>jstl-impl</artifactId>
-			<version>${jstl.version}</version>
-		</dependency>
 
-		<!-- MySQL JDBC Connector -->
+		<!-- For MySql only -->
 		<!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>${mysql.version}</version> </dependency> -->
 		<!-- HIBERNATE -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>asm</groupId>
-					<artifactId>asm-attrs</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -281,6 +265,7 @@
 			<artifactId>jquery</artifactId>
 			<version>${webjars-jquery.version}</version>
 		</dependency>
+		
 		<!-- Test Artifacts -->
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 609f8caa3..000f6244c 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -19,9 +19,9 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
     </context-param>
 
     <!--
-- Location of the XML file that defines the root application context.
-- Applied by ContextLoaderServlet.
--->
+		- Location of the XML file that defines the root application context.
+		- Applied by ContextLoaderListener.
+	-->
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>classpath:spring/business-config.xml, classpath:spring/tools-config.xml</param-value>