branch master updated (016a451 -> 1129420)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 016a451 [jgitflow-maven-plugin]merging 'release/1.6.4' into 'master' adds 7f48b93 fixes #7532 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses adds 0a9d0be config pom adds 8d88518 upgarde pom version adds 61bf305 [jgitflow-maven-plugin]updating poms for 1.1.1 branch with snapshot versions new c856ed0 [jgitflow-maven-plugin]updating poms for branch'release/1.1.1' with non-snapshot versions new 1129420 Merge branch 'release/1.1.1' The 2 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 1129420f56adf1c3816e9febe7b2376ff8a79811 Merge: 016a451 c856ed0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 17 12:56:01 2015 +0200 Merge branch 'release/1.1.1' Conflicts: faxtomail-persistence/pom.xml faxtomail-service/pom.xml faxtomail-ui-swing/pom.xml faxtomail-ui-web/pom.xml pom.xml commit c856ed0f829d2222d484f0b984142bc628af5503 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 17 12:43:31 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.1' with non-snapshot versions Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/{pom.xml => pom.xml.orig} | 4 ++++ faxtomail-service/pom.xml | 2 +- faxtomail-service/{pom.xml => pom.xml.orig} | 4 ++++ faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-swing/{pom.xml => pom.xml.orig} | 4 ++++ .../faxtomail/ui/swing/content/reply/ReplyFormUIModel.java | 4 +++- faxtomail-ui-web/pom.xml | 2 +- faxtomail-ui-web/{pom.xml => pom.xml.orig} | 4 ++++ pom.xml | 4 +++- pom.xml => pom.xml.orig | 6 ++++++ 11 files changed, 32 insertions(+), 6 deletions(-) copy faxtomail-persistence/{pom.xml => pom.xml.orig} (98%) copy faxtomail-service/{pom.xml => pom.xml.orig} (98%) copy faxtomail-ui-swing/{pom.xml => pom.xml.orig} (99%) copy faxtomail-ui-web/{pom.xml => pom.xml.orig} (99%) copy pom.xml => pom.xml.orig (99%) -- 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 master in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit c856ed0f829d2222d484f0b984142bc628af5503 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 17 12:43:31 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.1' with non-snapshot versions --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index e0c3178..636775c 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e578a04..80bac07 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3a39fc1..b3cc23b 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 3c6e2bc..441899e 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 13a30f1..6612689 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> <packaging>pom</packaging> <name>FaxToMail</name> -- 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 master in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 1129420f56adf1c3816e9febe7b2376ff8a79811 Merge: 016a451 c856ed0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 17 12:56:01 2015 +0200 Merge branch 'release/1.1.1' Conflicts: faxtomail-persistence/pom.xml faxtomail-service/pom.xml faxtomail-ui-swing/pom.xml faxtomail-ui-web/pom.xml pom.xml faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/{pom.xml => pom.xml.orig} | 4 ++++ faxtomail-service/pom.xml | 2 +- faxtomail-service/{pom.xml => pom.xml.orig} | 4 ++++ faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-swing/{pom.xml => pom.xml.orig} | 4 ++++ .../faxtomail/ui/swing/content/reply/ReplyFormUIModel.java | 4 +++- faxtomail-ui-web/pom.xml | 2 +- faxtomail-ui-web/{pom.xml => pom.xml.orig} | 4 ++++ pom.xml | 4 +++- pom.xml => pom.xml.orig | 6 ++++++ 11 files changed, 32 insertions(+), 6 deletions(-) diff --cc faxtomail-persistence/pom.xml.orig index a70568a,0000000..f30da6b mode 100644,000000..100644 --- a/faxtomail-persistence/pom.xml.orig +++ b/faxtomail-persistence/pom.xml.orig @@@ -1,165 -1,0 +1,169 @@@ +<?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 --cc faxtomail-service/pom.xml.orig index 32ca16a,0000000..7a97dd3 mode 100644,000000..100644 --- a/faxtomail-service/pom.xml.orig +++ b/faxtomail-service/pom.xml.orig @@@ -1,255 -1,0 +1,259 @@@ +<?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 --cc faxtomail-ui-swing/pom.xml.orig index 1401717,b3cc23b..728332d --- a/faxtomail-ui-swing/pom.xml.orig +++ b/faxtomail-ui-swing/pom.xml.orig @@@ -28,7 -28,7 +28,11 @@@ <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> diff --cc faxtomail-ui-web/pom.xml.orig index db7d7e4,0000000..06557ed mode 100644,000000..100644 --- a/faxtomail-ui-web/pom.xml.orig +++ b/faxtomail-ui-web/pom.xml.orig @@@ -1,394 -1,0 +1,398 @@@ +<?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 --cc pom.xml.orig index 3affb38,6612689..201d706 --- a/pom.xml.orig +++ b/pom.xml.orig @@@ -32,7 -32,7 +32,11 @@@ <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> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm