This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit bfd616ba387d60e5492e52598b3681e5ba1fddb6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Feb 10 18:33:40 2016 +0100 fixes #3684: Revert iText version to 2.1.7 to be compatible with lgpl --- jrst/pom.xml | 8 ++--- .../main/java/org/nuiton/jrst/JRSTUserAgent.java | 4 +-- pom.xml | 38 ++++++++++++---------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/jrst/pom.xml b/jrst/pom.xml index 0b83445..b37a86d 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -3,7 +3,7 @@ #%L JRst :: Api %% - Copyright (C) 2004 - 2012 CodeLutin, Chatellier Eric, Chemit tony + Copyright (C) 2004 - 2016 CodeLutin, Chatellier Eric, Chemit tony %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -167,7 +167,7 @@ <!-- itext --> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> + <artifactId>flying-saucer-pdf</artifactId> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> @@ -175,8 +175,8 @@ </dependency> <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> </dependency> <!-- Test librairies --> diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java b/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java index 789e020..4516354 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2015 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -36,7 +36,7 @@ import org.xhtmlrenderer.resource.ImageResource; import org.xhtmlrenderer.resource.XMLResource; import org.xhtmlrenderer.swing.NaiveUserAgent; -import com.itextpdf.text.Image; +import com.lowagie.text.Image; /** * Class used to resolv images path for JRST documents for itext PDF generation diff --git a/pom.xml b/pom.xml index ce7e3bb..8b4a467 100644 --- a/pom.xml +++ b/pom.xml @@ -61,16 +61,6 @@ </roles> </developer> <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> <name>Tony Chemit</name> <id>tchemit</id> <email>chemit@codelutin.com</email> @@ -81,6 +71,18 @@ </roles> </developer> </developers> + + <contributors> + <contributor> + <name>Sylvain Letellier</name> + <email>letellier@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + </contributors> <modules> <module>docutils</module> @@ -92,12 +94,14 @@ <module>doxia-module-jrst-legacy</module> <module>jrst-doc</module> </modules> -<!-- Source control management. --> + + <!-- Source control management. --> <scm> <connection>scm:git:git@gitlab.nuiton.org:nuiton/jrst.git</connection> <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/jrst.git</developerConnection> <url>https://gitlab.nuiton.org/nuiton/jrst</url> </scm> + <distributionManagement> <site> <id>${site.server}</id> @@ -441,19 +445,19 @@ <!-- itext --> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.0.6</version> + <artifactId>flying-saucer-pdf</artifactId> + <version>9.0.8</version> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-core</artifactId> - <version>9.0.6</version> + <version>9.0.8</version> </dependency> <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - <version>5.5.2</version> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.7</version> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.