branch develop updated (1f76ce79 -> 88c97b73)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from 1f76ce79 [jgitflow-maven-plugin]updating poms for 3.7-SNAPSHOT development new 4e732895 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e600d080 Revert mockito version upgrade because it clashes with JDK 8 contraint new 6b245551 Update third party licenses new bdd5f44c [jgitflow-maven-plugin]updating poms for branch'release/3.6' with non-snapshot versions new e2cf73ad [jgitflow-maven-plugin]merging 'release/3.6' into 'master' new 3b6a4843 [jgitflow-maven-plugin]merging 'master' into 'develop' new 88c97b73 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 88c97b731bc04c7f2a7de420c6c6c0a1ebcf1ef9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:53 2019 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3b6a4843a6f1bbf433fab7b7967abe7a678f494c Merge: 4e732895 e2cf73ad Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:52 2019 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 4e7328955781bf83068cbc7c5d96f1d468628fb7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:52 2019 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e2cf73adf1a8146b1b17c288081f9da147ef42cc Merge: 3be3b8d5 bdd5f44c Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:48 2019 +0200 [jgitflow-maven-plugin]merging 'release/3.6' into 'master' commit bdd5f44cdf9eb4bfee44388d4e8fd52860e38925 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 10:53:26 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.6' with non-snapshot versions commit 6b245551e502563bfb76bfe501a8eff7ba0e7af8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 10:53:03 2019 +0200 Update third party licenses commit e600d080ce385ab4e6cfb236e64504107a235179 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 10:08:34 2019 +0200 Revert mockito version upgrade because it clashes with JDK 8 contraint Summary of changes: pom.xml | 2 +- topia-it/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-junit/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-persistence/src/license/THIRD-PARTY.properties | 7 +++++-- topia-service-csv/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-flyway/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-liquibase/src/license/THIRD-PARTY.properties | 9 +++++++-- topia-service-migration/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-replication/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-templates/src/license/THIRD-PARTY.properties | 9 ++++++--- 10 files changed, 55 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit e600d080ce385ab4e6cfb236e64504107a235179 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 10:08:34 2019 +0200 Revert mockito version upgrade because it clashes with JDK 8 contraint --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d62a8fa..186bda21 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ <junitVersion>4.12</junitVersion> <liquibaseVersion>3.6.3</liquibaseVersion> <log4jVersion>1.2.17</log4jVersion> - <mockitoVersion>2.24.0</mockitoVersion> + <mockitoVersion>2.2.29</mockitoVersion> <nuitonUtilsVersion>3.0</nuitonUtilsVersion> <nuitonCsvVersion>3.0</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 6b245551e502563bfb76bfe501a8eff7ba0e7af8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 10:53:03 2019 +0200 Update third party licenses --- topia-it/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-junit/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-persistence/src/license/THIRD-PARTY.properties | 7 +++++-- topia-service-csv/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-flyway/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-liquibase/src/license/THIRD-PARTY.properties | 9 +++++++-- topia-service-migration/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-replication/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-templates/src/license/THIRD-PARTY.properties | 9 ++++++--- 9 files changed, 54 insertions(+), 19 deletions(-) diff --git a/topia-it/src/license/THIRD-PARTY.properties b/topia-it/src/license/THIRD-PARTY.properties index d9957390..5b7249b2 100644 --- a/topia-it/src/license/THIRD-PARTY.properties +++ b/topia-it/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,10 +23,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:56 CET 2016 +#Fri Jul 05 10:10:36 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-junit/src/license/THIRD-PARTY.properties b/topia-junit/src/license/THIRD-PARTY.properties index e52564cc..f5d8a4c9 100644 --- a/topia-junit/src/license/THIRD-PARTY.properties +++ b/topia-junit/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,10 +23,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:54 CET 2016 +#Fri Jul 05 10:10:06 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-persistence/src/license/THIRD-PARTY.properties b/topia-persistence/src/license/THIRD-PARTY.properties index 1222e43b..39c7ca74 100644 --- a/topia-persistence/src/license/THIRD-PARTY.properties +++ b/topia-persistence/src/license/THIRD-PARTY.properties @@ -2,14 +2,18 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -25,6 +29,5 @@ # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:54 CET 2016 +#Fri Jul 05 10:09:33 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-service-csv/src/license/THIRD-PARTY.properties b/topia-service-csv/src/license/THIRD-PARTY.properties index 215e896c..ec8306c9 100644 --- a/topia-service-csv/src/license/THIRD-PARTY.properties +++ b/topia-service-csv/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -20,10 +24,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:56 CET 2016 +#Fri Jul 05 10:39:44 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-service-flyway/src/license/THIRD-PARTY.properties b/topia-service-flyway/src/license/THIRD-PARTY.properties index d9957390..f66c2bcc 100644 --- a/topia-service-flyway/src/license/THIRD-PARTY.properties +++ b/topia-service-flyway/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,10 +23,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:56 CET 2016 +#Fri Jul 05 10:38:48 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-service-liquibase/src/license/THIRD-PARTY.properties b/topia-service-liquibase/src/license/THIRD-PARTY.properties index d9957390..3944dd82 100644 --- a/topia-service-liquibase/src/license/THIRD-PARTY.properties +++ b/topia-service-liquibase/src/license/THIRD-PARTY.properties @@ -1,14 +1,19 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License - v 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,10 +24,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:56 CET 2016 +#Fri Jul 05 10:39:41 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-service-migration/src/license/THIRD-PARTY.properties b/topia-service-migration/src/license/THIRD-PARTY.properties index d9957390..b4d88d63 100644 --- a/topia-service-migration/src/license/THIRD-PARTY.properties +++ b/topia-service-migration/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,10 +23,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:56 CET 2016 +#Fri Jul 05 10:37:46 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-service-replication/src/license/THIRD-PARTY.properties b/topia-service-replication/src/license/THIRD-PARTY.properties index d9957390..8614b3e1 100644 --- a/topia-service-replication/src/license/THIRD-PARTY.properties +++ b/topia-service-replication/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,10 +23,10 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:56 CET 2016 +#Fri Jul 05 10:34:02 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/topia-templates/src/license/THIRD-PARTY.properties b/topia-templates/src/license/THIRD-PARTY.properties index be4f56a1..8d6e53aa 100644 --- a/topia-templates/src/license/THIRD-PARTY.properties +++ b/topia-templates/src/license/THIRD-PARTY.properties @@ -1,14 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,12 +23,11 @@ # - Mozilla Public License Version 1.0 # - New BSD License # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 15 12:08:54 CET 2016 +#Fri Jul 05 10:10:16 CEST 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit bdd5f44cdf9eb4bfee44388d4e8fd52860e38925 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 10:53:26 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.6' with non-snapshot versions --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 186bda21..6981a256 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 48e9a99f..4aff8c1d 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index d5c0aea4..e77f20a9 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index b45fa34b..49b91fb5 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index cab831e9..08433fd8 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index a210ec9b..afc2f70a 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 02dea7fa..1897f60c 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 93d3496f..1b09a3e5 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index b5c3ebdb..a85658b7 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 437bc784..7e5b8712 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit e2cf73adf1a8146b1b17c288081f9da147ef42cc Merge: 3be3b8d5 bdd5f44c Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:48 2019 +0200 [jgitflow-maven-plugin]merging 'release/3.6' into 'master' pom.xml | 18 +++--- topia-it/pom.xml | 2 +- topia-it/src/license/THIRD-PARTY.properties | 8 ++- topia-junit/pom.xml | 2 +- topia-junit/src/license/THIRD-PARTY.properties | 8 ++- topia-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 7 ++- .../topia/persistence/HqlAndParametersBuilder.java | 67 +++++++++++++++++---- .../org/nuiton/topia/persistence/TopiaDao.java | 25 +++++++- .../persistence/internal/AbstractTopiaDao.java | 68 ++++++++++++++-------- topia-service-csv/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 8 ++- topia-service-flyway/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 8 ++- topia-service-liquibase/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 9 ++- topia-service-migration/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 8 ++- topia-service-replication/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 8 ++- topia-templates/pom.xml | 2 +- topia-templates/src/license/THIRD-PARTY.properties | 9 ++- .../templates/EntityHibernateMappingGenerator.java | 6 +- .../topia/templates/TopiaMetaTransformer.java | 2 +- 24 files changed, 198 insertions(+), 79 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 4e7328955781bf83068cbc7c5d96f1d468628fb7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:52 2019 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 37355019..7c30c509 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index e79194c1..4aff8c1d 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 52a52e94..e77f20a9 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 481922c3..49b91fb5 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index a85cdfbd..08433fd8 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 35a8934e..afc2f70a 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 9e65b124..1897f60c 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 8bb647d8..1b09a3e5 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index b3386611..a85658b7 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 0c4d0208..7e5b8712 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 3b6a4843a6f1bbf433fab7b7967abe7a678f494c Merge: 4e732895 e2cf73ad Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:52 2019 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' pom.xml | 2 +- topia-it/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-junit/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-persistence/src/license/THIRD-PARTY.properties | 7 +++++-- topia-service-csv/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-flyway/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-liquibase/src/license/THIRD-PARTY.properties | 9 +++++++-- topia-service-migration/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-service-replication/src/license/THIRD-PARTY.properties | 8 ++++++-- topia-templates/src/license/THIRD-PARTY.properties | 9 ++++++--- 10 files changed, 55 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 88c97b731bc04c7f2a7de420c6c6c0a1ebcf1ef9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jul 5 11:21:53 2019 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 6981a256..39f7259f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 4aff8c1d..e79194c1 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index e77f20a9..52a52e94 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 49b91fb5..481922c3 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 08433fd8..a85cdfbd 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index afc2f70a..35a8934e 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 1897f60c..9e65b124 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 1b09a3e5..8bb647d8 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index a85658b7..b3386611 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 7e5b8712..0c4d0208 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm