root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Latest dependency updates (EhCache 2.9, Joda-Time 2.5, Jackson 2.4.3, Tiles 3.0.5, Tomcat 8.0.14, FreeMarker 2.3.21)

This commit is contained in:
Juergen Hoeller 2014-10-21 22:19:09 +02:00
parent ad62b2afb1
commit 69f1b78e93
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -29,7 +29,7 @@ configure(allprojects) { project ->
ext.aspectjVersion = "1.8.2"
ext.eclipseLinkVersion = "2.4.2"
ext.ehcacheVersion = "2.8.4"
ext.ehcacheVersion = "2.9.0"
ext.ehcacheJCacheVersion = "1.0.0"
ext.groovyVersion = "2.3.7"
ext.hibernate3Version = "3.6.10.Final"
@ -37,11 +37,11 @@ configure(allprojects) { project ->
ext.hibVal4Version = "4.3.2.Final"
ext.hibVal5Version = "5.1.2.Final"
ext.hsqldbVersion = "2.3.2"
ext.jackson2Version = "2.4.2"
ext.jackson2Version = "2.4.3"
ext.gsonVersion = "2.3"
ext.jasperReportsVersion = "5.6.1"
ext.jettyVersion = "9.2.3.v20140905"
ext.jodaVersion = "2.4"
ext.jodaVersion = "2.5"
ext.junitVersion = "4.11"
ext.openJpaVersion = "2.2.2" // 2.3.0 not Java 8 compatible (based on ASM 4)
ext.protobufVersion = "2.6.0"
@ -50,8 +50,8 @@ configure(allprojects) { project ->
ext.snakeYamlVersion = "1.13"
ext.snifferVersion = "1.11"
ext.tiles2Version = "2.2.2"
ext.tiles3Version = "3.0.4"
ext.tomcatVersion = "8.0.9"
ext.tiles3Version = "3.0.5"
ext.tomcatVersion = "8.0.14"
ext.tyrusVersion = "1.3.5"
ext.undertowVersion = "1.0.16.Final"
ext.xstreamVersion = "1.4.7"
@ -613,7 +613,7 @@ project("spring-context-support") {
optional("org.quartz-scheduler:quartz:2.2.1")
optional("org.codehaus.fabric3.api:commonj:1.1.0")
optional("org.apache.velocity:velocity:1.7")
optional("org.freemarker:freemarker:2.3.20")
optional("org.freemarker:freemarker:2.3.21")
optional("com.lowagie:itext:2.1.7")
optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"

11
spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -307,15 +307,20 @@ public class FreeMarkerConfigurationFactory {
}
/**
* Return a new Configuration object. Subclasses can override this for
* custom initialization, or for using a mock object for testing.
* Return a new Configuration object. Subclasses can override this for custom
* initialization (e.g. specifying a FreeMarker compatibility level which is a
* new feature in FreeMarker 2.3.21), or for using a mock object for testing.
* <p>Called by {@code createConfiguration()}.
* @return the Configuration object
* @throws IOException if a config file wasn't found
* @throws TemplateException on FreeMarker initialization failure
* @see #createConfiguration()
*/
@SuppressWarnings("deprecation")
protected Configuration newConfiguration() throws IOException, TemplateException {
// The default Configuration constructor is deprecated as of FreeMarker 2.3.21,
// in favor of specifying a compatibility version - which is a 2.3.21 feature.
// We won't be able to call that for a long while, but custom subclasses can.
return new Configuration();
}