File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -627,7 +627,7 @@ project("spring-context-support") {
627
627
exclude group : " org.springframework" , module : " spring-context"
628
628
}
629
629
testCompile(project(" :spring-context" ))
630
- testCompile(" org.apache.poi:poi:3.10.1 " )
630
+ testCompile(" org.apache.poi:poi:3.11 " )
631
631
testCompile(" commons-beanutils:commons-beanutils:1.8.0" ) // for Velocity/JasperReports
632
632
testCompile(" commons-digester:commons-digester:1.8.1" ) // for Velocity/JasperReports
633
633
testCompile(" org.hsqldb:hsqldb:${ hsqldbVersion} " )
@@ -827,10 +827,10 @@ project("spring-webmvc") {
827
827
optional(" javax.servlet.jsp:javax.servlet.jsp-api:2.2.1" )
828
828
optional(" javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1" )
829
829
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 " )
831
831
optional(" org.apache.velocity:velocity:1.7" )
832
832
optional(" velocity-tools:velocity-tools-view:1.4" )
833
- optional(" org.freemarker:freemarker:2.3.20 " )
833
+ optional(" org.freemarker:freemarker:2.3.21 " )
834
834
optional(" org.codehaus.groovy:groovy-all:${ groovyVersion} " )
835
835
optional(" com.lowagie:itext:2.1.7" )
836
836
optional(" net.sf.jasperreports:jasperreports:$jasperReportsVersion " ) {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2012 the original author or authors.
2
+ * Copyright 2002-2015 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -186,6 +186,7 @@ protected FreeMarkerConfig autodetectConfiguration() throws BeansException {
186
186
* {@link ObjectWrapper#DEFAULT_WRAPPER default wrapper} if none specified.
187
187
* @see freemarker.template.Configuration#getObjectWrapper()
188
188
*/
189
+ @ SuppressWarnings ("deprecation" )
189
190
protected ObjectWrapper getObjectWrapper () {
190
191
ObjectWrapper ow = getConfiguration ().getObjectWrapper ();
191
192
return (ow != null ? ow : ObjectWrapper .DEFAULT_WRAPPER );
You can’t perform that action at this time.
0 commit comments