branch develop updated (7c40078 -> 7f11cc1)
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 7c40078 Replace JavaBeanTransformer by BeanTransformer in TopiaMetaTransformer (Fixes #4073) new 643b9b5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d7fbb33 [jgitflow-maven-plugin]updating poms for 3.1.3.2 branch with snapshot versions adds 7c5e343 [jgitflow-maven-plugin]updating poms for branch'release/3.1.3.2' with non-snapshot versions adds 32c365c Fix bean generation new 38a677e [jgitflow-maven-plugin]merging 'release/3.1.3.2' into 'master' new a2a30a0 [jgitflow-maven-plugin]merging 'master' into 'develop' new 7f11cc1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 4 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 7f11cc11a29e0684e0812574f8eef4b4ea4067e7 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:57 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a2a30a06934f3870b954dd60aa434e05073d8afc Merge: 643b9b5 38a677e Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:56 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 643b9b5c97cba82ee312f97f9dbc6c5e2abb2d7e Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:56 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 38a677eec014aa069a25afc040b9d884cafbf6f2 Merge: 25a021e 32c365c Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.1.3.2' into 'master' Summary of changes: .../topia/it/legacy/topiatest/beangen/{RoueImpl.java => Roue.java} | 6 ++---- topia-it/src/main/xmi/topia-it-legacy.properties | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) rename topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen/{RoueImpl.java => Roue.java} (93%) -- 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 38a677eec014aa069a25afc040b9d884cafbf6f2 Merge: 25a021e 32c365c Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.1.3.2' into 'master' pom.xml | 4 ++-- topia-it/pom.xml | 2 +- .../topia/it/legacy/topiatest/beangen/{RoueImpl.java => Roue.java} | 6 ++---- topia-it/src/main/xmi/topia-it-legacy.properties | 1 + 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 +- .../main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java | 3 ++- 13 files changed, 16 insertions(+), 16 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 643b9b5c97cba82ee312f97f9dbc6c5e2abb2d7e Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:56 2016 +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 a7e0ad7..66fdf63 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1.3.2</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 903d4b3..22b6c19 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.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 79c2744..3062e49 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.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 8b3015f..535f5cc 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.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 12cc74f..206f8a0 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.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index ee4b4dc..48ac6e2 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 90f3772..d13400b 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 4272c16..84b93e9 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.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index f3636e2..3d813c2 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.2-SNAPSHOT</version> + <version>3.1.3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 76ad400..03e6d70 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.2-SNAPSHOT</version> + <version>3.1.3.2</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 a2a30a06934f3870b954dd60aa434e05073d8afc Merge: 643b9b5 38a677e Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:56 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../topia/it/legacy/topiatest/beangen/{RoueImpl.java => Roue.java} | 6 ++---- topia-it/src/main/xmi/topia-it-legacy.properties | 1 + 2 files changed, 3 insertions(+), 4 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 7f11cc11a29e0684e0812574f8eef4b4ea4067e7 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 18 14:12:57 2016 +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 66fdf63..a7e0ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.1.3.2</version> + <version>3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 22b6c19..903d4b3 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.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 3062e49..79c2744 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.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 535f5cc..8b3015f 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.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 206f8a0..12cc74f 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.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 48ac6e2..ee4b4dc 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index d13400b..90f3772 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 84b93e9..4272c16 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.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 3d813c2..f3636e2 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.1.3.2</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 03e6d70..76ad400 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.1.3.2</version> + <version>3.2-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