[Git][java-team/jasperreports][master] Finish Apache POI 4.0 patch.
Giovanni Mascellani
gitlab at salsa.debian.org
Sun Mar 31 23:11:11 BST 2019
Giovanni Mascellani pushed to branch master at Debian Java Maintainers / jasperreports
Commits:
90fdfb5a by Giovanni Mascellani at 2019-03-31T22:09:38Z
Finish Apache POI 4.0 patch.
- - - - -
4 changed files:
- debian/changelog
- debian/patches/apache-poi-4.0.patch
- + debian/patches/fix-pom.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jasperreports (6.3.1-2.1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS after upgrading Apache POI to 4.0, based on previous work by
+ Andrej Shadura (closes: #912467).
+
+ -- Giovanni Mascellani <gio at debian.org> Mon, 01 Apr 2019 00:06:12 +0200
+
jasperreports (6.3.1-2) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/apache-poi-4.0.patch
=====================================
@@ -2,9 +2,98 @@ From: Andrej Shadura <andrewsh at debian.org>
Date: Wed, 27 Feb 2019 13:10:12 +0100
Subject: Use Apache POI 4.0 API
+---
+ .../engine/data/AbstractPoiXlsDataSource.java | 21 +-
+ .../jasperreports/engine/export/JRXlsExporter.java | 220 ++++++++++++---------
+ .../engine/export/JRXlsMetadataExporter.java | 210 ++++++++++----------
+ 3 files changed, 247 insertions(+), 204 deletions(-)
+
+diff --git a/jasperreports/src/net/sf/jasperreports/engine/data/AbstractPoiXlsDataSource.java b/jasperreports/src/net/sf/jasperreports/engine/data/AbstractPoiXlsDataSource.java
+index fcba435..95351a2 100644
+--- a/jasperreports/src/net/sf/jasperreports/engine/data/AbstractPoiXlsDataSource.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/data/AbstractPoiXlsDataSource.java
+@@ -33,6 +33,7 @@ import java.util.LinkedHashMap;
+ import java.util.Map;
+
+ import org.apache.poi.ss.usermodel.Cell;
++import org.apache.poi.ss.usermodel.CellType;
+ import org.apache.poi.ss.usermodel.FormulaEvaluator;
+ import org.apache.poi.ss.usermodel.Row;
+ import org.apache.poi.ss.usermodel.Sheet;
+@@ -237,16 +238,16 @@ public abstract class AbstractPoiXlsDataSource extends AbstractXlsDataSource
+ {
+ return null;
+ }
+- if(cell.getCellType() == Cell.CELL_TYPE_FORMULA)
++ if(cell.getCellType() == CellType.FORMULA)
+ {
+ FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
+ Object value = null;
+ switch (evaluator.evaluateFormulaCell(cell))
+ {
+- case Cell.CELL_TYPE_BOOLEAN:
++ case BOOLEAN:
+ value = cell.getBooleanCellValue();
+ break;
+- case Cell.CELL_TYPE_NUMERIC:
++ case NUMERIC:
+ if(Date.class.isAssignableFrom(valueClass))
+ {
+ value = cell.getDateCellValue();
+@@ -256,7 +257,7 @@ public abstract class AbstractPoiXlsDataSource extends AbstractXlsDataSource
+ value = cell.getNumericCellValue();
+ }
+ break;
+- case Cell.CELL_TYPE_STRING:
++ case STRING:
+ value = cell.getStringCellValue();
+ if(Date.class.isAssignableFrom(valueClass))
+ {
+@@ -295,9 +296,9 @@ public abstract class AbstractPoiXlsDataSource extends AbstractXlsDataSource
+ }
+ }
+ break;
+- case Cell.CELL_TYPE_BLANK:
+- case Cell.CELL_TYPE_ERROR:
+- case Cell.CELL_TYPE_FORMULA:
++ case BLANK:
++ case ERROR:
++ case FORMULA:
+ default:
+ break;
+ }
+@@ -310,7 +311,7 @@ public abstract class AbstractPoiXlsDataSource extends AbstractXlsDataSource
+ }
+ if (valueClass.equals(Boolean.class))
+ {
+- if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN)
++ if (cell.getCellType() == CellType.BOOLEAN)
+ {
+ return cell.getBooleanCellValue();
+ }
+@@ -329,7 +330,7 @@ public abstract class AbstractPoiXlsDataSource extends AbstractXlsDataSource
+ }
+ else if (Number.class.isAssignableFrom(valueClass))
+ {
+- if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC)
++ if (cell.getCellType() == CellType.NUMERIC)
+ {
+ return convertNumber(cell.getNumericCellValue(), valueClass);
+ }
+@@ -355,7 +356,7 @@ public abstract class AbstractPoiXlsDataSource extends AbstractXlsDataSource
+ }
+ else if (Date.class.isAssignableFrom(valueClass))
+ {
+- if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC)
++ if (cell.getCellType() == CellType.NUMERIC)
+ {
+ return cell.getDateCellValue();
+ }
+diff --git a/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsExporter.java b/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
+index b479e80..f0dea28 100644
--- a/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
+++ b/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
-@@ -52,6 +52,7 @@
+@@ -52,6 +52,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -12,7 +101,7 @@ Subject: Use Apache POI 4.0 API
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-@@ -69,9 +70,15 @@
+@@ -69,9 +70,15 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.usermodel.HeaderFooter;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -28,7 +117,7 @@ Subject: Use Apache POI 4.0 API
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
-@@ -148,7 +155,7 @@
+@@ -148,7 +155,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
static
{
@@ -37,7 +126,7 @@ Subject: Use Apache POI 4.0 API
hssfColorsRgbs = new LinkedHashMap<HSSFColor, short[]>();
for (HSSFColor color : hssfColors.values())
{
-@@ -177,11 +184,11 @@
+@@ -177,11 +184,11 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
/**
*
*/
@@ -52,7 +141,7 @@ Subject: Use Apache POI 4.0 API
protected HSSFDataFormat dataFormat;
-@@ -246,7 +253,7 @@
+@@ -246,7 +253,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
if (!configuration.isWhitePageBackground())
{
@@ -61,7 +150,7 @@ Subject: Use Apache POI 4.0 API
}
nature =
-@@ -322,7 +329,7 @@
+@@ -322,7 +329,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
}
emptyCellStyle = workbook.createCellStyle();
@@ -70,7 +159,7 @@ Subject: Use Apache POI 4.0 API
emptyCellStyle.setFillPattern(backgroundMode);
dataFormat = workbook.createDataFormat();
createHelper = workbook.getCreationHelper();
-@@ -475,8 +482,8 @@
+@@ -475,8 +482,8 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
sheet.setDisplayGridlines(showGridlines);
backgroundMode = Boolean.TRUE.equals(sheetInfo.whitePageBackground)
@@ -81,7 +170,7 @@ Subject: Use Apache POI 4.0 API
// maxRowFreezeIndex = 0;
// maxColumnFreezeIndex = 0;
-@@ -641,12 +648,12 @@
+@@ -641,12 +648,12 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
{
cell = row.createCell(colIndex);
@@ -96,7 +185,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
}
-@@ -660,8 +667,8 @@
+@@ -660,8 +667,8 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
getLoadedCellStyle(
mode,
backcolor,
@@ -107,7 +196,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
gridCell,
-@@ -710,11 +717,11 @@
+@@ -710,11 +717,11 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
BoxStyle boxStyle = new BoxStyle(side, line.getLinePen());
@@ -121,7 +210,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
}
-@@ -722,8 +729,8 @@
+@@ -722,8 +729,8 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
getLoadedCellStyle(
mode,
backcolor,
@@ -132,7 +221,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
boxStyle,
-@@ -745,11 +752,11 @@
+@@ -745,11 +752,11 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
{
short forecolor = getWorkbookColor(element.getLinePen().getLineColor()).getIndex();
@@ -146,7 +235,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
}
-@@ -757,8 +764,8 @@
+@@ -757,8 +764,8 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
getLoadedCellStyle(
mode,
backcolor,
@@ -157,7 +246,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
gridCell,
-@@ -788,15 +795,15 @@
+@@ -788,15 +795,15 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
short forecolor = getWorkbookColor(textElement.getForecolor()).getIndex();
TextAlignHolder textAlignHolder = getTextAlignHolder(textElement);
@@ -177,7 +266,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
}
-@@ -865,7 +872,7 @@
+@@ -865,7 +872,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
HSSFCellStyle cellStyle = initCreateCell(gridCell, colIndex, rowIndex, baseStyle);
@@ -186,7 +275,7 @@ Subject: Use Apache POI 4.0 API
cell.setCellFormula(formula);
endCreateCell(cellStyle);
return;
-@@ -892,7 +899,7 @@
+@@ -892,7 +899,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
HSSFCellStyle cellStyle = initCreateCell(gridCell, colIndex, rowIndex, baseStyle);
if (textValue.getText() == null || textValue.getText().length() == 0)
{
@@ -195,7 +284,7 @@ Subject: Use Apache POI 4.0 API
}
else
{
-@@ -922,7 +929,7 @@
+@@ -922,7 +929,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
HSSFCellStyle cellStyle = initCreateCell(gridCell, colIndex, rowIndex, baseStyle);
if (textValue.getValue() == null)
{
@@ -204,7 +293,7 @@ Subject: Use Apache POI 4.0 API
}
else
{
-@@ -950,7 +957,7 @@
+@@ -950,7 +957,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
Date date = textValue.getValue();
if (date == null)
{
@@ -213,7 +302,7 @@ Subject: Use Apache POI 4.0 API
}
else
{
-@@ -966,7 +973,7 @@
+@@ -966,7 +973,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
HSSFCellStyle cellStyle = initCreateCell(gridCell, colIndex, rowIndex, baseStyle);
if (textValue.getValue() == null)
{
@@ -222,7 +311,7 @@ Subject: Use Apache POI 4.0 API
}
else
{
-@@ -1085,35 +1092,35 @@
+@@ -1085,35 +1092,35 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
}
@@ -268,7 +357,7 @@ Subject: Use Apache POI 4.0 API
}
}
-@@ -1235,7 +1242,7 @@
+@@ -1235,7 +1242,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
(cf.getFontHeightInPoints() == fontSize) &&
((cf.getUnderline() == HSSFFont.U_SINGLE)?(font.isUnderline()):(!font.isUnderline())) &&
(cf.getStrikeout() == font.isStrikeThrough()) &&
@@ -277,7 +366,7 @@ Subject: Use Apache POI 4.0 API
(cf.getItalic() == font.isItalic()) &&
(cf.getTypeOffset() == superscriptType)
)
-@@ -1269,7 +1276,7 @@
+@@ -1269,7 +1276,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
if (font.isBold())
{
@@ -286,7 +375,7 @@ Subject: Use Apache POI 4.0 API
}
if (font.isItalic())
{
-@@ -1329,10 +1336,10 @@
+@@ -1329,10 +1336,10 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
return cellStyle;
}
protected HSSFCellStyle getLoadedCellStyle(
@@ -300,7 +389,7 @@ Subject: Use Apache POI 4.0 API
short rotation,
HSSFFont font,
JRExporterGridCell gridCell,
-@@ -1358,10 +1365,10 @@
+@@ -1358,10 +1365,10 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
protected HSSFCellStyle getLoadedCellStyle(
@@ -314,7 +403,7 @@ Subject: Use Apache POI 4.0 API
short rotation,
HSSFFont font,
BoxStyle box,
-@@ -1378,7 +1385,7 @@
+@@ -1378,7 +1385,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
/**
*
*/
@@ -323,7 +412,7 @@ Subject: Use Apache POI 4.0 API
{
float lineWidth = pen.getLineWidth().floatValue();
-@@ -1388,43 +1395,43 @@
+@@ -1388,43 +1395,43 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
{
case DOUBLE :
{
@@ -376,7 +465,7 @@ Subject: Use Apache POI 4.0 API
}
@Override
-@@ -1472,11 +1479,11 @@
+@@ -1472,11 +1479,11 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
{
XlsReportConfiguration configuration = getCurrentItemConfiguration();
@@ -390,7 +479,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
}
-@@ -1491,8 +1498,8 @@
+@@ -1491,8 +1498,8 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
getLoadedCellStyle(
mode,
backcolor,
@@ -401,7 +490,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
gridCell,
-@@ -1537,7 +1544,19 @@
+@@ -1537,7 +1544,19 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
imageAnchorType = ImageAnchorTypeEnum.MOVE_NO_SIZE;
}
}
@@ -422,7 +511,7 @@ Subject: Use Apache POI 4.0 API
//pngEncoder.setImage(bi);
//int imgIndex = workbook.addPicture(pngEncoder.pngEncode(), HSSFWorkbook.PICTURE_TYPE_PNG);
int imgIndex = workbook.addPicture(imageProcessorResult.imageData, HSSFWorkbook.PICTURE_TYPE_PNG);
-@@ -1862,11 +1881,11 @@
+@@ -1862,11 +1881,11 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
@Override
protected void exportFrame(JRPrintFrame frame, JRExporterGridCell gridCell, int x, int y)
{
@@ -436,7 +525,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(frame.getBackcolor()).getIndex();
}
-@@ -1876,8 +1895,8 @@
+@@ -1876,8 +1895,8 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
getLoadedCellStyle(
mode,
backcolor,
@@ -447,7 +536,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
gridCell,
-@@ -2016,7 +2035,7 @@
+@@ -2016,7 +2035,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
String href = hyperlink.getHyperlinkReference();
if (href != null)
{
@@ -456,7 +545,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
break;
-@@ -2029,7 +2048,7 @@
+@@ -2029,7 +2048,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
String href = hyperlink.getHyperlinkAnchor();
if (href != null)
{
@@ -465,7 +554,7 @@ Subject: Use Apache POI 4.0 API
if(anchorLinks.containsKey(href))
{
(anchorLinks.get(href)).add(link);
-@@ -2050,7 +2069,7 @@
+@@ -2050,7 +2069,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
Integer hrefPage = (getCurrentItemConfiguration().isOnePagePerSheet() ? hyperlink.getHyperlinkPage() : 0);
if (hrefPage != null)
{
@@ -474,7 +563,7 @@ Subject: Use Apache POI 4.0 API
if(pageLinks.containsKey(sheetsBeforeCurrentReport+hrefPage))
{
pageLinks.get(sheetsBeforeCurrentReport + hrefPage).add(link);
-@@ -2070,7 +2089,7 @@
+@@ -2070,7 +2089,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
if (href != null && hyperlink.getHyperlinkAnchor() != null)
{
href = href + "#" + hyperlink.getHyperlinkAnchor();
@@ -483,7 +572,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
-@@ -2083,7 +2102,7 @@
+@@ -2083,7 +2102,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
if (href != null && hyperlink.getHyperlinkPage() != null)
{
href = href + "#JR_PAGE_ANCHOR_0_" + hyperlink.getHyperlinkPage().toString();
@@ -492,7 +581,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
-@@ -2101,7 +2120,7 @@
+@@ -2101,7 +2120,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
String href = customHandler.getHyperlink(hyperlink);
if (href != null)
{
@@ -501,7 +590,27 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
}
-@@ -2210,7 +2229,7 @@
+@@ -2199,6 +2218,19 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
+ }
+ }
+
++ public static ClientAnchor.AnchorType getAnchorType(ImageAnchorTypeEnum anchorType)
++ {
++ switch (anchorType)
++ {
++ case MOVE_SIZE:
++ return ClientAnchor.AnchorType.MOVE_AND_RESIZE;
++ case NO_MOVE_NO_SIZE:
++ return ClientAnchor.AnchorType.DONT_MOVE_AND_RESIZE;
++ case MOVE_NO_SIZE:
++ default:
++ return ClientAnchor.AnchorType.MOVE_DONT_RESIZE;
++ }
++ }
+
+ /**
+ *
+@@ -2210,7 +2242,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
protected static final int BOTTOM = 2;
protected static final int RIGHT = 3;
@@ -510,7 +619,7 @@ Subject: Use Apache POI 4.0 API
protected short[] borderColour = new short[4];
private int hash;
-@@ -2261,13 +2280,13 @@
+@@ -2261,13 +2293,13 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
public void setPen(JRPen pen)
{
if (
@@ -529,7 +638,7 @@ Subject: Use Apache POI 4.0 API
short colour = JRXlsExporter.this.getWorkbookColor(pen.getLineColor()).getIndex();
borderStyle[TOP] = style;
-@@ -2286,13 +2305,13 @@
+@@ -2286,13 +2318,13 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
private int computeHash()
{
@@ -547,7 +656,7 @@ Subject: Use Apache POI 4.0 API
hashCode = 31*hashCode + borderColour[RIGHT];
return hashCode;
}
-@@ -2336,10 +2355,10 @@
+@@ -2336,10 +2368,10 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
*/
protected class StyleInfo
{
@@ -561,7 +670,7 @@ Subject: Use Apache POI 4.0 API
protected final short rotation;
protected final HSSFFont font;
protected final BoxStyle box;
-@@ -2351,10 +2370,10 @@
+@@ -2351,10 +2383,10 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
private int hashCode;
public StyleInfo(
@@ -575,7 +684,7 @@ Subject: Use Apache POI 4.0 API
short rotation,
HSSFFont font,
JRExporterGridCell gridCell,
-@@ -2378,10 +2397,10 @@
+@@ -2378,10 +2410,10 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
}
public StyleInfo(
@@ -589,7 +698,7 @@ Subject: Use Apache POI 4.0 API
short rotation,
HSSFFont font,
BoxStyle box,
-@@ -2408,10 +2427,10 @@
+@@ -2408,10 +2440,10 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
protected int computeHash()
{
@@ -603,9 +712,11 @@ Subject: Use Apache POI 4.0 API
hash = 31*hash + rotation;
hash = 31*hash + (font == null ? 0 : font.getIndex());
hash = 31*hash + (box == null ? 0 : box.hashCode());
+diff --git a/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsMetadataExporter.java b/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsMetadataExporter.java
+index 23253df..9845e55 100644
--- a/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsMetadataExporter.java
+++ b/jasperreports/src/net/sf/jasperreports/engine/export/JRXlsMetadataExporter.java
-@@ -57,6 +57,7 @@
+@@ -57,6 +57,7 @@ import java.util.Map;
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -613,12 +724,13 @@ Subject: Use Apache POI 4.0 API
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-@@ -73,10 +74,15 @@
+@@ -73,10 +74,16 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.usermodel.HeaderFooter;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.CellType;
++import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.usermodel.CreationHelper;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -629,7 +741,7 @@ Subject: Use Apache POI 4.0 API
import org.apache.poi.ss.util.CellReference;
import net.sf.jasperreports.engine.DefaultJasperReportsContext;
-@@ -171,11 +177,11 @@
+@@ -171,11 +178,11 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
/**
*
*/
@@ -644,7 +756,7 @@ Subject: Use Apache POI 4.0 API
protected HSSFDataFormat dataFormat;
-@@ -238,7 +244,7 @@
+@@ -238,7 +245,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
if (!configuration.isWhitePageBackground())
{
@@ -653,7 +765,7 @@ Subject: Use Apache POI 4.0 API
}
nature =
-@@ -291,7 +297,7 @@
+@@ -291,7 +298,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
}
emptyCellStyle = workbook.createCellStyle();
@@ -662,7 +774,7 @@ Subject: Use Apache POI 4.0 API
emptyCellStyle.setFillPattern(backgroundMode);
dataFormat = workbook.createDataFormat();
createHelper = workbook.getCreationHelper();
-@@ -398,8 +404,8 @@
+@@ -398,8 +405,8 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
sheet.setDisplayGridlines(showGridlines);
backgroundMode = Boolean.TRUE.equals(sheetInfo.whitePageBackground)
@@ -673,7 +785,16 @@ Subject: Use Apache POI 4.0 API
// maxRowFreezeIndex = 0;
-@@ -638,10 +644,10 @@
+@@ -549,7 +556,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
+ : (CellSettings)currentRow.get(columnName);
+ cell = row.createCell(i);
+ if(cellSettings != null) {
+- int type = cellSettings.getCellType();
++ CellType type = cellSettings.getCellType();
+ cell.setCellType(type);
+ Object cellValue = cellSettings.getCellValue();
+ if(cellValue != null) {
+@@ -638,10 +645,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
BoxStyle boxStyle = new BoxStyle(side, line.getLinePen());
@@ -686,7 +807,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(line.getBackcolor()).getIndex();
}
-@@ -649,8 +655,8 @@
+@@ -649,8 +656,8 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
getLoadedCellStyle(
mode,
backcolor,
@@ -697,7 +818,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
boxStyle,
-@@ -675,10 +681,10 @@
+@@ -675,10 +682,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
short forecolor = getWorkbookColor(element.getLinePen().getLineColor()).getIndex();
@@ -710,7 +831,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(element.getBackcolor()).getIndex();
}
-@@ -686,8 +692,8 @@
+@@ -686,8 +693,8 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
getLoadedCellStyle(
mode,
backcolor,
@@ -721,7 +842,7 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
new BoxStyle(element),
-@@ -715,16 +721,16 @@
+@@ -715,16 +722,16 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
final short forecolor = getWorkbookColor(textElement.getForecolor()).getIndex();
TextAlignHolder textAlignHolder = getTextAlignHolder(textElement);
@@ -742,7 +863,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(textElement.getBackcolor()).getIndex();
}
-@@ -793,7 +799,7 @@
+@@ -793,7 +800,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
}
@@ -751,7 +872,7 @@ Subject: Use Apache POI 4.0 API
} else if (getCurrentItemConfiguration().isDetectCellType()) {
TextValue value = getTextValue(textElement, textStr);
-@@ -801,9 +807,9 @@
+@@ -801,9 +808,9 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
@Override
public void handle(StringTextValue textValue) {
if (JRCommonText.MARKUP_NONE.equals(textElement.getMarkup())) {
@@ -763,7 +884,7 @@ Subject: Use Apache POI 4.0 API
}
}
-@@ -834,7 +840,7 @@
+@@ -834,7 +841,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
value = value.doubleValue() / 86400;
}
@@ -772,7 +893,7 @@ Subject: Use Apache POI 4.0 API
}
@Override
-@@ -859,20 +865,20 @@
+@@ -859,20 +866,20 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
} else {
value = textValue.getValue() == null ? null : translateDateValue(textElement, textValue.getValue());
}
@@ -797,7 +918,7 @@ Subject: Use Apache POI 4.0 API
}
}
-@@ -909,7 +915,7 @@
+@@ -909,7 +916,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
case REFERENCE: {
String href = hyperlink.getHyperlinkReference();
if (href != null) {
@@ -806,7 +927,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
break;
-@@ -918,7 +924,7 @@
+@@ -918,7 +925,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
if(!getCurrentItemConfiguration().isIgnoreAnchors()) {
String href = hyperlink.getHyperlinkAnchor();
if (href != null) {
@@ -815,7 +936,7 @@ Subject: Use Apache POI 4.0 API
if(anchorLinks.containsKey(href)) {
(anchorLinks.get(href)).add(link);
} else {
-@@ -934,7 +940,7 @@
+@@ -934,7 +941,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
{
Integer hrefPage = (getCurrentItemConfiguration().isOnePagePerSheet() ? hyperlink.getHyperlinkPage() : 0);
if (hrefPage != null) {
@@ -824,7 +945,7 @@ Subject: Use Apache POI 4.0 API
if(pageLinks.containsKey(sheetsBeforeCurrentReport+hrefPage)) {
pageLinks.get(sheetsBeforeCurrentReport + hrefPage).add(link);
} else {
-@@ -949,7 +955,7 @@
+@@ -949,7 +956,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
String href = hyperlink.getHyperlinkReference();
if (href != null && hyperlink.getHyperlinkAnchor() != null) {
href = href + "#" + hyperlink.getHyperlinkAnchor();
@@ -833,7 +954,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
-@@ -959,7 +965,7 @@
+@@ -959,7 +966,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
String href = hyperlink.getHyperlinkReference();
if (href != null && hyperlink.getHyperlinkPage() != null) {
href = href + "#JR_PAGE_ANCHOR_0_" + hyperlink.getHyperlinkPage().toString();
@@ -842,7 +963,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
-@@ -972,7 +978,7 @@
+@@ -972,7 +979,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
} else {
String href = customHandler.getHyperlink(hyperlink);
if (href != null) {
@@ -851,7 +972,7 @@ Subject: Use Apache POI 4.0 API
link.setAddress(href);
}
}
-@@ -1106,10 +1112,10 @@
+@@ -1106,10 +1113,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
{
XlsMetadataReportConfiguration configuration = getCurrentItemConfiguration();
@@ -864,7 +985,7 @@ Subject: Use Apache POI 4.0 API
backcolor = getWorkbookColor(element.getBackcolor()).getIndex();
}
-@@ -1123,8 +1129,8 @@
+@@ -1123,8 +1130,8 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
getLoadedCellStyle(
mode,
backcolor,
@@ -875,7 +996,16 @@ Subject: Use Apache POI 4.0 API
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
new BoxStyle(element),
-@@ -1482,10 +1488,10 @@
+@@ -1160,7 +1167,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
+ imageAnchorType = ImageAnchorTypeEnum.MOVE_NO_SIZE;
+ }
+ }
+- anchor.setAnchorType(imageAnchorType.getValue());
++ anchor.setAnchorType(JRXlsExporter.getAnchorType(imageAnchorType));
+ //pngEncoder.setImage(bi);
+ //int imgIndex = workbook.addPicture(pngEncoder.pngEncode(), HSSFWorkbook.PICTURE_TYPE_PNG);
+ int imgIndex = workbook.addPicture(imageProcessorResult.imageData, HSSFWorkbook.PICTURE_TYPE_PNG);
+@@ -1482,10 +1489,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
protected HSSFCellStyle getLoadedCellStyle(
@@ -889,7 +1019,7 @@ Subject: Use Apache POI 4.0 API
short rotation,
HSSFFont font,
BoxStyle box,
-@@ -1500,38 +1506,38 @@
+@@ -1500,38 +1507,38 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
/**
*
*/
@@ -938,7 +1068,7 @@ Subject: Use Apache POI 4.0 API
}
@Override
-@@ -1634,7 +1640,7 @@
+@@ -1634,7 +1641,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
for(int i = 0; i< columnNames.size(); i++) {
String columnName = columnNames.get(i);
cell = row.createCell(i);
@@ -947,7 +1077,7 @@ Subject: Use Apache POI 4.0 API
cell.setCellValue(new HSSFRichTextString(columnName));
}
}
-@@ -1751,33 +1757,36 @@
+@@ -1751,33 +1758,36 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
return ps;
}
@@ -997,7 +1127,7 @@ Subject: Use Apache POI 4.0 API
}
}
-@@ -1889,7 +1898,7 @@
+@@ -1889,7 +1899,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
(cf.getFontHeightInPoints() == fontSize) &&
((cf.getUnderline() == HSSFFont.U_SINGLE)?(font.isUnderline()):(!font.isUnderline())) &&
(cf.getStrikeout() == font.isStrikeThrough()) &&
@@ -1006,7 +1136,7 @@ Subject: Use Apache POI 4.0 API
(cf.getItalic() == font.isItalic()) &&
(cf.getTypeOffset() == superscriptType)
) {
-@@ -1916,7 +1925,7 @@
+@@ -1916,7 +1926,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
cellFont.setStrikeout(true);
}
if (font.isBold()) {
@@ -1015,7 +1145,7 @@ Subject: Use Apache POI 4.0 API
}
if (font.isItalic()) {
cellFont.setItalic(true);
-@@ -1955,7 +1964,7 @@
+@@ -1955,7 +1965,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
protected static final int BOTTOM = 2;
protected static final int RIGHT = 3;
@@ -1024,7 +1154,7 @@ Subject: Use Apache POI 4.0 API
protected short[] borderColour = new short[4];
private int hash;
-@@ -1995,12 +2004,12 @@
+@@ -1995,12 +2005,12 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
public void setPen(JRPen pen) {
if (
@@ -1042,7 +1172,25 @@ Subject: Use Apache POI 4.0 API
short colour = JRXlsMetadataExporter.this.getWorkbookColor(pen.getLineColor()).getIndex();
borderStyle[TOP] = style;
-@@ -2064,10 +2073,10 @@
+@@ -2018,13 +2028,13 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
+ }
+
+ private int computeHash() {
+- int hashCode = borderStyle[TOP];
++ int hashCode = (borderStyle[TOP] == null ? 0 : borderStyle[TOP].hashCode());
+ hashCode = 31*hashCode + borderColour[TOP];
+- hashCode = 31*hashCode + borderStyle[BOTTOM];
++ hashCode = 31*hashCode + (borderStyle[BOTTOM] == null ? 0 : borderStyle[BOTTOM].hashCode());
+ hashCode = 31*hashCode + borderColour[BOTTOM];
+- hashCode = 31*hashCode + borderStyle[LEFT];
++ hashCode = 31*hashCode + (borderStyle[LEFT] == null ? 0 : borderStyle[LEFT].hashCode());
+ hashCode = 31*hashCode + borderColour[LEFT];
+- hashCode = 31*hashCode + borderStyle[RIGHT];
++ hashCode = 31*hashCode + (borderStyle[RIGHT] == null ? 0 : borderStyle[RIGHT].hashCode());
+ hashCode = 31*hashCode + borderColour[RIGHT];
+ return hashCode;
+ }
+@@ -2064,10 +2074,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
*
*/
protected class StyleInfo {
@@ -1056,7 +1204,7 @@ Subject: Use Apache POI 4.0 API
protected final short rotation;
protected final HSSFFont font;
protected final BoxStyle box;
-@@ -2079,10 +2088,10 @@
+@@ -2079,10 +2089,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
private int hashCode;
public StyleInfo(
@@ -1070,7 +1218,21 @@ Subject: Use Apache POI 4.0 API
short rotation,
HSSFFont font,
BoxStyle box,
-@@ -2168,7 +2177,7 @@
+@@ -2107,10 +2117,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
+ }
+
+ protected int computeHash() {
+- int hash = mode;
++ int hash = mode.hashCode();
+ hash = 31*hash + backcolor;
+- hash = 31*hash + horizontalAlignment;
+- hash = 31*hash + verticalAlignment;
++ hash = 31*hash + horizontalAlignment.hashCode();
++ hash = 31*hash + verticalAlignment.hashCode();
+ hash = 31*hash + rotation;
+ hash = 31*hash + (font == null ? 0 : font.getIndex());
+ hash = 31*hash + (box == null ? 0 : box.hashCode());
+@@ -2168,7 +2178,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
protected class CellSettings {
@@ -1079,7 +1241,7 @@ Subject: Use Apache POI 4.0 API
private HSSFCellStyle cellStyle;
private Object cellValue;
private String formula;
-@@ -2177,16 +2186,16 @@
+@@ -2177,16 +2187,16 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
public CellSettings() {
}
public CellSettings(HSSFCellStyle cellStyle) {
@@ -1099,7 +1261,7 @@ Subject: Use Apache POI 4.0 API
HSSFCellStyle cellStyle,
Object cellValue,
String formula) {
-@@ -2194,7 +2203,7 @@
+@@ -2194,7 +2204,7 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
public CellSettings(
@@ -1108,8 +1270,12 @@ Subject: Use Apache POI 4.0 API
HSSFCellStyle cellStyle,
Object cellValue,
String formula,
-@@ -2215,7 +2224,7 @@
- public int getCellType() {
+@@ -2212,10 +2222,10 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
+ public void setCellStyle(HSSFCellStyle cellStyle) {
+ this.cellStyle = cellStyle;
+ }
+- public int getCellType() {
++ public CellType getCellType() {
return cellType;
}
- public void setCellType(int cellType) {
@@ -1117,7 +1283,7 @@ Subject: Use Apache POI 4.0 API
this.cellType = cellType;
}
public Object getCellValue() {
-@@ -2238,20 +2247,20 @@
+@@ -2238,20 +2248,20 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
}
public void importValues(
@@ -1141,82 +1307,27 @@ Subject: Use Apache POI 4.0 API
HSSFCellStyle cellStyle,
Object cellValue,
String formula,
---- a/jasperreports/src/net/sf/jasperreports/engine/data/AbstractPoiXlsDataSource.java
-+++ b/jasperreports/src/net/sf/jasperreports/engine/data/AbstractPoiXlsDataSource.java
-@@ -33,6 +33,7 @@
- import java.util.Map;
+@@ -2268,12 +2278,12 @@ public class JRXlsMetadataExporter extends JRXlsAbstractMetadataExporter<XlsMeta
+ class ImageSettings {
- import org.apache.poi.ss.usermodel.Cell;
-+import org.apache.poi.ss.usermodel.CellType;
- import org.apache.poi.ss.usermodel.FormulaEvaluator;
- import org.apache.poi.ss.usermodel.Row;
- import org.apache.poi.ss.usermodel.Sheet;
-@@ -237,16 +238,16 @@
- {
- return null;
- }
-- if(cell.getCellType() == Cell.CELL_TYPE_FORMULA)
-+ if(cell.getCellType() == CellType.FORMULA)
- {
- FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
- Object value = null;
- switch (evaluator.evaluateFormulaCell(cell))
- {
-- case Cell.CELL_TYPE_BOOLEAN:
-+ case BOOLEAN:
- value = cell.getBooleanCellValue();
- break;
-- case Cell.CELL_TYPE_NUMERIC:
-+ case NUMERIC:
- if(Date.class.isAssignableFrom(valueClass))
- {
- value = cell.getDateCellValue();
-@@ -256,7 +257,7 @@
- value = cell.getNumericCellValue();
- }
- break;
-- case Cell.CELL_TYPE_STRING:
-+ case STRING:
- value = cell.getStringCellValue();
- if(Date.class.isAssignableFrom(valueClass))
- {
-@@ -295,9 +296,9 @@
- }
- }
- break;
-- case Cell.CELL_TYPE_BLANK:
-- case Cell.CELL_TYPE_ERROR:
-- case Cell.CELL_TYPE_FORMULA:
-+ case BLANK:
-+ case ERROR:
-+ case FORMULA:
- default:
- break;
- }
-@@ -310,7 +311,7 @@
- }
- if (valueClass.equals(Boolean.class))
- {
-- if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN)
-+ if (cell.getCellType() == CellType.BOOLEAN)
- {
- return cell.getBooleanCellValue();
- }
-@@ -329,7 +330,7 @@
- }
- else if (Number.class.isAssignableFrom(valueClass))
- {
-- if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC)
-+ if (cell.getCellType() == CellType.NUMERIC)
- {
- return convertNumber(cell.getNumericCellValue(), valueClass);
- }
-@@ -355,7 +356,7 @@
- }
- else if (Date.class.isAssignableFrom(valueClass))
- {
-- if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC)
-+ if (cell.getCellType() == CellType.NUMERIC)
- {
- return cell.getDateCellValue();
- }
+ private int index;
+- private int anchorType;
++ private ClientAnchor.AnchorType anchorType;
+
+ public ImageSettings() {
+ }
+
+- public ImageSettings(int index, int anchorType) {
++ public ImageSettings(int index, ClientAnchor.AnchorType anchorType) {
+ this.index = index;
+ this.anchorType = anchorType;
+ }
+@@ -2282,7 +2292,7 @@ class ImageSettings {
+ return index;
+ }
+
+- public int getAnchorType() {
++ public ClientAnchor.AnchorType getAnchorType() {
+ return anchorType;
+ }
+ }
=====================================
debian/patches/fix-pom.patch
=====================================
@@ -0,0 +1,20 @@
+From: Giovanni Mascellani <gio at debian.org>
+Date: Sun, 31 Mar 2019 11:15:19 +0200
+Subject: Remove runtime indication for saaj dependency.
+
+---
+ jasperreports/pom.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/jasperreports/pom.xml b/jasperreports/pom.xml
+index 61de596..656f9c6 100644
+--- a/jasperreports/pom.xml
++++ b/jasperreports/pom.xml
+@@ -349,7 +349,6 @@
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>1.3</version>
+- <scope>runtime</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ commons-codec-Base64.patch
exclude-barcode4j-and-barbecue.patch
no-commons-javaflow.patch
apache-poi-4.0.patch
+fix-pom.patch
View it on GitLab: https://salsa.debian.org/java-team/jasperreports/commit/90fdfb5a6f1e413ba81f9be56513a92605634350
--
View it on GitLab: https://salsa.debian.org/java-team/jasperreports/commit/90fdfb5a6f1e413ba81f9be56513a92605634350
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190331/a54781ad/attachment.html>
More information about the pkg-java-commits
mailing list