Skip to content

Commit be76da6

Browse files
committed
Latest dependency updates (POI 3.11, FreeMarker 2.3.21)
1 parent 77fcf21 commit be76da6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ project("spring-context-support") {
627627
exclude group: "org.springframework", module: "spring-context"
628628
}
629629
testCompile(project(":spring-context"))
630-
testCompile("org.apache.poi:poi:3.10.1")
630+
testCompile("org.apache.poi:poi:3.11")
631631
testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
632632
testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
633633
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
@@ -827,10 +827,10 @@ project("spring-webmvc") {
827827
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
828828
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
829829
optional("net.sourceforge.jexcelapi:jxl:2.6.12")
830-
optional("org.apache.poi:poi:3.10.1")
830+
optional("org.apache.poi:poi:3.11")
831831
optional("org.apache.velocity:velocity:1.7")
832832
optional("velocity-tools:velocity-tools-view:1.4")
833-
optional("org.freemarker:freemarker:2.3.20")
833+
optional("org.freemarker:freemarker:2.3.21")
834834
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
835835
optional("com.lowagie:itext:2.1.7")
836836
optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {

spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -186,6 +186,7 @@ protected FreeMarkerConfig autodetectConfiguration() throws BeansException {
186186
* {@link ObjectWrapper#DEFAULT_WRAPPER default wrapper} if none specified.
187187
* @see freemarker.template.Configuration#getObjectWrapper()
188188
*/
189+
@SuppressWarnings("deprecation")
189190
protected ObjectWrapper getObjectWrapper() {
190191
ObjectWrapper ow = getConfiguration().getObjectWrapper();
191192
return (ow != null ? ow : ObjectWrapper.DEFAULT_WRAPPER);

0 commit comments

Comments
 (0)