From be76da654f72646f791576156942066065ce1fc6 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 11 Feb 2015 20:38:30 +0100 Subject: [PATCH] Latest dependency updates (POI 3.11, FreeMarker 2.3.21) --- build.gradle | 6 +++--- .../web/servlet/view/freemarker/FreeMarkerView.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 7106405597c..bbce836ac42 100644 --- a/build.gradle +++ b/build.gradle @@ -627,7 +627,7 @@ project("spring-context-support") { exclude group: "org.springframework", module: "spring-context" } testCompile(project(":spring-context")) - testCompile("org.apache.poi:poi:3.10.1") + testCompile("org.apache.poi:poi:3.11") testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") @@ -827,10 +827,10 @@ project("spring-webmvc") { optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1") optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1") optional("net.sourceforge.jexcelapi:jxl:2.6.12") - optional("org.apache.poi:poi:3.10.1") + optional("org.apache.poi:poi:3.11") optional("org.apache.velocity:velocity:1.7") optional("velocity-tools:velocity-tools-view:1.4") - optional("org.freemarker:freemarker:2.3.20") + optional("org.freemarker:freemarker:2.3.21") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("com.lowagie:itext:2.1.7") optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java index d64e1e0ae30..f5e260eb265 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2015 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. @@ -186,6 +186,7 @@ public class FreeMarkerView extends AbstractTemplateView { * {@link ObjectWrapper#DEFAULT_WRAPPER default wrapper} if none specified. * @see freemarker.template.Configuration#getObjectWrapper() */ + @SuppressWarnings("deprecation") protected ObjectWrapper getObjectWrapper() { ObjectWrapper ow = getConfiguration().getObjectWrapper(); return (ow != null ? ow : ObjectWrapper.DEFAULT_WRAPPER);