JasperReports 6.21.3 -> 7.0.7 バージョンアップ (#2130)

- net.sf.jasperreports:jasperreports 6.21.3 -> 7.0.7
- (追加)  net.sf.jasperreports:jasperreports-excel-poi 7.0.7
- (追加)  net.sf.jasperreports:jasperreports-pdf 7.0.7
- (追加)  net.sf.jasperreports:jasperreports-groovy 7.0.7

Author: xsekiguchi

build.gradle

@@ -48,6 +48,10 @@ allprojects {
 
 	repositories {
 		mavenCentral()
+		// for JasperReports Library
+		maven {
+			url = uri('https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts')
+		}
 	}
 
 	javadoc {

iplass-web/libs.gradle

@@ -34,15 +34,14 @@ dependencies {
 	implementation sharedLib('org.jxls:jxls-poi')
 
 	// jasperreports
-	api(sharedLib('net.sf.jasperreports:jasperreports')) {
-		// define minimum dependency
-		exclude(group: 'org.eclipse.jdt', module: 'ecj')
-		exclude(group: 'org.jfree', module: 'jcommon')
-		exclude(group: 'org.jfree', module: 'jfreechart')
-		// 新しいバージョンを個別指定する
-		exclude(group: 'com.github.librepdf', module: 'openpdf')
+	api sharedLib('net.sf.jasperreports:jasperreports')
+	implementation sharedLib('net.sf.jasperreports:jasperreports-excel-poi')
+	implementation (sharedLib('net.sf.jasperreports:jasperreports-pdf')) { 
+		// openpdf は 2 系のバージョンを利用する
+		exclude group: 'com.github.librepdf', module: 'openpdf'
 	}
-	// openpdf (for use JasperReports) 
+	implementation sharedLib('net.sf.jasperreports:jasperreports-groovy')
+	// openpdf (for use jasperreports-pdf) 
 	runtimeOnly sharedLib('com.github.librepdf:openpdf')
 
 	implementation sharedLib('org.apache.commons:commons-fileupload2-jakarta-servlet6')

iplass-web/src/main/java/org/iplass/mtp/impl/report/JasperReportingEngine.java

@@ -22,7 +22,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -51,14 +50,14 @@
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-import net.sf.jasperreports.engine.export.JRPdfExporter;
-import net.sf.jasperreports.engine.export.JRXlsExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
 import net.sf.jasperreports.export.SimpleExporterInput;
 import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
-import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
 import net.sf.jasperreports.export.SimpleXlsReportConfiguration;
 import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
+import net.sf.jasperreports.pdf.JRPdfExporter;
+import net.sf.jasperreports.pdf.SimplePdfExporterConfiguration;
+import net.sf.jasperreports.poi.export.JRXlsExporter;
 
 public class JasperReportingEngine implements ReportingEngine {
 
@@ -96,7 +95,7 @@ public void exportReport(WebRequestStack context, ReportingOutputModel model) th
 
 		OutputFileType outputType = OutputFileType.convertOutputFileType(jasperModel.getType());
 
-		HashMap<String, Object> params = new HashMap<String, Object>();
+		HashMap<String, Object> params = new HashMap<>();
 		params.put(REQUEST_STR, request);
 		params.put(SESSION_STR, request.getSession());
 
@@ -168,14 +167,14 @@ public void exportReport(WebRequestStack context, ReportingOutputModel model) th
 		}
 
 		// JasperPrintインスタンス生成
-		List<JasperPrint> jrList = new ArrayList<JasperPrint>();
+		List<JasperPrint> jrList = new ArrayList<>();
 		// 複数指定すれば、1つのPDFファイル上に複数の帳票が出力されるが現状、１ファイルのみ。
 		jrList.add(JasperFillManager.fillReport(jasperModel.getJrMain(), params, dataSource));
 
 		//Input
 		SimpleExporterInput input = SimpleExporterInput.getInstance(jrList);
 		//Output
-		SimpleOutputStreamExporterOutput output = new SimpleOutputStreamExporterOutput((OutputStream) context.getResponse()
+		SimpleOutputStreamExporterOutput output = new SimpleOutputStreamExporterOutput(context.getResponse()
 				.getOutputStream());
 
 		//出力形式毎に処理実施
@@ -242,6 +241,7 @@ public void exportReport(WebRequestStack context, ReportingOutputModel model) th
 	 * supportFilesを取得します。
 	 * @return supportFiles
 	 */
+	@Override
 	public String[] getSupportFiles() {
 		return supportFiles;
 	}

sharedlibs.gradle

@@ -169,7 +169,11 @@ ext {
 		'io.netty:netty-transport': '4.1.132.Final',
 		'io.netty:netty-resolver-dns': '4.1.132.Final',
 
-		'net.sf.jasperreports:jasperreports': '6.21.3',
+		// jasperreports
+		'net.sf.jasperreports:jasperreports': '7.0.7',
+		'net.sf.jasperreports:jasperreports-excel-poi': '7.0.7',
+		'net.sf.jasperreports:jasperreports-pdf': '7.0.7',
+		'net.sf.jasperreports:jasperreports-groovy': '7.0.7',
 		'com.github.librepdf:openpdf': '2.2.5',
 
 		// FIXME Milestone version used. Delete this comment when you change to the release version.