Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to jasper 6.2.1 #11

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion application.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
app.grails.version=2.4.4
#Grails Metadata file
#Tue Jul 31 05:48:28 CEST 2018
app.grails.version=2.5.6
25 changes: 15 additions & 10 deletions grails-app/conf/BuildConfig.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,33 @@ grails.project.dependency.resolution = {
}

dependencies {
compile('com.lowagie:itext:2.1.7')
compile('com.lowagie:itext:2.1.7') {
excludes 'groovy-all','org.bouncycastle:bcprov-jdk15on','org.bouncycastle:bcmail-jdk15on',"bouncycastle:bcmail-jdk14:138", "org.bouncycastle:bctsp-jdk14", "bouncycastle:bcprov-jdk14:138", "org.bouncycastle:bcprov-jdk14:1.38"
}

compile('net.sf.jasperreports:jasperreports:5.6.1') {
compile('net.sf.jasperreports:jasperreports:6.6.0') {
excludes 'antlr', 'commons-logging',
'ant', 'mondrian', 'commons-javaflow','barbecue', 'xml-apis-ext','xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
'xercesImpl','xmlParserAPIs','spring-core','bsh', 'spring-beans', 'jaxen', 'barcode4j','batik-svg-dom','batik-xml','batik-awt-util','batik-dom',
'batik-css','batik-gvt','batik-script', 'batik-svggen','batik-util','batik-bridge','persistence-api','jdtcore','bcmail-jdk16','bcprov-jdk16','bctsp-jdk16',
'bcmail-jdk14','bcprov-jdk14','bctsp-jdk14','xmlbeans', 'olap4j'
'ant', 'mondrian', 'commons-javaflow','barbecue', 'xml-apis-ext','xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
'xercesImpl','xmlParserAPIs','spring-core','bsh', 'spring-beans', 'jaxen', 'barcode4j','batik-svg-dom','batik-xml','batik-awt-util','batik-dom',
'batik-css','batik-gvt','batik-script', 'batik-svggen','batik-util','batik-bridge','persistence-api','jdtcore','bcmail-jdk16','bcprov-jdk16','bctsp-jdk16',
'bcmail-jdk14','bcprov-jdk14','bctsp-jdk14','xmlbeans', 'olap4j','lucene-core', 'lucene-analyzers-common', 'lucene-queryparser', 'xml-apis','bouncycastle:bcmail-jdk14', "bouncycastle:bcprov-jdk14", "org.bouncycastle:bctsp-jdk14", "org.bouncycastle:bcprov-jdk14",
'castor-xml', 'ecj', 'icu4j'
//'commons-beanutils', 'commons-digester'
}

compile('org.apache.poi:poi:3.10-FINAL')
//compile('org.apache.poi:poi:3.10-FINAL')
}

plugins {
build ':release:3.0.1', ':rest-client-builder:2.0.3', {
build ':release:3.0.1', ':rest-client-builder:2.1.1', {
export = false
}

test(":hibernate4:4.3.6.1") {
test(":hibernate:3.6.10.19") {
// test(":hibernate4:4.3.6.1") {
export = false
}
test(":tomcat:8.0.14.1") {
test(":tomcat:8.0.22") {
export = false
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource
import net.sf.jasperreports.engine.export.JRHtmlExporterParameter
import net.sf.jasperreports.engine.export.JRTextExporterParameter
import net.sf.jasperreports.engine.export.JRXlsExporterParameter
import net.sf.jasperreports.engine.util.JRProperties
//import net.sf.jasperreports.engine.util.JRProperties

import org.springframework.core.io.Resource
import org.springframework.transaction.annotation.Transactional
Expand Down Expand Up @@ -163,7 +163,7 @@ class JasperService {

// This is the current official means for setting the temp folder for jasper reports to use when compiling
// reports on the fly, but it doesn't work
JRProperties.setProperty(JRProperties.COMPILER_TEMP_DIR, tempFolder.getAbsolutePath())
// JRProperties.setProperty(JRProperties.COMPILER_TEMP_DIR, tempFolder.getAbsolutePath())

// This is a deprecated means for setting the temp folder that supposedly still works (still in the Jasper
// Reports source code trunk as of 14-Aug-2008, and, in fact, takes precedence over the official method);
Expand Down
1 change: 1 addition & 0 deletions grails-jasper-1.12.0-SNAPSHOT.zip.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
43075f318fe7382a3c7036525c8bb7106441d25c
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

package org.codehaus.groovy.grails.plugins.jasper

import net.sf.jasperreports.engine.export.HtmlExporter
import net.sf.jasperreports.export.HtmlExporterConfiguration

import java.lang.reflect.Field

import net.sf.jasperreports.engine.JRExporter
import net.sf.jasperreports.engine.export.JRCsvExporter
import net.sf.jasperreports.engine.export.JRCsvExporterParameter
import net.sf.jasperreports.engine.export.JRHtmlExporter
import net.sf.jasperreports.engine.export.JRHtmlExporterParameter
import net.sf.jasperreports.engine.export.JRPdfExporter
import net.sf.jasperreports.engine.export.JRPdfExporterParameter
Expand Down Expand Up @@ -98,7 +100,7 @@ enum JasperExportFormat implements Serializable {
static JRExporter getExporter(JasperExportFormat format) {
switch (format) {
case PDF_FORMAT: return new JRPdfExporter()
case HTML_FORMAT: return new JRHtmlExporter()
case HTML_FORMAT: return new HtmlExporter()
case XML_FORMAT: return new JRXmlExporter()
case CSV_FORMAT: return new JRCsvExporter()
case XLS_FORMAT: return new JRXlsExporter()
Expand All @@ -121,7 +123,7 @@ enum JasperExportFormat implements Serializable {
static Field[] getExporterFields(JasperExportFormat format) {
switch (format) {
case PDF_FORMAT: return JRPdfExporterParameter.getFields()
case HTML_FORMAT: return JRHtmlExporterParameter.getFields()
case HTML_FORMAT: return HtmlExporterConfiguration.getBetweenPagesHtml().getFields()
case XML_FORMAT: return JRXmlExporterParameter.getFields()
case CSV_FORMAT: return JRCsvExporterParameter.getFields()
case XLS_FORMAT: return JRXlsExporterParameter.getFields()
Expand Down