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>.