This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git commit 2f449624bb9b108ee779c818543d66e9c44efa39 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:24:21 2016 +0100 refs #7860: Update batik --- masc-api/pom.xml | 9 +++-- masc-api/src/license/THIRD-PARTY.properties | 12 +++---- .../inra/masc/services/ImageGeneratorService.java | 42 +++++++++++----------- masc-ui/src/license/THIRD-PARTY.properties | 18 ++++++---- .../inra/masc/ui/widget/SvgImagePanelHandler.java | 6 ++-- pom.xml | 17 +++++++-- 6 files changed, 63 insertions(+), 41 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index 9e4f243..af91f45 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -136,16 +136,21 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-transcoder</artifactId> </dependency> - + <dependency> <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-svg-dom</artifactId> + <artifactId>batik-anim</artifactId> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-util</artifactId> </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>xmlgraphics-commons</artifactId> + </dependency> <dependency> <groupId>xml-apis</groupId> diff --git a/masc-api/src/license/THIRD-PARTY.properties b/masc-api/src/license/THIRD-PARTY.properties index dea6311..aa43d5b 100644 --- a/masc-api/src/license/THIRD-PARTY.properties +++ b/masc-api/src/license/THIRD-PARTY.properties @@ -3,12 +3,13 @@ # Already used licenses in project : # - Apache Software License, version 1.1 # - BSD License -# - BSD-style license +# - Bouncy Castle Licence # - Bouncy Castle License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 +# - Eclipse Public License 1.0 # - GNU Lesser General Public Licence -# - GNU Lesser General Public License (LGPL), version 2.1 +# - GNU Lesser General Public License (LGPL), version 2.1 or later +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JGraph Ltd - 3 clause BSD license # - Lesser General Public License (LGPL) @@ -17,7 +18,6 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Mozilla Public License -# - Mozilla Public License version 1.1 # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 @@ -25,6 +25,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Mar 14 15:35:39 CET 2013 +#Tue Jan 05 15:27:45 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +xalan--xalan--2.7.0=The Apache Software License, Version 2.0 diff --git a/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java b/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java index d70a75e..0589e8e 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011, 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,25 +24,6 @@ */ package fr.inra.masc.services; -import com.google.common.base.Supplier; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; -import com.mxgraph.util.mxCellRenderer; -import com.mxgraph.util.mxRectangle; -import com.mxgraph.util.mxXmlUtils; -import com.mxgraph.view.mxGraph; - -import fr.inra.masc.charts.ChartModel; -import fr.inra.masc.model.Criteria; -import fr.inra.masc.model.Option; -import fr.inra.masc.model.OptionValue; -import fr.inra.masc.model.ScaleValue; -import fr.inra.masc.synoptic.CriteriaGraphBuilder; -import fr.inra.masc.synoptic.SynopticModel; -import fr.inra.masc.utils.MascUtil; - import java.awt.Color; import java.awt.Font; import java.awt.image.BufferedImage; @@ -51,7 +32,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.batik.dom.svg.SAXSVGDocumentFactory; +import org.apache.batik.anim.dom.SAXSVGDocumentFactory; import org.apache.batik.util.XMLResourceDescriptor; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -75,6 +56,25 @@ import org.jfree.data.category.DefaultCategoryDataset; import org.w3c.dom.Document; import org.w3c.dom.svg.SVGDocument; +import com.google.common.base.Supplier; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; +import com.mxgraph.util.mxCellRenderer; +import com.mxgraph.util.mxRectangle; +import com.mxgraph.util.mxXmlUtils; +import com.mxgraph.view.mxGraph; + +import fr.inra.masc.charts.ChartModel; +import fr.inra.masc.model.Criteria; +import fr.inra.masc.model.Option; +import fr.inra.masc.model.OptionValue; +import fr.inra.masc.model.ScaleValue; +import fr.inra.masc.synoptic.CriteriaGraphBuilder; +import fr.inra.masc.synoptic.SynopticModel; +import fr.inra.masc.utils.MascUtil; + /** * Service used to generate {@link JFreeChart} * diff --git a/masc-ui/src/license/THIRD-PARTY.properties b/masc-ui/src/license/THIRD-PARTY.properties index ba4010a..b8662d3 100644 --- a/masc-ui/src/license/THIRD-PARTY.properties +++ b/masc-ui/src/license/THIRD-PARTY.properties @@ -2,25 +2,29 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache Software License, version 1.1 -# - BSD -# - BSD-style license +# - BSD License +# - Bouncy Castle Licence # - Bouncy Castle License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License version 3 # - GNU Lesser General Public Licence -# - GNU Lesser General Public License (LGPL), version 2.1 -# - General Public License (GPL) v 3.0 +# - GNU Lesser General Public License (LGPL), version 2.1 or later +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JGraph Ltd - 3 clause BSD license # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Mozilla Public License -# - Mozilla Public License version 1.1 # - Public Domain # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Mar 11 11:28:50 CET 2013 +#Tue Jan 05 16:22:46 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +xalan--xalan--2.7.0=The Apache Software License, Version 2.0 diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java index e29a032..91e6559 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/widget/SvgImagePanelHandler.java @@ -6,7 +6,7 @@ package fr.inra.masc.ui.widget; * $Id:$ * $HeadURL:$ * %% - * Copyright (C) 2011 - 2013 Inra, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2016 Inra, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -41,9 +41,9 @@ import javax.swing.JOptionPane; import org.apache.batik.swing.JSVGCanvas; import org.apache.batik.swing.JSVGScrollPane; -import org.apache.batik.swing.svg.AbstractJSVGComponent; import org.apache.batik.swing.svg.GVTTreeBuilderAdapter; import org.apache.batik.swing.svg.GVTTreeBuilderEvent; +import org.apache.batik.swing.svg.JSVGComponent; import org.apache.batik.transcoder.Transcoder; import org.apache.batik.transcoder.TranscoderInput; import org.apache.batik.transcoder.TranscoderOutput; @@ -83,7 +83,7 @@ public class SvgImagePanelHandler extends ImagePanelHandler<SvgImagePanel> { jsvgCanvas.setEnableResetTransformInteractor(false); jsvgCanvas.setEnableRotateInteractor(false); jsvgCanvas.setEnablePanInteractor(false); - jsvgCanvas.setDocumentState(AbstractJSVGComponent.ALWAYS_STATIC); + jsvgCanvas.setDocumentState(JSVGComponent.ALWAYS_STATIC); ui.getModel().addPropertyChangeListener(ImagePanelModel.PROPERTY_BACKGROUND_COLOR, new PropertyChangeListener() { @Override diff --git a/pom.xml b/pom.xml index 566ba58..d911226 100644 --- a/pom.xml +++ b/pom.xml @@ -66,8 +66,8 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <jaxxVersion>2.5.22</jaxxVersion> <swingXVersion>1.6.5-1</swingXVersion> - <jMexicoVersion>0.11</jMexicoVersion> - <batikVersion>1.7</batikVersion> + <jMexicoVersion>0.11.1-SNAPSHOT</jMexicoVersion> + <batikVersion>1.8</batikVersion> <xmlApisVersion>1.3.04</xmlApisVersion> <license.organizationName>Inra, Codelutin</license.organizationName> @@ -335,6 +335,12 @@ <artifactId>batik-svg-dom</artifactId> <version>${batikVersion}</version> </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-anim</artifactId> + <version>${batikVersion}</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> @@ -360,6 +366,13 @@ <version>${batikVersion}</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>xmlgraphics-commons</artifactId> + <version>2.0.1</version> + <scope>runtime</scope> + </dependency> </dependencies> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.