branch develop updated (6e7f0871 -> dd8585c8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git from 6e7f0871 [jgitflow-maven-plugin]updating poms for 2.14-SNAPSHOT development new 8da7bb2e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 53ce9fc9 [jgitflow-maven-plugin]updating poms for branch'release/2.13' with non-snapshot versions new de343380 [jgitflow-maven-plugin]merging 'release/2.13' into 'master' new 5e2cd17e [jgitflow-maven-plugin]merging 'master' into 'develop' new dd8585c8 [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 dd8585c80478f4f386ce051f6b487a907407c7b4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:14 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5e2cd17eb66072f5aa10b4974aa7cdccab26cdcd Merge: 8da7bb2e de343380 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:14 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8da7bb2e30295c93453d63fa36da2c66c863c5f1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:13 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit de343380efd14c0d40636904631ca7195d309623 Merge: 0aba4be5 53ce9fc9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:12 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.13' into 'master' commit 53ce9fc996b690b2f1d3008e1e7f1a65125011a5 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:01:53 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.13' with non-snapshot versions Summary of changes: -- 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-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit de343380efd14c0d40636904631ca7195d309623 Merge: 0aba4be5 53ce9fc9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:12 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.13' into 'master' pom.xml | 24 +++-- topia-persistence/pom.xml | 6 +- .../topia/framework/TopiaConnectionProvider.java | 2 +- .../nuiton/topia/framework/TopiaContextImpl.java | 105 +++++++++++---------- .../java/org/nuiton/topia/framework/TopiaUtil.java | 7 +- .../topia/generator/DAOAbstractTransformer.java | 2 +- .../topia/generator/EntityDAOTransformer.java | 4 +- .../nuiton/topia/persistence/util/DBMapping.java | 3 +- .../nuiton/topia/persistence/NaturalIdTest.java | 3 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- 11 files changed, 93 insertions(+), 67 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-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit 8da7bb2e30295c93453d63fa36da2c66c863c5f1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:13 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5917a06e..55e52eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.14-SNAPSHOT</version> + <version>2.13</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index e0912033..67f760a8 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 59e24c52..73c2e6d1 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>2.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 9a486266..37debf73 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>2.14-SNAPSHOT</version> + <version>2.13</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-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit 5e2cd17eb66072f5aa10b4974aa7cdccab26cdcd Merge: 8da7bb2e de343380 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:14 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit dd8585c80478f4f386ce051f6b487a907407c7b4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 3 14:05:14 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 55e52eb3..5917a06e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.13</version> + <version>2.14-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 67f760a8..e0912033 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 73c2e6d1..59e24c52 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>2.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 37debf73..9a486266 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>2.13</version> + <version>2.14-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