branch develop updated (64919ef -> 1b895ec)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 64919ef [jgitflow-maven-plugin]updating poms for 2.2.2-SNAPSHOT development new 41009a1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 22f3fac [jgitflow-maven-plugin]updating poms for branch'release/2.2.1' with non-snapshot versions new 4ad36bb [jgitflow-maven-plugin]merging 'release/2.2.1' into 'master' new f46a903 [jgitflow-maven-plugin]merging 'master' into 'develop' new 1b895ec [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 1b895ec23ceabe88917dce1dc7d44fcd3e71e074 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:47 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f46a903ad97b2151dcd3134594bc8a291ad5703e Merge: 41009a1 4ad36bb Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:46 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 41009a164e20035826d18aa6f6c96730cda7d39c Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:46 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 4ad36bba2f2fde5a907b7cc6001600cd8714c33b Merge: cdb4e8b 22f3fac Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:45 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.2.1' into 'master' commit 22f3fac784c824b06e20650d09d40595d6280ec8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:40:02 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.2.1' with non-snapshot versions Summary of changes: -- 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4ad36bba2f2fde5a907b7cc6001600cd8714c33b Merge: cdb4e8b 22f3fac Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:45 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.2.1' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../content/demande/DemandeListUIHandler.java | 2 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../WEB-INF/content/admin/configuration-input.jsp | 30 +++++++++++----------- .../src/main/webapp/js/configuration.js | 2 +- pom.xml | 2 +- 9 files changed, 24 insertions(+), 22 deletions(-) -- 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 41009a164e20035826d18aa6f6c96730cda7d39c Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:46 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- 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 ceedc23..e51cd04 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 930a436..f3dd577 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 5f5934c..805b6df 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>2.2.2-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d7ff40f..78ebc3d 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>2.2.2-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 267976e..ebd48da 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f46a903ad97b2151dcd3134594bc8a291ad5703e Merge: 41009a1 4ad36bb Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:46 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 1b895ec23ceabe88917dce1dc7d44fcd3e71e074 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 2 11:41:47 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- 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 e51cd04..ceedc23 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f3dd577..930a436 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 805b6df..5f5934c 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>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 78ebc3d..d7ff40f 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>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index ebd48da..267976e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</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>.
participants (1)
-
codelutin.com scm