branch master-1.1.x updated (ac3fdefc -> a74955a9)
This is an automated email from the git hooks/post-receive script. New change to branch master-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from ac3fdefc [jgitflow-maven-plugin]merging 'release/1.1.19' into 'master-1.1.x' adds e79b6bd0 [jgitflow-maven-plugin]updating poms for 1.1.20-SNAPSHOT development adds f57f9a40 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 71614000 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' adds 1e0127ff [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds bdce72d5 refs #11091 : Impossible de rechercher dans les archives via l'appli web : Suppression des like (page utilisée avec un numéro de commande exact). Problème dû aux perfs -> timeout. adds 2b26beeb :wrench: Prepare release on 1.x branch adds 17a2bae3 :wrench: Prepare release on 1.x branch adds fb63c72f :white_check_mark: fix tests adds c13fcffc :wrench: Prepare release new d23421b8 [gitflow-maven-plugin]Update versions for release new e38f73c5 :wrench: Fix release new a74955a9 Merge branch 'release/1.1.20' into master-1.1.x The 3 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 a74955a999f64379c38d612fc328895484a9ed75 Merge: ac3fdefc e38f73c5 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Dec 10 17:45:56 2020 +0100 Merge branch 'release/1.1.20' into master-1.1.x commit e38f73c5a5fba0375b328db4d77a7607126de1ae Author: Jean Couteau <couteau@codelutin.com> Date: Thu Dec 10 17:43:36 2020 +0100 :wrench: Fix release commit d23421b80e80fc5ada35f5459a86088a9429b002 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Dec 10 17:27:33 2020 +0100 [gitflow-maven-plugin]Update versions for release Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailTopiaDao.java | 21 ++--- faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceTest.java | 16 ++-- .../services/service/InitTestDataImpl.java | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 7 +- pom.xml | 89 +++++----------------- 8 files changed, 44 insertions(+), 97 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 master-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit d23421b80e80fc5ada35f5459a86088a9429b002 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Dec 10 17:27:33 2020 +0100 [gitflow-maven-plugin]Update versions for release --- 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 38ca9689..2084cdfa 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.20-SNAPSHOT</version> + <version>1.1.20</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1d76f569..367650d1 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.20-SNAPSHOT</version> + <version>1.1.20</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index dfcff335..3476f5d9 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.20-SNAPSHOT</version> + <version>1.1.20</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 3882ff4d..9dfc4806 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.20-SNAPSHOT</version> + <version>1.1.20</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 9cb95265..2552d37f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.20-SNAPSHOT</version> + <version>1.1.20</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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit e38f73c5a5fba0375b328db4d77a7607126de1ae Author: Jean Couteau <couteau@codelutin.com> Date: Thu Dec 10 17:43:36 2020 +0100 :wrench: Fix release --- faxtomail-ui-web/pom.xml | 5 +++++ pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9dfc4806..1c6c738a 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -73,6 +73,11 @@ <artifactId>topia-persistence</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-flyway</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> diff --git a/pom.xml b/pom.xml index 2552d37f..8fc26507 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ <repositories> <repository> <id>faxtomail-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/</url> + <url>https://nexus.nuiton.org/nexus/content/groups/faxtomail-group/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -191,7 +191,7 @@ <pluginRepositories> <pluginRepository> <id>faxtomail-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/</url> + <url>https://nexus.nuiton.org/nexus/content/groups/faxtomail-group/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> -- 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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a74955a999f64379c38d612fc328895484a9ed75 Merge: ac3fdefc e38f73c5 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Dec 10 17:45:56 2020 +0100 Merge branch 'release/1.1.20' into master-1.1.x faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailTopiaDao.java | 21 ++--- faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceTest.java | 16 ++-- .../services/service/InitTestDataImpl.java | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 7 +- pom.xml | 89 +++++----------------- 8 files changed, 44 insertions(+), 97 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm