Author: echatellier Date: 2014-07-25 11:16:19 +0200 (Fri, 25 Jul 2014) New Revision: 439 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/439 Log: Update libs and build Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-service/pom.xml 2014-07-25 09:16:19 UTC (rev 439) @@ -83,13 +83,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> </dependency> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-swing/pom.xml 2014-07-25 09:16:19 UTC (rev 439) @@ -120,11 +120,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -144,25 +139,11 @@ <artifactId>commons-collections4</artifactId> </dependency> - <!-- used forApplicationUpdater --> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - <!-- librairie Jaxx --> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -231,26 +212,6 @@ <scope>runtime</scope> </dependency> - <!--<dependency>--> - <!--<groupId>net.atlanticbb.tantlinger</groupId>--> - <!--<artifactId>shef</artifactId>--> - <!--</dependency>--> - - <!--<dependency>--> - <!--<groupId>jtidy</groupId>--> - <!--<artifactId>jtidy</artifactId>--> - <!--</dependency>--> - - <!--<dependency>--> - <!--<groupId>org.bushe</groupId>--> - <!--<artifactId>sam</artifactId>--> - <!--</dependency>--> - - <!--<dependency>--> - <!--<groupId>novaworx</groupId>--> - <!--<artifactId>novaworx-syntax</artifactId>--> - <!--</dependency>--> - <dependency> <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) @@ -38,7 +38,7 @@ import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java 2014-07-25 09:16:19 UTC (rev 439) @@ -26,7 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; import javax.swing.*; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) @@ -40,7 +40,6 @@ import java.util.Map; import javax.swing.JComponent; -import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.JTable; import javax.swing.JTree; @@ -62,7 +61,6 @@ import jaxx.runtime.JAXXUtil; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) @@ -33,7 +33,7 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.model.JaxxDefaultListModel; import jaxx.runtime.validator.swing.SwingValidator; -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; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-07-25 09:16:19 UTC (rev 439) @@ -26,7 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; import javax.swing.*; Modified: trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-25 09:16:19 UTC (rev 439) @@ -7,6 +7,7 @@ # - BSD License # - BSD-style license # - CDDL +# - CDDL + GPLv2 with classpath exception # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Common Public License Version 1.0 @@ -41,9 +42,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jul 10 12:54:07 CEST 2014 +#Fri Jul 25 10:54:33 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/pom.xml 2014-07-25 09:16:19 UTC (rev 439) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.9</version> + <version>5.1</version> </parent> <groupId>com.franciaflex</groupId> @@ -77,8 +77,8 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> <snapshotRepository> <id>nuiton-nexus-deploy</id> @@ -92,10 +92,11 @@ <platform>codelutin.com</platform> <projectId>faxtomail</projectId> + <siteDeployClassifier/> <!-- libraries version --> - <nuitonI18nVersion>3.1</nuitonI18nVersion> + <nuitonI18nVersion>3.2</nuitonI18nVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> @@ -265,23 +266,9 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>${nuitonValidatorVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <!--<dependency>--> - <!--<groupId>org.apache.struts.xwork</groupId>--> - <!--<artifactId>xwork-core</artifactId>--> - <!--<version>${xworkVersion}</version>--> - <!--</dependency>--> - - <dependency> <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> - <version>5.5.1</version> + <version>5.5.2</version> </dependency> <!-- librairie Jaxx --> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-07-24 14:24:59 UTC (rev 438) +++ trunk/src/site/site_fr.xml 2014-07-25 09:16:19 UTC (rev 439) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + FaxToMail + $Id$ + $HeadURL$ + %% + Copyright (C) 2014 Franciaflex, Code Lutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project name="${project.name}"> <skin>