Browse Source

Latest dependency updates (POI 3.11, FreeMarker 2.3.21)

pull/740/head
Juergen Hoeller 11 years ago
parent
commit
bf442c093c
  1. 6
      build.gradle
  2. 3
      spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java

6
build.gradle

@ -627,7 +627,7 @@ project("spring-context-support") {
exclude group: "xml-apis", module: "xml-apis" exclude group: "xml-apis", module: "xml-apis"
} }
testCompile(project(":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-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") 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:javax.servlet.jsp-api:2.2.1")
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1") optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("net.sourceforge.jexcelapi:jxl:2.6.12") 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("org.apache.velocity:velocity:1.7")
optional("velocity-tools:velocity-tools-view:1.4") 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("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("com.lowagie:itext:2.1.7") optional("com.lowagie:itext:2.1.7")
optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") { optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {

3
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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. * {@link ObjectWrapper#DEFAULT_WRAPPER default wrapper} if none specified.
* @see freemarker.template.Configuration#getObjectWrapper() * @see freemarker.template.Configuration#getObjectWrapper()
*/ */
@SuppressWarnings("deprecation")
protected ObjectWrapper getObjectWrapper() { protected ObjectWrapper getObjectWrapper() {
ObjectWrapper ow = getConfiguration().getObjectWrapper(); ObjectWrapper ow = getConfiguration().getObjectWrapper();
return (ow != null ? ow : ObjectWrapper.DEFAULT_WRAPPER); return (ow != null ? ow : ObjectWrapper.DEFAULT_WRAPPER);

Loading…
Cancel
Save