This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jasperreports.
commit df3326c3f16b39cf62a00476d5a0314640a17684 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 29 01:29:15 2016 +0200 Refreshed the patches --- debian/changelog | 4 +- debian/patches/batik-1.8.patch | 24 --- debian/patches/build.patch | 208 ++++++++++----------- debian/patches/commons-codec-Base64.patch | 208 +++++++++++++-------- .../patches/exclude-barcode4j-and-barbecue.patch | 22 +-- debian/patches/no-commons-javaflow.patch | 31 ++- debian/patches/series | 1 - 7 files changed, 262 insertions(+), 236 deletions(-) diff --git a/debian/changelog b/debian/changelog index c07312a..c6e81b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -jasperreports (6.1.1+dfsg-7) UNRELEASED; urgency=medium +jasperreports (6.2.2-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Build with maven-debian-helper * Increased the compression level for the upstream tarball * Removed the pdf documentation and the Eclipse project files diff --git a/debian/patches/batik-1.8.patch b/debian/patches/batik-1.8.patch deleted file mode 100644 index 384b883..0000000 --- a/debian/patches/batik-1.8.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: tony mancill <[email protected]> -Date: Thu, 15 Oct 2015 19:15:57 +0200 -Subject: batik 1.8 - -Fix FTBFS with Batik 1.8 - -Forwarded: not-needed ---- - src/net/sf/jasperreports/renderers/BatikRenderer.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/net/sf/jasperreports/renderers/BatikRenderer.java b/src/net/sf/jasperreports/renderers/BatikRenderer.java -index 4793320..c6e569a 100644 ---- a/src/net/sf/jasperreports/renderers/BatikRenderer.java -+++ b/src/net/sf/jasperreports/renderers/BatikRenderer.java -@@ -53,7 +53,7 @@ import org.apache.batik.bridge.GVTBuilder; - import org.apache.batik.bridge.UserAgent; - import org.apache.batik.bridge.UserAgentAdapter; - import org.apache.batik.bridge.ViewBox; --import org.apache.batik.dom.svg.SAXSVGDocumentFactory; -+import org.apache.batik.anim.dom.SAXSVGDocumentFactory; - import org.apache.batik.dom.svg.SVGDocumentFactory; - import org.apache.batik.ext.awt.image.GraphicsUtil; - import org.apache.batik.gvt.GraphicsNode; diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 65a0f77..140f8f7 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -1,114 +1,114 @@ -From: Markus Koschany <[email protected]> -Date: Wed, 14 Oct 2015 17:57:45 +0200 -Subject: build - -Disable deprecation warnings. Exclude barcode4j and barbecue. Not available in -Debian. -Set fileset dir to /usr/share/java. Do not build fonts and sampleref targets -because the necessary files were removed because of DFSG-concerns. Also fix an -javaflow related build issue and include the required class files. - +Description: Set fileset dir to /usr/share/java. +Author: Markus Koschany <[email protected]> Forwarded: not-needed ---- - build.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 52 insertions(+), 6 deletions(-) - -diff --git a/build.xml b/build.xml -index cfa2166..480b61f 100644 --- a/build.xml +++ b/build.xml -@@ -6,15 +6,48 @@ +@@ -1,18 +1,48 @@ +-<project name="JasperReports" default="compile" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> ++<project name="JasperReports" default="compile" basedir="."> + + <description>Helps build the JasperReports distribution files.</description> + + <property name="version" value="6.2.2"/> + + <path id="project-classpath"> +- <path refid="project-lib"/> ++ <fileset dir="/usr/share/java/"> ++ <include name="**/ant.jar"/> ++ <include name="**/antlr*.jar"/> ++ <include name="**/batik-all.jar"/> ++ <include name="**/bsh.jar"/> ++ <include name="**/castor*.jar"/> ++ <include name="**/commons-beanutils.jar"/> ++ <include name="**/commons-codec.jar"/> ++ <include name="**/commons-collections3.jar"/> ++ <include name="**/commons-digester.jar"/> ++ <include name="**/commons-lang.jar"/> ++ <include name="**/commons-logging.jar"/> ++ <include name="**/ecj.jar"/> ++ <include name="**/glassfish-jpa.jar"/> ++ <include name="**/groovy-all.jar"/> ++ <include name="**/hibernate*.jar"/> ++ <include name="**/httpcore.jar"/> ++ <include name="**/httpclient.jar"/> ++ <include name="**/itext.jar"/> ++ <include name="**/jackson*.jar"/> ++ <include name="**/jaxen.jar"/> ++ <include name="**/jfreechart.jar"/> ++ <include name="**/js.jar"/> ++ <include name="**/jxl.jar"/> ++ <include name="**/lucene-*-4.10*.jar"/> ++ <include name="**/mondrian.jar"/> ++ <include name="**/olap4j*.jar"/> ++ <include name="**/poi*.jar"/> ++ <include name="**/servlet-api-*.jar"/> ++ <include name="**/spring*.jar"/> ++ <include name="**/velocity.jar"/> ++ <include name="**/xalan2.jar"/> ++ </fileset> + <pathelement location="./build/classes"/> + </path> <target name="compile" description="Compiles the java source files of the library."> - <mkdir dir="./build/classes"/> -- <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.6" source="1.6" -+ <javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.6" source="1.6" - encoding="ISO-8859-1" includeantruntime="false"> - <classpath> - <pathelement location="./build/classes"/> -- <fileset dir="./lib"> -- <include name="**/*.jar"/> -+ <fileset dir="/usr/share/java/"> -+ <include name="**/ant.jar"/> -+ <include name="**/antlr*.jar"/> -+ <include name="**/batik-all.jar"/> -+ <include name="**/bsh.jar"/> -+ <include name="**/castor*.jar"/> -+ <include name="**/commons-beanutils.jar"/> -+ <include name="**/commons-codec.jar"/> -+ <include name="**/commons-collections3.jar"/> -+ <include name="**/commons-digester.jar"/> -+ <include name="**/commons-javaflow.jar"/> -+ <include name="**/commons-lang.jar"/> -+ <include name="**/commons-logging.jar"/> -+ <include name="**/ecj.jar"/> -+ <include name="**/glassfish-jpa.jar"/> -+ <include name="**/groovy-all.jar"/> -+ <include name="**/hibernate*.jar"/> -+ <include name="**/httpcore.jar"/> -+ <include name="**/httpclient.jar"/> -+ <include name="**/itext.jar"/> -+ <include name="**/jackson*.jar"/> -+ <include name="**/jaxen.jar"/> -+ <include name="**/jfreechart.jar"/> -+ <include name="**/js.jar"/> -+ <include name="**/jxl.jar"/> -+ <include name="**/lucene-*-4.10*.jar"/> -+ <include name="**/mondrian.jar"/> -+ <include name="**/olap4j*.jar"/> -+ <include name="**/poi*.jar"/> -+ <include name="**/servlet-api-*.jar"/> -+ <include name="**/spring*.jar"/> -+ <include name="**/velocity.jar"/> -+ <include name="**/xalan2.jar"/> - </fileset> - </classpath> - <src path="./src"/> -+ <exclude name="**/barcode4j/*.java"/> -+ <exclude name="**/barbecue/*.java"/> - <compilerarg value="-Xlint:unchecked"/> - <compilerarg value="-Xlint:-options"/> - </javac> -@@ -64,12 +97,12 @@ - </jar> - </target> - -- <target name="alljars" depends="jar, javaflow, fonts" description="Builds all JasperReports JAR files."/> -+ <target name="alljars" depends="jar, javaflow" description="Builds all JasperReports JAR files."/> + <mkdir dir="./build/classes"/> +- <ivy:configure file="./ivysettings.xml" override="true"/> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="compile"/> + <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.6" source="1.6" + encoding="ISO-8859-1" includeantruntime="false" excludes="**/package-info.java"> + <classpath refid="project-classpath"/> +@@ -66,7 +96,6 @@ + <target name="alljars" depends="jar, javaflow, fonts" description="Builds all JasperReports JAR files."/> <target name="javaflow" depends="compile" description="Builds the JavaFlow instrumentated JAR file."> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="javaflow"/> <taskdef name="javaflow" classname="org.apache.commons.javaflow.ant.AntRewriteTask"> - <classpath> -- <fileset dir="./lib"> -+ <fileset dir="/usr/share/java"> - <include name="**/*.jar"/> - </fileset> - <pathelement location="./build/classes"/> -@@ -95,6 +128,19 @@ - <include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/> - <include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/> - <include name="net/sf/jasperreports/engine/fill/FillerSubreportParent.class"/> -+ <include name="net/sf/jasperreports/engine/JRStyle.class"/> -+ <include name="net/sf/jasperreports/engine/JRTemplateReference.class"/> -+ <include name="net/sf/jasperreports/engine/JRStyleSetter.class"/> -+ <include name="net/sf/jasperreports/engine/JRVirtualizer.class"/> -+ <include name="net/sf/jasperreports/engine/base/JRBasePrintPage.class"/> -+ <include name="net/sf/jasperreports/engine/base/JRVirtualPrintPage.class"/> -+ <include name="net/sf/jasperreports/engine/util/FormatFactory.class"/> -+ <include name="net/sf/jasperreports/engine/fill/JRFillBand.class"/> -+ <include name="net/sf/jasperreports/engine/fill/JRFillGroup.class"/> -+ <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/> -+ <include name="net/sf/jasperreports/engine/fill/JRFillReportTemplate.class"/> -+ <include name="net/sf/jasperreports/engine/fill/JREvaluationTime.class"/> -+ <include name="net/sf/jasperreports/engine/fill/DatasetExpressionEvaluator.class"/> - </javaflow> - - <mkdir dir="./dist"/> -@@ -278,6 +324,6 @@ - </copy> + <classpath refid="project-classpath"/> + </taskdef> +@@ -136,7 +165,6 @@ + <delete> + <fileset dir="./dist/docs/api" includes="**/*.*" /> + </delete> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="docs"/> + <condition property="javadoc-arg" value="-Xdoclint:none" else=""> + <or> + <matches pattern="1.8.*" string="${java.version}"/> +@@ -193,7 +221,6 @@ </target> -- <target name="docs" depends="preparedocs, javadoc, schemaref, componentschemaref, configref, sampleref" description="Generates all documentation."/> -+ <target name="docs" depends="preparedocs, javadoc, schemaref, componentschemaref, configref" description="Generates all documentation."/> - - </project> + <target name="schemaref" description="Generates the Schema Reference."> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="docs"/> + <xslt basedir="src/net/sf/jasperreports/engine/dtds" in="src/net/sf/jasperreports/engine/dtds/jasperreport.xsd" destdir="dist/docs" style="docs/schema.reference.xsl" out="./dist/docs/schema.reference.html"> + <param name="sf.net" expression="${sf.net}"/> + <param name="version" expression="${version}"/> +@@ -202,7 +229,6 @@ + </target> + + <target name="partschemaref" description="Generates the Report Parts Schema Reference."> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="docs"/> + <xslt basedir="src/net/sf/jasperreports/parts" in="src/net/sf/jasperreports/parts/parts.xsd" destdir="dist/docs" style="docs/parts.schema.reference.xsl" out="./dist/docs/parts.schema.reference.html"> + <param name="sf.net" expression="${sf.net}"/> + <param name="version" expression="${version}"/> +@@ -211,7 +237,6 @@ + </target> + + <target name="componentschemaref" description="Generates the Component Schema Reference."> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="docs"/> + <xslt basedir="src/net/sf/jasperreports/components" in="src/net/sf/jasperreports/components/components.xsd" destdir="dist/docs" style="docs/components.schema.reference.xsl" out="./dist/docs/components.schema.reference.html"> + <param name="sf.net" expression="${sf.net}"/> + <param name="version" expression="${version}"/> +@@ -220,7 +245,6 @@ + </target> + + <target name="configref" description="Generates the Configuration Reference."> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="docs"/> + <xslt basedir="docs" in="docs/config.reference.xml" destdir="dist/docs" style="docs/config.reference.xsl" out="./dist/docs/config.reference.html"> + <param name="sf.net" expression="${sf.net}"/> + <param name="version" expression="${version}"/> +@@ -229,7 +253,6 @@ + </target> + + <target name="sampleref" depends="compile" description="Generates the Sample Reference."> +- <ivy:cachepath pathid="project-lib" log="download-only" conf="docs"/> + <xslt basedir="docs" in="docs/sample.reference.xml" destdir="dist/docs" style="docs/sample.reference.xsl" out="./dist/docs/sample.reference.html"> + <param name="sf.net" expression="${sf.net}"/> + <param name="version" expression="${version}"/> diff --git a/debian/patches/commons-codec-Base64.patch b/debian/patches/commons-codec-Base64.patch index 9d5fff6..e9e8fea 100644 --- a/debian/patches/commons-codec-Base64.patch +++ b/debian/patches/commons-codec-Base64.patch @@ -1,61 +1,37 @@ -From: Markus Koschany <[email protected]> -Date: Wed, 14 Oct 2015 19:01:07 +0200 -Subject: commons codec Base64 - -Replace non-free W3C Base64 implementation with -apache.commons.codec.binary.Base64 - +Description: Replace non-free W3C Base64 implementation with apache.commons.codec.binary.Base64 +Author: Markus Koschany <[email protected]> Forwarded: no ---- - .../jasperreports/engine/export/JRXmlExporter.java | 13 ++++------- - .../engine/util/JRValueStringUtils.java | 27 ++++------------------ - .../engine/xml/JRPrintImageSourceObject.java | 12 +++------- - 3 files changed, 12 insertions(+), 40 deletions(-) - -diff --git a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java -index 9d51bb0..ce573e1 100644 --- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java +++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java -@@ -101,8 +101,7 @@ import net.sf.jasperreports.export.ExporterConfiguration; - import net.sf.jasperreports.export.ReportExportConfiguration; - import net.sf.jasperreports.export.WriterExporterOutput; +@@ -40,7 +40,7 @@ + import java.util.Map; + import java.util.Set; -import org.w3c.tools.codec.Base64Encoder; -- +import org.apache.commons.codec.binary.Base64; - /** - * Exports a JasperReports document to an XML file that contains the same data as a -@@ -170,6 +169,7 @@ public class JRXmlExporter extends JRAbstractExporter<ReportExportConfiguration, - /** - * - */ -+ private static final String DEFAULT_XML_ENCODING = "UTF-8"; - private static final String XML_EXPORTER_PROPERTIES_PREFIX = JRPropertiesUtil.PROPERTY_PREFIX + "export.xml."; - - public static final String EXCEPTION_MESSAGE_KEY_EMBEDDING_IMAGE_ERROR = "export.xml.embedding.image.error"; -@@ -856,14 +856,9 @@ public class JRXmlExporter extends JRAbstractExporter<ReportExportConfiguration, - { - try - { -- ByteArrayInputStream bais = new ByteArrayInputStream(renderer.getImageData(jasperReportsContext)); -- ByteArrayOutputStream baos = new ByteArrayOutputStream(); -- -- Base64Encoder encoder = new Base64Encoder(bais, baos); -- encoder.process(); -+ byte[] byteOut = Base64.decodeBase64(renderer.getImageData()); -+ imageSource = new String(byteOut, DEFAULT_XML_ENCODING); - -- String encoding = getExporterOutput().getEncoding(); -- imageSource = new String(baos.toByteArray(), encoding); - } - catch (IOException e) - { -diff --git a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java -index 5fb14d0..faf2f6c 100644 + import net.sf.jasperreports.engine.DefaultJasperReportsContext; + import net.sf.jasperreports.engine.JRAbstractExporter; +@@ -877,15 +877,9 @@ + + try + { +- ByteArrayInputStream bais = new ByteArrayInputStream(dataRenderer.getData(jasperReportsContext)); +- ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- Base64Encoder encoder = new Base64Encoder(bais, baos); +- encoder.process(); +- + String encoding = getExporterOutput().getEncoding(); + +- imageSource = new String(baos.toByteArray(), encoding); ++ imageSource = new String(Base64.encodeBase64(dataRenderer.getData(jasperReportsContext)), encoding); + } + catch (IOException e) + { --- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java +++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java -@@ -34,10 +34,7 @@ import java.util.Map; +@@ -34,10 +34,7 @@ import net.sf.jasperreports.engine.JRRuntimeException; @@ -67,7 +43,7 @@ index 5fb14d0..faf2f6c 100644 /** * Utility class used to serialize/deserialize value objects to/from String values. -@@ -525,12 +522,8 @@ public final class JRValueStringUtils +@@ -554,12 +551,8 @@ { try { @@ -82,7 +58,7 @@ index 5fb14d0..faf2f6c 100644 ObjectInputStream objectIn = new ObjectInputStream(bytesIn); return objectIn.readObject(); } -@@ -542,10 +535,6 @@ public final class JRValueStringUtils +@@ -571,10 +564,6 @@ { throw new JRRuntimeException(e); } @@ -92,8 +68,8 @@ index 5fb14d0..faf2f6c 100644 - } } - public String serialize(Object value) -@@ -556,14 +545,8 @@ public final class JRValueStringUtils + @Override +@@ -586,14 +575,8 @@ ObjectOutputStream objectOut = new ObjectOutputStream(bytesOut); objectOut.writeObject(value); objectOut.close(); @@ -110,33 +86,113 @@ index 5fb14d0..faf2f6c 100644 } catch (NotSerializableException e) { -diff --git a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java -index 9886233..00f9526 100644 --- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java +++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java -@@ -32,8 +32,7 @@ import net.sf.jasperreports.engine.JRImageRenderer; - import net.sf.jasperreports.engine.JRPrintImage; - import net.sf.jasperreports.engine.RenderableUtil; +@@ -26,7 +26,7 @@ + import java.io.ByteArrayInputStream; + import java.io.ByteArrayOutputStream; -import org.w3c.tools.codec.Base64Decoder; -- +import org.apache.commons.codec.binary.Base64; - /** - * @author Teodor Danciu ([email protected]) -@@ -81,13 +80,8 @@ public class JRPrintImageSourceObject - { - try - { -- ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ? -- ByteArrayOutputStream baos = new ByteArrayOutputStream(); -- -- Base64Decoder decoder = new Base64Decoder(bais, baos); -- decoder.process(); -- -- printImage.setRenderable(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR)); -+ byte[] decodedBytes = Base64.decodeBase64(imageSource.getBytes("UTF-8")); -+ printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes)); - } - catch (Exception e) + import net.sf.jasperreports.engine.JRException; + import net.sf.jasperreports.engine.JRPrintImage; +@@ -108,13 +108,7 @@ { + try + { +- ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ? +- ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- Base64Decoder decoder = new Base64Decoder(bais, baos); +- decoder.process(); +- +- renderable = SimpleDataRenderer.getInstance(baos.toByteArray());//, JRImage.ON_ERROR_TYPE_ERROR)); ++ renderable = SimpleDataRenderer.getInstance(Base64.decodeBase64(imageSource.getBytes("UTF-8")));//, JRImage.ON_ERROR_TYPE_ERROR)); + } + catch (Exception e) + { +--- a/src/net/sf/jasperreports/engine/export/JRXhtmlExporter.java ++++ b/src/net/sf/jasperreports/engine/export/JRXhtmlExporter.java +@@ -53,7 +53,7 @@ + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; +-import org.w3c.tools.codec.Base64Encoder; ++import org.apache.commons.codec.binary.Base64; + + import net.sf.jasperreports.components.headertoolbar.HeaderToolbarElement; + import net.sf.jasperreports.engine.DefaultJasperReportsContext; +@@ -1712,15 +1712,9 @@ + ? RendererUtil.SVG_MIME_TYPE + : JRTypeSniffer.getImageTypeValue(imageData).getMimeType(); + +- ByteArrayInputStream bais = new ByteArrayInputStream(imageData); +- ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- Base64Encoder encoder = new Base64Encoder(bais, baos); +- encoder.process(); +- + String encoding = getExporterOutput().getEncoding(); + +- imagePath = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), encoding); ++ imagePath = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), encoding); + //don't cache the base64 encoded image as imagePath because they are too big + } + else +--- a/src/net/sf/jasperreports/engine/export/JRHtmlExporter.java ++++ b/src/net/sf/jasperreports/engine/export/JRHtmlExporter.java +@@ -53,7 +53,7 @@ + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; +-import org.w3c.tools.codec.Base64Encoder; ++import org.apache.commons.codec.binary.Base64; + + import net.sf.jasperreports.crosstabs.JRCellContents; + import net.sf.jasperreports.engine.DefaultJasperReportsContext; +@@ -1775,15 +1775,9 @@ + ? "image/svg+xml" + : JRTypeSniffer.getImageTypeValue(imageData).getMimeType(); + +- ByteArrayInputStream bais = new ByteArrayInputStream(imageData); +- ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- Base64Encoder encoder = new Base64Encoder(bais, baos); +- encoder.process(); +- + String encoding = getExporterOutput().getEncoding(); + +- imagePath = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), encoding); ++ imagePath = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), encoding); + //don't cache the base64 encoded image as imagePath because they are too big + } + else +--- a/src/net/sf/jasperreports/engine/export/HtmlExporter.java ++++ b/src/net/sf/jasperreports/engine/export/HtmlExporter.java +@@ -47,7 +47,7 @@ + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; +-import org.w3c.tools.codec.Base64Encoder; ++import org.apache.commons.codec.binary.Base64; + + import net.sf.jasperreports.components.headertoolbar.HeaderToolbarElement; + import net.sf.jasperreports.crosstabs.interactive.CrosstabInteractiveJsonHandler; +@@ -1412,15 +1412,9 @@ + ? RendererUtil.SVG_MIME_TYPE + : JRTypeSniffer.getImageTypeValue(imageData).getMimeType(); + +- ByteArrayInputStream bais = new ByteArrayInputStream(imageData); +- ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- Base64Encoder encoder = new Base64Encoder(bais, baos); +- encoder.process(); +- + String encoding = getExporterOutput().getEncoding(); + +- imageSource = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), encoding); ++ imageSource = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), encoding); + } + + //don't cache embedded imageSource as they are not image paths diff --git a/debian/patches/exclude-barcode4j-and-barbecue.patch b/debian/patches/exclude-barcode4j-and-barbecue.patch index 4651b0d..22524d5 100644 --- a/debian/patches/exclude-barcode4j-and-barbecue.patch +++ b/debian/patches/exclude-barcode4j-and-barbecue.patch @@ -65,9 +65,9 @@ Forwarded: not-needed -import net.sf.jasperreports.components.barcode4j.UPCEComponent; -import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent; import net.sf.jasperreports.components.iconlabel.IconLabelComponentDigester; - import net.sf.jasperreports.components.list.DesignListContents; - import net.sf.jasperreports.components.list.StandardListComponent; -@@ -87,8 +68,6 @@ + import net.sf.jasperreports.components.items.Item; + import net.sf.jasperreports.components.items.ItemData; +@@ -88,8 +69,6 @@ public void configureDigester(Digester digester) { addListRules(digester); @@ -76,7 +76,7 @@ Forwarded: not-needed addTableRules(digester); SpiderChartDigester.addSpiderChartRules(digester); addMapRules(digester); -@@ -113,159 +92,6 @@ +@@ -114,159 +93,6 @@ digester.addSetNext(listContentsPattern, "setContents"); } @@ -245,10 +245,10 @@ Forwarded: not-needed -import net.sf.jasperreports.components.barbecue.BarbecueComponent; -import net.sf.jasperreports.components.barcode4j.BarcodeComponent; -import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter; - import net.sf.jasperreports.components.list.ListComponent; - import net.sf.jasperreports.components.list.ListContents; - import net.sf.jasperreports.components.map.Item; -@@ -92,19 +89,6 @@ + import net.sf.jasperreports.components.items.Item; + import net.sf.jasperreports.components.items.ItemData; + import net.sf.jasperreports.components.items.ItemProperty; +@@ -93,19 +90,6 @@ { writeTable(componentElement, reportWriter); } @@ -268,7 +268,7 @@ Forwarded: not-needed else if (component instanceof SpiderChartComponent) { SpiderChartXmlWriter spiderChartWriter = new SpiderChartXmlWriter( -@@ -154,42 +138,6 @@ +@@ -155,42 +139,6 @@ writer.closeElement(); } @@ -311,7 +311,7 @@ Forwarded: not-needed protected void writeMap(JRComponentElement componentElement, JRXmlWriter reportWriter) throws IOException { -@@ -574,25 +522,10 @@ +@@ -577,25 +525,10 @@ { return isNewerVersionOrEqual(componentElement, reportWriter, JRConstants.VERSION_3_5_1); } @@ -339,7 +339,7 @@ Forwarded: not-needed } --- a/pom.xml +++ b/pom.xml -@@ -110,6 +110,10 @@ +@@ -112,6 +112,10 @@ <source>1.6</source> <target>1.6</target> <encoding>UTF-8</encoding> diff --git a/debian/patches/no-commons-javaflow.patch b/debian/patches/no-commons-javaflow.patch index 479f3d0..d685553 100644 --- a/debian/patches/no-commons-javaflow.patch +++ b/debian/patches/no-commons-javaflow.patch @@ -1,20 +1,9 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 22 Apr 2016 11:38:00 +0200 -Subject: no-commons-javaflow - ---- - .../engine/fill/JRContinuationSubreportRunner.java | 75 ---------------------- - .../fill/JRContinuationSubreportRunnerFactory.java | 41 ------------ - 2 files changed, 116 deletions(-) - delete mode 100644 src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java - delete mode 100644 src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java - -diff --git a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java b/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java -deleted file mode 100644 -index 13e7d8a..0000000 +Description: Drop commons-javaflow support +Author: Markus Koschany <[email protected]> +Forwarded: not-needed --- a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java +++ /dev/null -@@ -1,75 +0,0 @@ +@@ -1,81 +0,0 @@ -/* - * JasperReports - Free Java Reporting Library. - * Copyright (C) 2001 - 2014 TIBCO Software Inc. All rights reserved. @@ -59,43 +48,46 @@ index 13e7d8a..0000000 - super(fillSubreport); - } - +- @Override - public boolean isFilling() - { - return continuation != null; - } - +- @Override - public JRSubreportRunResult start() - { - continuation = Continuation.startWith(this); - return runResult(); - } - +- @Override - public JRSubreportRunResult resume() - { - continuation = Continuation.continueWith(continuation); - return runResult(); - } - +- @Override - public void reset() - { - continuation = null; - } - +- @Override - public void cancel() - { - } - +- @Override - public void suspend() - { - Continuation.suspend(); - } -} -diff --git a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java b/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java -deleted file mode 100644 -index e3f7fa8..0000000 --- a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java +++ /dev/null -@@ -1,41 +0,0 @@ +@@ -1,42 +0,0 @@ -/* - * JasperReports - Free Java Reporting Library. - * Copyright (C) 2001 - 2014 TIBCO Software Inc. All rights reserved. @@ -131,6 +123,7 @@ index e3f7fa8..0000000 -public class JRContinuationSubreportRunnerFactory implements JRSubreportRunnerFactory -{ - +- @Override - public JRSubreportRunner createSubreportRunner(JRFillSubreport fillSubreport, JRBaseFiller subreportFiller) - { - return new JRContinuationSubreportRunner(fillSubreport); diff --git a/debian/patches/series b/debian/patches/series index 58b0956..58b761b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ build.patch commons-codec-Base64.patch -batik-1.8.patch exclude-barcode4j-and-barbecue.patch no-commons-javaflow.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasperreports.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
