diff --git a/pom.xml b/pom.xml index 1454c37db..2ddaeb709 100644 --- a/pom.xml +++ b/pom.xml @@ -16,15 +16,14 @@ UTF-8 - 3.2.2.RELEASE - 1.3.1.RELEASE + 3.2.3.RELEASE + 1.3.2.RELEASE 2.2 1.2 2.5 - 2.2 2.2.7 @@ -136,12 +135,6 @@ org.springframework spring-context-support ${spring-framework.version} - - - quartz - quartz - - org.springframework @@ -194,6 +187,8 @@ rome ${rome.version} + + joda-time joda-time @@ -218,25 +213,14 @@ ${hsqldb.version} runtime - - org.glassfish.web - jstl-impl - ${jstl.version} - - + org.hibernate hibernate-core ${hibernate.version} - - - asm - asm-attrs - - org.hibernate @@ -281,6 +265,7 @@ jquery ${webjars-jquery.version} + org.springframework 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" + - Location of the XML file that defines the root application context. + - Applied by ContextLoaderListener. + --> contextConfigLocation classpath:spring/business-config.xml, classpath:spring/tools-config.xml