branch master updated (0aba4be5 -> de343380)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git from 0aba4be5 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' adds aeffae12 [jgitflow-maven-plugin]updating poms for 2.12.1-SNAPSHOT development adds 94d134cf [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 13b669e0 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 9d24d16b [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 17beaa16 Fix connection provider closing adds 09986de7 fixes #2: Update libs adds 6820fc09 fixes #3: Update to Hibernate 5.2.11 adds 04ee7154 fixes #3: Update to Hibernate 5.2.16 adds 53ce9fc9 [jgitflow-maven-plugin]updating poms for branch'release/2.13' with non-snapshot versions adds de343380 [jgitflow-maven-plugin]merging 'release/2.13' into 'master' No new revisions were added by this update. Summary of changes: 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>.
participants (1)
-
nuiton.org scm