This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 39e6d29351eb3c665c00d7682f7cb59419d13dd8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Oct 27 15:39:45 2015 +0100 fix gitignore and remove orig files --- .gitignore | 2 + faxtomail-persistence/pom.xml.orig | 169 ------- faxtomail-service/pom.xml.orig | 259 ---------- faxtomail-ui-swing/pom.xml.orig | 792 ----------------------------- faxtomail-ui-web/pom.xml.orig | 398 --------------- pom.xml.orig | 999 ------------------------------------- 6 files changed, 2 insertions(+), 2617 deletions(-) diff --git a/.gitignore b/.gitignore index 76a9b9b..ff3c3e0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ tmp/ local.properties .settings/ .loadpath +.project # External tool builders .externalToolBuilders/ @@ -157,3 +158,4 @@ release.properties *.zargo~ +/.project diff --git a/faxtomail-persistence/pom.xml.orig b/faxtomail-persistence/pom.xml.orig deleted file mode 100644 index f30da6b..0000000 --- a/faxtomail-persistence/pom.xml.orig +++ /dev/null @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - FaxToMail :: Persistence - %% - Copyright (C) 2014 Mac-Groupe, 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <artifactId>faxtomail</artifactId> - <groupId>com.franciaflex</groupId> -<<<<<<< HEAD - <version>1.6.4</version> -======= - <version>1.1.1</version> ->>>>>>> refs/heads/release/1.1.1 - </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>com.franciaflex.faxtomail</groupId> - <artifactId>faxtomail-persistence</artifactId> - - <name>FaxToMail :: Persistence</name> - - <dependencies> - - <!-- commons --> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-updater</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-api</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-entities</id> - <phase>generate-sources</phase> - <configuration> - <inputs>zargo</inputs> - <defaultPackage>com.franciaflex.faxtomail.persistence.entities</defaultPackage> - <fullPackagePath>com.franciaflex.faxtomail.persistence.entities</fullPackagePath> - <templates> - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.topia.templates.TopiaMetaTransformer - </templates> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> diff --git a/faxtomail-service/pom.xml.orig b/faxtomail-service/pom.xml.orig deleted file mode 100644 index 7a97dd3..0000000 --- a/faxtomail-service/pom.xml.orig +++ /dev/null @@ -1,259 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - FaxToMail :: Service - %% - Copyright (C) 2014 Mac-Groupe, 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <artifactId>faxtomail</artifactId> - <groupId>com.franciaflex</groupId> -<<<<<<< HEAD - <version>1.6.4</version> -======= - <version>1.1.1</version> ->>>>>>> refs/heads/release/1.1.1 - </parent> - - <groupId>com.franciaflex.faxtomail</groupId> - <artifactId>faxtomail-service</artifactId> - - <name>FaxToMail :: Service</name> - - <properties> - <!-- make sure flyway files are not updated by non human --> - <license.excludes>**/i18n/*.properties, **/THIRD-PARTY.properties, **/*.sh, **/*.sql</license.excludes> - </properties> - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>faxtomail-persistence</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-flyway</artifactId> - </dependency> - - <dependency> - <groupId>org.flywaydb</groupId> - <artifactId>flyway-core</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - <dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-api</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <!-- Logging --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - - <dependency> - <groupId>com.unboundid</groupId> - <artifactId>unboundid-ldapsdk</artifactId> - </dependency> - - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - - <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> - </dependency> - - <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - <dependency> - <groupId>gui.ava</groupId> - <artifactId>html2image</artifactId> - </dependency> - - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - </dependency> - - </dependencies> - - <build> - - <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <configuration> - <entries> - <entry> - <specificGoal>parserValidation</specificGoal> - <basedir>${project.basedir}/src/main/java/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> diff --git a/faxtomail-ui-swing/pom.xml.orig b/faxtomail-ui-swing/pom.xml.orig deleted file mode 100644 index 728332d..0000000 --- a/faxtomail-ui-swing/pom.xml.orig +++ /dev/null @@ -1,792 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - FaxToMail :: UI - %% - Copyright (C) 2014 Mac-Groupe, 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>com.franciaflex</groupId> - <artifactId>faxtomail</artifactId> -<<<<<<< HEAD - <version>1.6.4</version> -======= - <version>1.1.1</version> ->>>>>>> refs/heads/release/1.1.1 - </parent> - - <groupId>com.franciaflex.faxtomail</groupId> - <artifactId>faxtomail-ui-swing</artifactId> - - <name>FaxToMail :: UI</name> - <properties> - - <!-- jaxx configuration --> - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <jaxx.defaultErrorUIFQN> - jaxx.runtime.validator.swing.ui.ImageValidationUI - </jaxx.defaultErrorUIFQN> - <!--<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>--> - <jaxx.generateHelp>true</jaxx.generateHelp> - <jaxx.generateSearch>false</jaxx.generateSearch> - <jaxx.autoImportCss>true</jaxx.autoImportCss> - <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> - <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> - <jaxx.commonCss>${project.basedir}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css</jaxx.commonCss> - - <i18n.bundleOutputName>faxtomail-i18n</i18n.bundleOutputName> - <i18n.generateCsvFile>true</i18n.generateCsvFile> - <i18n.bundleCsvFile> - ${project.build.directory}/generated-sources/resources/META-INF/${i18n.bundleOutputName}.csv - </i18n.bundleCsvFile> - - <!-- generate license bundled files --> - <license.generateBundle>true</license.generateBundle> - <license.bundleThirdPartyPath> - META-INF/faxtomail-THIRD-PARTY.txt - </license.bundleThirdPartyPath> - <license.bundleLicensePath> - META-INF/faxtomail-LICENSE.txt - </license.bundleLicensePath> - - <maven.jar.main.class> - com.franciaflex.faxtomail.ui.swing.RunFaxToMail - </maven.jar.main.class> - - <bundlePrefix>faxtomail-${project.version}</bundlePrefix> - - <faxtomail.log.file> - \$\{java.io.tmpdir\}/faxtomail-${project.version}.log - </faxtomail.log.file> - - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - - </properties> - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>faxtomail-persistence</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>faxtomail-service</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - - <!-- librairie Jaxx --> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets-extra</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-api</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-swing</artifactId> - </dependency> - - <!-- swing widgets --> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> - - <!-- Logging --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>javax.media.jai</groupId> - <artifactId>com.springsource.javax.media.jai.core</artifactId> - </dependency> - - <dependency> - <groupId>javax.media.jai</groupId> - <artifactId>com.springsource.javax.media.jai.codec</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - </dependency> - - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.twelvemonkeys.imageio</groupId> - <artifactId>imageio-jpeg</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>*.config</include> - <include>*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - - <plugins> - - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <configuration> - <entries> - <entry> - <specificGoal>parserValidation</specificGoal> - <basedir>${project.basedir}/src/main/java/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - <entry> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - </execution> - <execution> - <id>make-bundle</id> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>update-project-license</goal> - <goal>add-third-party</goal> - </goals> - <configuration> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0| - Apache License, Version 2.0 - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU LESSER GENERAL PUBLIC LICENSE - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU Lesser General Public License - </licenseMerge> - <licenseMerge> - Common Development and Distribution License (CDDL) v1.0| - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - </licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <useUniqueVersions>false</useUniqueVersions> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <mainClass>${maven.jar.main.class}</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - - </plugins> - </build> - - <profiles> - - <profile> - <id>jar-only</id> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <archive> - <manifest> - <mainClass>com.franciaflex.faxtomail.ui.swing.RunFaxToMail</mainClass> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>default-bundle</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <redmine.releaseFiles> - target/${project.build.finalName}-standalone.zip - </redmine.releaseFiles> - </properties> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>assembly-standalone</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>true</attach> - <descriptors> - <descriptor> - src/main/assembly/standalone.xml - </descriptor> - <!-- <descriptor> - src/main/assembly/i18n.xml - </descriptor> --> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>prepare-full-release</id> - <!--<activation> - <property> - <name>performFullRelease</name> - <value>true</value> - </property> - </activation>--> - <properties> - - <redmine.releaseFiles> - target/${bundlePrefix}-full-windows-i586.zip, - target/${bundlePrefix}-full-linux-i586.zip - <!--target/${bundlePrefix}-full-windows-x64.zip,--> - <!--target/${bundlePrefix}-full-linux-x64.zip--> - </redmine.releaseFiles> - </properties> - <build> - - </build> - </profile> - - <profile> - <id>linux-x64-bundle</id> - <!--activation> - <property> - <name>performFullRelease</name> - <value>true</value> - </property> - </activation--> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get-linux-x64-jre</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputDirectory> - ${project.build.directory}/jre-linux-x64 - </outputDirectory> - <artifactItems> - <artifactItem> - <groupId>com.oracle</groupId> - <artifactId>jre</artifactId> - <version>${jreVersion}</version> - <type>zip</type> - <classifier>linux-x64</classifier> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>${bundlePrefix}</finalName> - </configuration> - <executions> - <execution> - <id>assembly-full-linux-x64</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>false</attach> - <descriptors> - <descriptor> - src/main/assembly/full-linux-x64.xml - </descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>linux-i586-bundle</id> - <!--<activation> - <property> - <name>performFullRelease</name> - <value>true</value> - </property> - </activation>--> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get-linux-i586-jre</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputDirectory> - ${project.build.directory}/jre-linux-i586 - </outputDirectory> - <artifactItems> - <artifactItem> - <groupId>com.oracle</groupId> - <artifactId>jre</artifactId> - <version>${jreVersion}</version> - <type>zip</type> - <classifier>linux-i586</classifier> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>${bundlePrefix}</finalName> - </configuration> - <executions> - <execution> - <id>assembly-full-linux-i586</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>false</attach> - <descriptors> - <descriptor> - src/main/assembly/full-linux-i586.xml - </descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>windows-i586-bundle</id> - <!--<activation> - <property> - <name>performFullRelease</name> - <value>true</value> - </property> - </activation>--> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get-windows-i586-jre</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputDirectory> - ${project.build.directory}/jre-windows-i586 - </outputDirectory> - <artifactItems> - <artifactItem> - <groupId>com.oracle</groupId> - <artifactId>jre</artifactId> - <version>${jreVersion}</version> - <type>zip</type> - <classifier>windows-i586</classifier> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>${bundlePrefix}</finalName> - </configuration> - <executions> - <execution> - <id>assembly-full-windows-i586</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>false</attach> - <descriptors> - <descriptor> - src/main/assembly/full-windows-i586.xml - </descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>windows-x64-bundle</id> - <!--activation> - <property> - <name>performFullRelease</name> - <value>true</value> - </property> - </activation--> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get-windows-x64-jre</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputDirectory> - ${project.build.directory}/jre-windows-x64 - </outputDirectory> - <artifactItems> - <artifactItem> - <groupId>com.oracle</groupId> - <artifactId>jre</artifactId> - <version>${jreVersion}</version> - <type>zip</type> - <classifier>windows-x64</classifier> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>${bundlePrefix}</finalName> - </configuration> - <executions> - <execution> - <id>assembly-full-windows-x64</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>false</attach> - <descriptors> - <descriptor> - src/main/assembly/full-windows-x64.xml - </descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/faxtomail-ui-web/pom.xml.orig b/faxtomail-ui-web/pom.xml.orig deleted file mode 100644 index 06557ed..0000000 --- a/faxtomail-ui-web/pom.xml.orig +++ /dev/null @@ -1,398 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - FaxToMail :: Web - %% - Copyright (C) 2014 Mac-Groupe, 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>com.franciaflex</groupId> - <artifactId>faxtomail</artifactId> -<<<<<<< HEAD - <version>1.6.4</version> -======= - <version>1.1.1</version> ->>>>>>> refs/heads/release/1.1.1 - </parent> - - <groupId>com.franciaflex.faxtomail</groupId> - <artifactId>faxtomail-ui-web</artifactId> - <packaging>war</packaging> - - <name>FaxToMail :: Web</name> - <description>faxToMail Web Module</description> - - <properties> - <redmine.releaseFiles> - target/${project.build.finalName}.war - </redmine.releaseFiles> - - <deployFiles>target/${project.build.finalName}.war</deployFiles> - - <defaultWebContextPath>faxtomail</defaultWebContextPath> - <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> - - <devMode>true</devMode> - <jsMinimize>false</jsMinimize> - <jsCachePeriod>1</jsCachePeriod> - <jsPreProcessors>preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender</jsPreProcessors> - <jsPostProcessors>postProcessors=cssVariables</jsPostProcessors> - </properties> - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>faxtomail-persistence</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>faxtomail-service</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.bootstrap</groupId> - <artifactId>struts2-bootstrap-plugin</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-convention-plugin</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> - - <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>select2</artifactId> - <exclusions> - <exclusion> - <artifactId>jquery</artifactId> - <groupId>org.webjars</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular-ui-tree</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-font-awesome</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-bootstrap</artifactId> - <exclusions> - <exclusion> - <artifactId>bootstrap</artifactId> - <groupId>org.webjars</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-sortable</artifactId> - <exclusions> - <exclusion> - <artifactId>jquery-ui</artifactId> - <groupId>org.webjars</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-html5shiv</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>respond</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - </dependency> - - </dependencies> - - <build> - - <finalName>faxtomail-${project.version}</finalName> - - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.properties</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <excludes> - <exclude>*.properties</exclude> - </excludes> - <filtering>false</filtering> - </resource> - </resources> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <configuration> - <path>/${defaultWebContextPath}</path> - <systemProperties> - <siteUrl>${defaultSiteUrl}</siteUrl> - </systemProperties> - <uriEncoding>UTF-8</uriEncoding> - </configuration> - </plugin> - - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>parseJsp</id> - <goals> - <goal>parserStruts2</goal> - </goals> - <configuration> - <acceptKeyFormat>^faxtomail\..*$</acceptKeyFormat> - </configuration> - </execution> - <execution> - <id>parseOthersAndGen</id> - <configuration> - <entries> - <entry> - <specificGoal>parserValidation</specificGoal> - <basedir>${project.basedir}/src/main/java/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - - <profile> - <id>disable-devMode-release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <devMode>false</devMode> - <jsMinimize>true</jsMinimize> - <jsCachePeriod>0</jsCachePeriod> - <jsPreProcessors> </jsPreProcessors> <!-- Vide pour ne pas inclure la propriété en release --> - <jsPostProcessors> </jsPostProcessors> <!-- Vide pour ne pas inclure la propriété en release --> - </properties> - </profile> - - </profiles> -</project> diff --git a/pom.xml.orig b/pom.xml.orig deleted file mode 100644 index 201d706..0000000 --- a/pom.xml.orig +++ /dev/null @@ -1,999 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - FaxToMail - %% - Copyright (C) 2014 Mac-Groupe, 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>codelutinpom</artifactId> - <version>3</version> - </parent> - - <groupId>com.franciaflex</groupId> - <artifactId>faxtomail</artifactId> -<<<<<<< HEAD - <version>1.6.4</version> -======= - <version>1.1.1</version> ->>>>>>> refs/heads/release/1.1.1 - <packaging>pom</packaging> - - <name>FaxToMail</name> - <description> - Système de traîtement des fax et emails entrants - </description> - <url>http://forge.codelutin.com/projects/faxtomail</url> - <inceptionYear>2014</inceptionYear> - <licenses> - <license> - <name>General Public License (GPL)</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <developers> - <developer> - <id>morin</id> - <name>Kevin Morin</name> - <email>morin at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>Europe/Paris</timezone> - </developer> - </developers> - - <modules> - <module>faxtomail-persistence</module> - <module>faxtomail-service</module> - <module>faxtomail-ui-web</module> - <module>faxtomail-ui-swing</module> - </modules> - - <scm> - <connection>scm:git:http://git.codelutin.com/fatxomail.git</connection> - <developerConnection> - scm:git:https://git.codelutin.com/fatxomail.git - </developerConnection> - <url>https://gitweb.codelutin.com/fatxomail.git</url> - </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - <snapshotRepository> - <id>nuiton-nexus-deploy</id> - <url> - http://nexus.nuiton.org/nexus/content/repositories/faxtomail-snapshot - </url> - </snapshotRepository> - </distributionManagement> - - <properties> - - <platform>codelutin.com</platform> - <projectId>faxtomail</projectId> - - <!-- libraries version --> - <nuitonI18nVersion>3.3</nuitonI18nVersion> - <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> - <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> - <nuitonUpdaterVersion>3.0-rc-1</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> - <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> - <nuitonWebVersion>1.17</nuitonWebVersion> - - <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-beta-13</topiaVersion> - <hibernateVersion>4.3.6.Final</hibernateVersion> - <h2Version>1.3.176</h2Version> - <guavaVersion>18.0</guavaVersion> - - <jaxxVersion>2.26</jaxxVersion> - <!-- do not upgrade to 1.6.5-1 --> - <swingXVersion>1.6.4</swingXVersion> - <xworkVersion>2.3.16.3</xworkVersion> - <struts2Version>2.3.16.3</struts2Version> - <jqueryPluginVersion>3.7.1</jqueryPluginVersion> - <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> - <slf4jVersion>1.7.7</slf4jVersion> - <log4jVersion>2.1</log4jVersion> - <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> - - <commonsIoVersion>2.4</commonsIoVersion> - <commonsEmailVersion>1.3.3</commonsEmailVersion> - <commonsCollections4Version>4.0</commonsCollections4Version> - <commonsLang3Version>3.3.2</commonsLang3Version> - <commonsLoggingVersion>1.2</commonsLoggingVersion> - - <junitVersion>4.11</junitVersion> - - <i18n.bundles>fr_FR,en_GB</i18n.bundles> - <i18n.silent>true</i18n.silent> - - <!-- license header configuration --> - <license.organizationName>Mac-Groupe, Code Lutin</license.organizationName> - <license.licenseName>gpl_v3</license.licenseName> - - <!-- issues status to include in changelog --> - <!--<redmine.statusIds>18,19,3,10,11</redmine.statusIds>--> - - <jgitflow.developBranchName>1.1.1-7532</jgitflow.developBranchName> - - </properties> - - <repositories> - <repository> - <id>faxtomail-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - - <repository> - <id>repository.apache.org</id> - <url>http://repository.apache.org/content/groups/snapshots</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>faxtomail-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgresqlDriverVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.3.1</version> - <scope>runtime</scope> - </dependency> - - <!-- librairies utils --> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-flyway</artifactId> - <version>${topiaVersion}</version> - </dependency> - - <dependency> - <groupId>org.flywaydb</groupId> - <artifactId>flyway-core</artifactId> - <version>3.0</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> - <version>${hibernateVersion}</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- Temp update for log4j 2 detection --> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.2.0.Beta1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.5-pre8</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - <version>${nuitonDecoratorVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - <version>${nuitonConfigVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-updater</artifactId> - <version>${nuitonUpdaterVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> - <version>${nuitonCsvVersion}</version> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guavaVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>${nuitonValidatorVersion}</version> - </dependency> - - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - <version>5.5.5</version> - </dependency> - - <dependency> - <groupId>javax.media.jai</groupId> - <artifactId>com.springsource.javax.media.jai.core</artifactId> - <version>1.1.3</version> - </dependency> - - <dependency> - <groupId>javax.media.jai</groupId> - <artifactId>com.springsource.javax.media.jai.codec</artifactId> - <version>1.1.3</version> - </dependency> - - <!-- librairie Jaxx --> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets-extra</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-api</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-swing</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <!-- swing widgets --> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - <version>${swingXVersion}</version> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - <version>${swingXVersion}</version> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - <version>${swingXVersion}</version> - </dependency> - - <!-- Logging --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commonsIoVersion}</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commonsLoggingVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>${commonsCollections4Version}</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commonsLang3Version}</version> - </dependency> - - <!-- web module --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - <exclusions> - <!-- prevent java.lang.ClassCastException: cannot be cast to javassist.util.proxy.Proxy --> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <version>${jqueryPluginVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.bootstrap</groupId> - <artifactId>struts2-bootstrap-plugin</artifactId> - <version>${bootstrapPluginVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-convention-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - - <!-- prevent java.lang.ClassCastException: cannot be cast to javassist.util.proxy.Proxy --> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - <version>2.2.1</version> - <exclusions> - <exclusion> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.7</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - <version>${commonsEmailVersion}</version> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>1.0.3</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>1.11.1-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>3.2.0-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-sortable</artifactId> - <version>0.12.7</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-bootstrap</artifactId> - <version>0.11.0-2</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>angularjs</artifactId> - <groupId>org.webjars</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.11.1-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>select2</artifactId> - <version>3.5.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.25-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-font-awesome</artifactId> - <version>4.2.0-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-html5shiv</artifactId> - <version>3.7.2-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> - <artifactId>respond</artifactId> - <version>1.4.2</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular-ui-tree</artifactId> - <version>2.1.4-1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.unboundid</groupId> - <artifactId>unboundid-ldapsdk</artifactId> - <version>2.3.6</version> - </dependency> - - <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> - <version>0.8.16</version> - </dependency> - - <dependency> - <groupId>gui.ava</groupId> - <artifactId>html2image</artifactId> - <version>2.0.1</version> - <exclusions> - <exclusion> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>core-renderer</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.0.7</version> - </dependency> - - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <version>1.8.1</version> - </dependency> - - <dependency> - <groupId>org.jpedal</groupId> - <artifactId>jpedal-lgpl</artifactId> - <version>4.74b27</version> - </dependency> - - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>1.51</version> - </dependency> - - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> - <version>1.51</version> - </dependency> - - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>1.51</version> - </dependency> - - <dependency> - <groupId>com.twelvemonkeys.imageio</groupId> - <artifactId>imageio-jpeg</artifactId> - <version>3.0.2</version> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junitVersion}</version> - <scope>test</scope> - </dependency> - - </dependencies> - - </dependencyManagement> - - <build> - - <pluginManagement> - <plugins> - - <!-- plugin site --> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - <configuration> - <bundles>fr_FR</bundles> - </configuration> - </plugin> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${eugeneVersion}</version> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-templates</artifactId> - <version>${topiaVersion}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> - <version>${jaxxVersion}</version> - </plugin> - - </plugins> - </pluginManagement> - <extensions> - <!-- Enabling the use of scpexe with maven 3.0 --> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> - </build> - - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> - - <profiles> - - <profile> - <id>check-release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <build> - <plugins> - <!--<plugin>--> - <!--<artifactId>maven-enforcer-plugin</artifactId>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>check-release-properties</id>--> - <!--<goals>--> - <!--<goal>enforce</goal>--> - <!--</goals>--> - <!--<phase>initialize</phase>--> - <!--<configuration>--> - <!--<rules>--> - <!--<requireProperty>--> - <!--<property>jreVersion</property>--> - <!--<message>You must set a jreVersion property!</message>--> - <!--</requireProperty>--> - <!--<requireProperty>--> - <!--<property>dbVersion</property>--> - <!--<message>You must set a dbVersion property!</message>--> - <!--</requireProperty>--> - <!--<requireProperty>--> - <!--<property>reportVersion</property>--> - <!--<message>You must set a reportVersion property!</message>--> - <!--</requireProperty>--> - <!--</rules>--> - <!--<ignoreCache>true</ignoreCache>--> - <!--<failFast>true</failFast>--> - <!--<fail>true</fail>--> - - <!--</configuration>--> - <!--</execution>--> - <!--</executions>--> - <!--</plugin>--> - </plugins> - </build> - - </profile> - <profile> - <id>license-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <build> - <defaultGoal>generate-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <executions> - <execution> - <id>update-file-header-on-pom</id> - <goals> - <goal>update-file-header</goal> - </goals> - <phase>generate-resources</phase> - <configuration> - <roots> - <root>${project.basedir}</root> - </roots> - <includes> - <include>pom.xml</include> - </includes> - <addSvnKeyWords>false</addSvnKeyWords> - <verbose>false</verbose> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>dependency-info</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - - </profile> - - <profile> - <id>update-file-header</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - <license.descriptor>src/license/project.xml</license.descriptor> - </properties> - <build> - <defaultGoal>process-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <executions> - <execution> - <id>update-file-header</id> - <goals> - <goal>update-file-header</goal> - </goals> - <configuration> - <addSvnKeyWords>true</addSvnKeyWords> - <excludes> - <exclude>**/i18n/*.properties</exclude> - <exclude>**/help/*.properties</exclude> - <exclude>**/THIRD-PARTY.properties</exclude> - <!-- since sh scripts must begins by the line #!/bin/sh, - can not use the mojo for the mojo --> - <exclude>**/*.sh</exclude> - </excludes> - </configuration> - <phase>process-resources</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>release-quality-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <helper.skipCheckAutocontainer>true</helper.skipCheckAutocontainer> - </properties> - </profile> - - </profiles> -</project> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.