Upgraded to JasperReports 5.0 (preserving compatibility with all previous releases) and POI 3.9 (preserving compatibility with POI 3.5+)

jhoeller · jhoeller · commit 8fab14dfebe9 · 2013-03-29T14:52:30.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -421,10 +421,10 @@ project("spring-context-support") {
 		optional("org.apache.velocity:velocity:1.7")
 		optional("org.freemarker:freemarker:2.3.15")
 		optional("com.lowagie:itext:2.1.7")
-		optional("jasperreports:jasperreports:2.0.5")
+		optional("net.sf.jasperreports:jasperreports:5.0.4")
 		optional("org.slf4j:slf4j-api:${slf4jVersion}")
 		provided("javax.activation:activation:1.1")
-		testCompile("org.apache.poi:poi:3.0.2-FINAL")
+		testCompile("org.apache.poi:poi:3.9")
 		testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
 		testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
@@ -527,9 +527,9 @@ project("spring-webmvc") {
 		optional("org.apache.tiles:tiles-jsp:2.1.2")
 		optional("org.apache.tiles:tiles-servlet:2.1.2")
 		optional("net.sourceforge.jexcelapi:jxl:2.6.3")
-		optional("org.apache.poi:poi:3.0.2-FINAL")
+		optional("org.apache.poi:poi:3.9")
 		optional("com.lowagie:itext:2.1.7")
-		optional("jasperreports:jasperreports:2.0.5") {
+		optional("net.sf.jasperreports:jasperreports:5.0.4") {
 			exclude group: "xml-apis", module: "xml-apis"
 		}
 		optional("rome:rome:1.0")
diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -122,7 +122,7 @@ public void testRenderAsPdfWithCollection() throws Exception {
 	public void testRenderAsPdfWithExporterParameters() throws Exception {
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
-		exporterParameters.put(JRPdfExporterParameter.PDF_VERSION, JRPdfExporterParameter.PDF_VERSION_1_6.toString());
+		exporterParameters.put(JRPdfExporterParameter.PDF_VERSION, JRPdfExporterParameter.PDF_VERSION_1_6);
 		JasperReportsUtils.renderAsPdf(getReport(), getParameters(), getData(), os, exporterParameters);
 		byte[] output = os.toByteArray();
 		assertPdfOutputCorrect(output);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -35,7 +35,7 @@
 
 /**
  * Convenient superclass for Excel document views.
- * Compatible with Apache POI 3.0 as well as 3.5, as of Spring 3.0.
+ * Compatible with Apache POI 3.5 and higher, as of Spring 4.0.
  *
  * <p>Properties:
  * <ul>
@@ -203,9 +203,9 @@ protected HSSFCell getCell(HSSFSheet sheet, int row, int col) {
 		if (sheetRow == null) {
 			sheetRow = sheet.createRow(row);
 		}
-		HSSFCell cell = sheetRow.getCell((short) col);
+		HSSFCell cell = sheetRow.getCell(col);
 		if (cell == null) {
-			cell = sheetRow.createCell((short) col);
+			cell = sheetRow.createCell(col);
 		}
 		return cell;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2009 the original author or authors.`
	`2`	`+ * Copyright 2002-2013 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.`
`@@ -35,7 +35,7 @@`
`35`	`35`
`36`	`36`	`/**`
`37`	`37`	`* Convenient superclass for Excel document views.`
`38`		`- * Compatible with Apache POI 3.0 as well as 3.5, as of Spring 3.0.`
	`38`	`+ * Compatible with Apache POI 3.5 and higher, as of Spring 4.0.`
`39`	`39`	`*`
`40`	`40`	`* <p>Properties:`
`41`	`41`	`* <ul>`
`@@ -203,9 +203,9 @@ protected HSSFCell getCell(HSSFSheet sheet, int row, int col) {`
`203`	`203`	`if (sheetRow == null) {`
`204`	`204`	`sheetRow = sheet.createRow(row);`
`205`	`205`	`}`
`206`		`- HSSFCell cell = sheetRow.getCell((short) col);`
	`206`	`+ HSSFCell cell = sheetRow.getCell(col);`
`207`	`207`	`if (cell == null) {`
`208`		`- cell = sheetRow.createCell((short) col);`
	`208`	`+ cell = sheetRow.createCell(col);`
`209`	`209`	`}`
`210`	`210`	`return cell;`
`211`	`211`	`}`