This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 45d1d9a431da60cedab021746e02c18e6a27b10c Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 15:52:03 2016 +0100 upgrade pom Conflicts: faxtomail-ui-swing/pom.xml pom.xml --- faxtomail-ui-web/README.txt => README.md | 0 .../README.txt => faxtomail-persistence/README.md | 0 faxtomail-service/{README.txt => README.md} | 0 .../README.txt => faxtomail-ui-swing/README.md | 0 faxtomail-ui-swing/pom.xml | 2 +- README.txt => faxtomail-ui-web/README.md | 0 pom.xml | 15 ++++++++++++++- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-web/README.txt b/README.md similarity index 100% rename from faxtomail-ui-web/README.txt rename to README.md diff --git a/faxtomail-ui-swing/README.txt b/faxtomail-persistence/README.md similarity index 100% rename from faxtomail-ui-swing/README.txt rename to faxtomail-persistence/README.md diff --git a/faxtomail-service/README.txt b/faxtomail-service/README.md similarity index 100% rename from faxtomail-service/README.txt rename to faxtomail-service/README.md diff --git a/faxtomail-persistence/README.txt b/faxtomail-ui-swing/README.md similarity index 100% rename from faxtomail-persistence/README.txt rename to faxtomail-ui-swing/README.md diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 0aaaedd..b82ef86 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -289,7 +289,7 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> - + </dependencies> <build> diff --git a/README.txt b/faxtomail-ui-web/README.md similarity index 100% rename from README.txt rename to faxtomail-ui-web/README.md diff --git a/pom.xml b/pom.xml index 67a96c8..4c204e6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> +<<<<<<< HEAD <version>6</version> +======= + <version>9</version> +>>>>>>> 1d67506... upgrade pom </parent> <groupId>com.franciaflex</groupId> @@ -90,8 +94,9 @@ <properties> - <platform>codelutin.com</platform> + <!--<platform>codelutin.com</platform>--> <projectId>faxtomail</projectId> + <ciViewId>FaxToMail</ciViewId> <!-- libraries version --> <nuitonI18nVersion>3.3</nuitonI18nVersion> @@ -136,6 +141,14 @@ <license.organizationName>Mac-Groupe, Code Lutin</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> +<<<<<<< HEAD +======= + <!-- Java version --> + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + +>>>>>>> 1d67506... upgrade pom <!-- issues status to include in changelog --> <!--<redmine.statusIds>18,19,3,10,11</redmine.statusIds>--> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.