struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [08/50] [abbrv] struts git commit: Patch WW-4381
Date Fri, 15 Jul 2016 13:18:35 GMT
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/a446cdac
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a446cdac
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a446cdac

Branch: refs/heads/master
Commit: a446cdacc0f6d9168d03d7602a751b48ce066f1a
Parents: bccf099
Author: Victor Sosa <victornsosa@gmail.com>
Authored: Mon Jan 4 13:50:41 2016 -0400
Committer: Lukasz Lenart <lukasz.lenart@gmail.com>
Committed: Tue Jan 19 16:18:00 2016 +0100

----------------------------------------------------------------------
 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/a446cdac/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/a446cdac/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 e356506..bee69d6 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);
             }


Mime
View raw message