branch master updated (8a82ec4 -> 78c8c4b)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository topia. See http://git.nuiton.org/topia.git from 8a82ec4 [jgitflow-maven-plugin]merging 'release/2.9.5.5' into 'master' adds b868614 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d0641a8 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 450d0dd [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fe892c7 introduction du nouveau stéréotype IndexedCollection (refs #3694) adds 02ce2c3 fixes #3694: Introduction du stéréotype IndexedCollection dans Topia Merge branch 'feature/3694' into develop adds f46cee2 Fix collection type if indexedCollection stereotype is on (refs #3694) adds 2b19445 passage sur la snapshot (refs #3695) adds 882025b security model uses unsafe tag values (refs #3695) adds 3c4ac52 use eugene release version (refs #3695) adds 8fbf1a6 fixes #3695: Passage sur Eugene 3.0 Merge branch 'feature/3695' into develop adds a2e2ae5 use nuitponpom 2.1 (refs #3700) adds fcb4428 fixes #3700: Use nuitonpom 2.1 Merge branch 'feature/3700' into develop adds e00677f [jgitflow-maven-plugin]updating poms for branch'release/2.10' with non-snapshot versions adds a3b51dc fix it eugene invocation adds 78c8c4b [jgitflow-maven-plugin]merging 'release/2.10' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 6 +-- topia-persistence/pom.xml | 2 +- topia-persistence/src/it/ANOMALIE-1640/pom.xml | 3 +- .../generator/EntityHibernateMappingGenerator.java | 10 ++-- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 61 ++++++---------------- .../nuiton/topia/generator/TopiaStereoTypes.java | 10 ++++ topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 4 +- 9 files changed, 41 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm