Repository: struts Updated Branches: refs/heads/master acd55986f -> 110d63fed
Patch WW-4381 upgrade to jasperreports 6.0 to 6.0.3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e4295421 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e4295421 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e4295421 Branch: refs/heads/master Commit: e42954219a5a57d8ad7685f7ae9ffbf44367c81d Parents: 0e11112 Author: Victor Sosa <victorns...@gmail.com> Authored: Mon Jan 4 13:50:41 2016 -0400 Committer: Victor Sosa <victorns...@gmail.com> Committed: Mon Jan 4 13:50:41 2016 -0400 ---------------------------------------------------------------------- plugins/jasperreports/pom.xml | 4 ++-- .../apache/struts2/views/jasperreports/JasperReportsResult.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e4295421/plugins/jasperreports/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index fc32d73..612f0bb 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -39,9 +39,9 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>jasperreports</groupId> + <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>3.1.2</version> + <version>6.0.3</version> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/struts/blob/e4295421/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java ---------------------------------------------------------------------- diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index e0ea121..312604d 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -311,7 +311,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe // Fill the report and produce a print object try { - JasperReport jasperReport = (JasperReport) JRLoader.loadObject(systemId); + JasperReport jasperReport = (JasperReport) JRLoader.loadObject(new File(systemId)); if (conn == null) { jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, stackDataSource); }
