diff --git a/build.gradle b/build.gradle index bd1f4ec032d..626815af449 100644 --- a/build.gradle +++ b/build.gradle @@ -62,11 +62,11 @@ configure(allprojects) { project -> ext.jtaVersion = "1.2" ext.junitVersion = "4.12" ext.log4jVersion = "1.2.17" - ext.nettyVersion = "4.1.31.Final" + ext.nettyVersion = "4.1.32.Final" ext.okhttpVersion = "2.7.5" ext.okhttp3Version = "3.8.1" ext.openjpaVersion = "2.4.2" - ext.poiVersion = "3.14" + ext.poiVersion = "3.17" ext.reactorVersion = "2.0.8.RELEASE" ext.romeVersion = "1.7.4" ext.slf4jVersion = "1.7.25" 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 index 89f4614b89b..8871d14d186 100644 --- 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-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -41,13 +41,14 @@ import net.sf.jasperreports.engine.export.JRPdfExporter; import net.sf.jasperreports.engine.export.JRPdfExporterParameter; import net.sf.jasperreports.engine.export.JRXlsExporterParameter; import net.sf.jasperreports.engine.util.JRLoader; - import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.tests.Assume; @@ -149,6 +150,7 @@ public class JasperReportsUtilsTests { } @Test + @Ignore("JasperReports 6.2.1 is incompatible with POI 3.17") public void renderAsXlsWithDataSource() throws Exception { ByteArrayOutputStream os = new ByteArrayOutputStream(); JasperReportsUtils.renderAsXls(getReport(), getParameters(), getDataSource(), os); @@ -157,6 +159,7 @@ public class JasperReportsUtilsTests { } @Test + @Ignore("JasperReports 6.2.1 is incompatible with POI 3.17") public void renderAsXlsWithCollection() throws Exception { ByteArrayOutputStream os = new ByteArrayOutputStream(); JasperReportsUtils.renderAsXls(getReport(), getParameters(), getData(), os); @@ -165,6 +168,7 @@ public class JasperReportsUtilsTests { } @Test + @Ignore("JasperReports 6.2.1 is incompatible with POI 3.17") public void renderAsXlsWithExporterParameters() throws Exception { ByteArrayOutputStream os = new ByteArrayOutputStream(); Map exporterParameters = new HashMap(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java index 4b3b6f0cd61..6e12d2d9e71 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -16,9 +16,12 @@ package org.springframework.web.servlet.view.jasperreports; +import org.junit.Ignore; + /** * @author Rob Harrop */ +@Ignore("JasperReports 6.2.1 is incompatible with POI 3.17") public class JasperReportsXlsViewTests extends AbstractJasperReportsViewTests { @Override