From df1596b78c408d2990cc4d409ea255938995d400 Mon Sep 17 00:00:00 2001 From: Mic Date: Fri, 8 Aug 2014 13:55:01 +0800 Subject: [PATCH] using latest versions of hibernate, spring-data, joda... --- .springBeans | 5 ++++- pom.xml | 44 +++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.springBeans b/.springBeans index c4469cbf0..44f18becd 100644 --- a/.springBeans +++ b/.springBeans @@ -1,7 +1,7 @@ 1 - + @@ -12,6 +12,9 @@ src/main/resources/spring/mvc-view-config.xml src/main/resources/spring/business-config.xml + + src/main/resources/spring/tools-config.xml + diff --git a/pom.xml b/pom.xml index e43175cf9..4cece5266 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 4.0.5.RELEASE - 1.6.1.RELEASE + 4.0.6.RELEASE + 1.6.2.RELEASE @@ -27,7 +27,7 @@ 2.2.7 - 4.3.5.Final + 4.3.6.Final 4.3.1.Final @@ -54,8 +54,8 @@ 1.3 1.1.1 - 2.3 - 3.1.0.GA + 2.4 + 3.2.0.GA @@ -81,23 +81,23 @@ provided - javax.servlet.jsp - jsp-api - 2.1 - provided - + javax.servlet.jsp + jsp-api + 2.1 + provided + - - org.glassfish.web - jstl-impl - 1.2 - - - javax.servlet - servlet-api - - - + + org.glassfish.web + jstl-impl + 1.2 + + + javax.servlet + servlet-api + + + com.sun.xml.bind jaxb-impl @@ -310,9 +310,7 @@ datatables-export-itext ${dandelion.version} - -