branch develop updated (e49099e -> 96536af)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git from e49099e Fix build new f395be9 refs #7860: Update libs new 2f44962 refs #7860: Update batik new a525a3c refs #7860: Update codelutinpom new 44584ee refs #7860: Update commons-collections4 new cefddf1 Happy new year new 96536af refs #7860: Update jgraphx The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 96536afe8f3b6b8dc31a36e6b7bd48184f675c6d Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:55:06 2016 +0100 refs #7860: Update jgraphx commit cefddf186f8bbc50a39b777be8dcb7bd0d092a39 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:43:10 2016 +0100 Happy new year commit 44584eebfcfc9bf5536578ad232917dc91d383fa Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:40:09 2016 +0100 refs #7860: Update commons-collections4 commit a525a3c34da53b6ec388b447d1123112b43ffc7b Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:25:20 2016 +0100 refs #7860: Update codelutinpom commit 2f449624bb9b108ee779c818543d66e9c44efa39 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:24:21 2016 +0100 refs #7860: Update batik commit f395be98eca81b4fc0256d5fe400235ac2b8b113 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 15:19:13 2016 +0100 refs #7860: Update libs Summary of changes: masc-api/pom.xml | 21 +++--- masc-api/src/license/THIRD-PARTY.properties | 12 ++-- .../java/fr/inra/masc/io/writer/DexiXmlWriter.java | 6 +- .../fr/inra/masc/io/writer/ThresholdsWriter.java | 4 +- .../inra/masc/services/ImageGeneratorService.java | 42 ++++++------ .../inra/masc/services/ReportGeneratorService.java | 4 +- .../fr/inra/masc/services/ThresholdService.java | 4 +- .../inra/masc/synoptic/CriteriaGraphBuilder.java | 4 +- .../java/fr/inra/masc/synoptic/LegendItem.java | 4 +- .../java/fr/inra/masc/synoptic/SynopticModel.java | 4 +- .../src/main/java/fr/inra/masc/utils/MascUtil.java | 4 +- .../main/resources/i18n/masc-api_en_GB.properties | 2 +- .../main/resources/i18n/masc-api_fr_FR.properties | 2 +- masc-ui/pom.xml | 4 +- masc-ui/src/license/THIRD-PARTY.properties | 18 +++-- .../java/fr/inra/masc/ui/MascMainUIHandler.java | 4 +- .../main/java/fr/inra/masc/ui/MascUIHelper.java | 4 +- .../editor/ComputableCriteriaEditorHandler.java | 4 +- .../factorValue/MascFactorValueEditorFactory.java | 4 +- .../editor/threshold/ThresholdEditorHandler.java | 4 +- .../editor/threshold/ThresholdTableModel.java | 4 +- .../masc/ui/tree/criteria/CriteriaTreeHelper.java | 4 +- .../inra/masc/ui/widget/SvgImagePanelHandler.java | 6 +- pom.xml | 78 ++++++++++------------ 24 files changed, 125 insertions(+), 122 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 f395be98eca81b4fc0256d5fe400235ac2b8b113 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 15:19:13 2016 +0100 refs #7860: Update libs --- masc-api/pom.xml | 6 +-- .../inra/masc/services/ReportGeneratorService.java | 4 +- pom.xml | 49 +++++++--------------- 3 files changed, 20 insertions(+), 39 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index 36d76ee..9e4f243 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -123,13 +123,13 @@ <!-- flying saucer --> <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> + <artifactId>flying-saucer-pdf</artifactId> </dependency> <dependency> diff --git a/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java b/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java index 7d0db89..ff6678f 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2013 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 @@ -51,7 +51,7 @@ import org.w3c.dom.Document; import org.xhtmlrenderer.pdf.ITextRenderer; import com.google.common.collect.Lists; -import com.itextpdf.text.DocumentException; +import com.lowagie.text.DocumentException; import fr.inra.masc.MascConfig; import fr.inra.masc.MascTechnicalException; diff --git a/pom.xml b/pom.xml index 4fcd755..566ba58 100644 --- a/pom.xml +++ b/pom.xml @@ -216,13 +216,13 @@ <dependency> <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.17</version> + <version>1.0.19</version> </dependency> <dependency> <groupId>org.jfree</groupId> <artifactId>jcommon</artifactId> - <version>1.0.21</version> + <version>1.0.23</version> </dependency> <!-- JGraph --> @@ -236,13 +236,13 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.1</version> + <version>1.3</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.3</version> + <version>1.2</version> </dependency> <dependency> @@ -254,7 +254,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.1</version> + <version>3.4</version> </dependency> <dependency> @@ -266,7 +266,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>14.0.1</version> + <version>19.0</version> </dependency> <dependency> @@ -278,7 +278,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> @@ -293,7 +293,7 @@ <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - <version>1.4</version> + <version>1.6</version> <scope>test</scope> </dependency> @@ -301,42 +301,23 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.19</version> - </dependency> - - <!-- itext - <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>core-renderer</artifactId> - <version>R8</version> + <version>2.3.23</version> </dependency> + <!-- itext --> <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> - <version>2.0.8</version> - </dependency>--> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - <version>5.4.2</version> - <scope>compile</scope> + <version>2.1.7</version> </dependency> <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.0.2</version> - <scope>compile</scope> + <groupId>org.xhtmlrenderer</groupId> + <artifactId>flying-saucer-pdf</artifactId> + <version>9.0.8</version> + <scope>compile</scope> </dependency> - <!-- PDF renderer --> - <!--<dependency>--> - <!--<groupId>org.swinglabs</groupId>--> - <!--<artifactId>pdf-renderer</artifactId>--> - <!--<version>1.0.5</version>--> - <!--</dependency>--> - <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-transcoder</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 a525a3c34da53b6ec388b447d1123112b43ffc7b Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:25:20 2016 +0100 refs #7860: Update codelutinpom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d911226..9003ddb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>3</version> + <version>5.1</version> </parent> <groupId>fr.inra</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 44584eebfcfc9bf5536578ad232917dc91d383fa Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:40:09 2016 +0100 refs #7860: Update commons-collections4 --- masc-api/pom.xml | 4 ++-- masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java | 6 +++--- masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java | 4 ++-- .../src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java | 4 ++-- masc-ui/pom.xml | 4 ++-- masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java | 4 ++-- masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java | 4 ++-- .../editor/criteria/editor/ComputableCriteriaEditorHandler.java | 4 ++-- .../ui/content/editor/factorValue/MascFactorValueEditorFactory.java | 4 ++-- .../masc/ui/content/editor/threshold/ThresholdEditorHandler.java | 4 ++-- .../inra/masc/ui/content/editor/threshold/ThresholdTableModel.java | 4 ++-- .../main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java | 4 ++-- pom.xml | 6 +++--- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index af91f45..ca8b5d4 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -54,8 +54,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java b/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java index d9d056f..98acaae 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java +++ b/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,8 +28,8 @@ import java.io.IOException; import java.util.Collection; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java b/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java index 4f742cf..fd2c2d5 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java +++ b/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java @@ -5,7 +5,7 @@ package fr.inra.masc.io.writer; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -32,7 +32,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java b/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java index af9e69d..c362050 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java @@ -6,7 +6,7 @@ package fr.inra.masc.services; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -36,7 +36,7 @@ import fr.inra.masc.model.EditableCriteria; import fr.inra.masc.model.MascModel; import fr.inra.masc.model.ThresholdValue; import fr.inra.masc.model.ThresholdValueImpl; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java index fce0d54..cc880bd 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2014 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 @@ -31,7 +31,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java b/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java index f716919..ea66c53 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -25,7 +25,7 @@ package fr.inra.masc.synoptic; import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.beans.AbstractSerializableBean; import java.awt.Color; diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java b/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java index 7410f20..fcf3cdc 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -26,7 +26,7 @@ package fr.inra.masc.synoptic; import fr.inra.masc.model.Option; import java.awt.Color; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.beans.AbstractSerializableBean; import java.beans.PropertyChangeEvent; diff --git a/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java b/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java index 380479c..e0f3457 100644 --- a/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java +++ b/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index 3dec08a..be5e3fd 100644 --- a/masc-ui/pom.xml +++ b/masc-ui/pom.xml @@ -138,8 +138,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java index e315e83..61db077 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.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 @@ -51,7 +51,7 @@ import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.help.JAXXHelpUIHandler; import jaxx.runtime.swing.log.JAXXLog4jUI; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java index 9908b66..401d4ab 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -41,7 +41,7 @@ import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.SystemUtils; import org.jdesktop.swingx.JXErrorPane; import org.jdesktop.swingx.JXLabel; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java index f4193ba..88c3b16 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java @@ -6,7 +6,7 @@ package fr.inra.masc.ui.content.editor.criteria.editor; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2013 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 @@ -39,7 +39,7 @@ import javax.swing.tree.TreePath; import jaxx.runtime.swing.Table; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java index 85b95fc..be8ca37 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -44,7 +44,7 @@ import javax.swing.JFormattedTextField; import javax.swing.JList; import javax.swing.JTextField; import javax.swing.ListCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.swingx.renderer.DefaultListRenderer; /** @author sletellier <letellier@codelutin.com> */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java index 8e02e22..c4eafbe 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java @@ -5,7 +5,7 @@ package fr.inra.masc.ui.content.editor.threshold; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -44,7 +44,7 @@ import javax.swing.table.TableCellRenderer; import jaxx.runtime.swing.editor.FileEditor; import jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java index 82b7f07..b24b22c 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -34,7 +34,7 @@ import fr.inra.masc.model.ScaleValue; import fr.inra.masc.model.ThresholdValue; import fr.inra.masc.model.ThresholdValueImpl; import fr.inra.masc.ui.MascUIHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java index 3616555..d77cd87 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 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 @@ -31,7 +31,7 @@ import fr.inra.masc.MascUIModel; import fr.inra.masc.model.Criteria; import jaxx.runtime.swing.nav.tree.NavTreeHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pom.xml b/pom.xml index 9003ddb..e09852a 100644 --- a/pom.xml +++ b/pom.xml @@ -246,9 +246,9 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.1</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 cefddf186f8bbc50a39b777be8dcb7bd0d092a39 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:43:10 2016 +0100 Happy new year --- masc-api/src/main/resources/i18n/masc-api_en_GB.properties | 2 +- masc-api/src/main/resources/i18n/masc-api_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/masc-api/src/main/resources/i18n/masc-api_en_GB.properties b/masc-api/src/main/resources/i18n/masc-api_en_GB.properties index b74f496..3e3fa81 100644 --- a/masc-api/src/main/resources/i18n/masc-api_en_GB.properties +++ b/masc-api/src/main/resources/i18n/masc-api_en_GB.properties @@ -15,7 +15,7 @@ masc.config.ui.config.description=UI configuration file (this files store your p masc.config.ui.locale=Default locale used by application masc.config.ui.logLevel=Log level masc.config.ui.logPatternLayout=Log pattern -masc.copyright.text=Version %1$s Inra, Codelutin @ 2011 - 2013 +masc.copyright.text=Version %1$s Inra, Codelutin @ 2011 - 2016 masc.r.mc=Monte Carlo analysis masc.r.mc.tip=<html><p><b>Monte Carlo analysis \:</b> allow to represent the probabilities to reach each class of the root criteria by simulating a big number of random draws on the values taken by each basic criteria.</p><p>The eventual correlations between basic criteria are not taken into account.</p><p><b>Input \:</b> Input \: A DEXi model and the simulation number wanted (5000 by default).</p><p><b>Output \:</b> The performance histogram for those n simulations for the root attribute.</p> masc.r.oat=One at a time Analysis diff --git a/masc-api/src/main/resources/i18n/masc-api_fr_FR.properties b/masc-api/src/main/resources/i18n/masc-api_fr_FR.properties index 113bb27..8e4b5a8 100644 --- a/masc-api/src/main/resources/i18n/masc-api_fr_FR.properties +++ b/masc-api/src/main/resources/i18n/masc-api_fr_FR.properties @@ -15,7 +15,7 @@ masc.config.ui.config.description=Fichier de configuration de l'interface graphi masc.config.ui.locale=Langue utilisée dans l'application masc.config.ui.logLevel=Niveau de log masc.config.ui.logPatternLayout=Pattern de log -masc.copyright.text=Version %1$s Inra, Codelutin @ 2011 - 2013 +masc.copyright.text=Version %1$s Inra, Codelutin @ 2011 - 2016 masc.r.mc=Monte Carlo analysis masc.r.mc.tip=<html><p><b>Monte Carlo analysis \:</b>permet de représenter les probabilités d’atteindre chaque classe du critère racine en simulant un grand nombre de tirages aléatoires sur les valeurs prises par les critères basiques.</p><p>Les éventuelles corrélations entre critères basiques ne sont pas prises en compte.</p><p><b>En entrée \:</b> un modèle DEXi et le nombre simulations souhaitées (par défaut 5000).</p><p><b>En sortie \:</b> l'histogramme des performances pour ces n sim [...] masc.r.oat=One at a time Analysis -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 96536afe8f3b6b8dc31a36e6b7bd48184f675c6d Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:55:06 2016 +0100 refs #7860: Update jgraphx --- masc-api/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index ca8b5d4..35a2bb2 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -111,7 +111,7 @@ <!-- JGraph --> <dependency> - <groupId>org.tinyjee.jgraphx</groupId> + <groupId>com.github.monkeysintown</groupId> <artifactId>jgraphx</artifactId> </dependency> diff --git a/pom.xml b/pom.xml index e09852a..8bd05cb 100644 --- a/pom.xml +++ b/pom.xml @@ -227,9 +227,9 @@ <!-- JGraph --> <dependency> - <groupId>org.tinyjee.jgraphx</groupId> + <groupId>com.github.monkeysintown</groupId> <artifactId>jgraphx</artifactId> - <version>2.3.0.5</version> + <version>3.3.1.1</version> </dependency> <!-- commons --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm