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

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();
}