branch develop updated (db12af0 -> 4025472)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from db12af0 [jgitflow-maven-plugin]updating poms for 2.11-SNAPSHOT development new bd94029 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e00677f [jgitflow-maven-plugin]updating poms for branch'release/2.10' with non-snapshot versions new a3b51dc fix it eugene invocation new 78c8c4b [jgitflow-maven-plugin]merging 'release/2.10' into 'master' new 8494e52 [jgitflow-maven-plugin]merging 'master' into 'develop' new 4025472 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 402547286335e5fa4c739fa996fa0ad18522ef1b Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:23 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 8494e52bdc9a7a636c8db6dd3458fde29b5c5559 Merge: bd94029 78c8c4b Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:23 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit bd9402997ac4a9e22d15532badd7239b0f2593d5 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:22 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 78c8c4b909a26be232117c5f19ddc149370d9d4c Merge: 8a82ec4 a3b51dc Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:17 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.10' into 'master' commit a3b51dcb620c94f54f4ca4841b99cdfa15e372e5 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:11:55 2015 +0000 fix it eugene invocation commit e00677fc5093d20a0cae7f42db97dc9750473a1f Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:02:09 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.10' with non-snapshot versions Summary of changes: topia-persistence/src/it/ANOMALIE-1640/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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 http://git.nuiton.org/topia.git commit e00677fc5093d20a0cae7f42db97dc9750473a1f Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:02:09 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.10' with non-snapshot versions --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index db55dcf..d4896e0 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.10</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 0c5dc84..ae1db61 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.10-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index c1ca805..e5874c7 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.10-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 200bded..5a0eea7 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.10-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 5af3e38..4e27a31 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.10</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 http://git.nuiton.org/topia.git commit a3b51dcb620c94f54f4ca4841b99cdfa15e372e5 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:11:55 2015 +0000 fix it eugene invocation --- topia-persistence/src/it/ANOMALIE-1640/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/topia-persistence/src/it/ANOMALIE-1640/pom.xml b/topia-persistence/src/it/ANOMALIE-1640/pom.xml index 370034e..2efc8e4 100644 --- a/topia-persistence/src/it/ANOMALIE-1640/pom.xml +++ b/topia-persistence/src/it/ANOMALIE-1640/pom.xml @@ -113,6 +113,7 @@ <configuration> <inputs>zargo</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <failIfUnsafe>false</failIfUnsafe> </configuration> <executions> <execution> @@ -128,7 +129,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> -- 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 http://git.nuiton.org/topia.git commit 78c8c4b909a26be232117c5f19ddc149370d9d4c Merge: 8a82ec4 a3b51dc Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:17 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.10' into 'master' 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit bd9402997ac4a9e22d15532badd7239b0f2593d5 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:22 2015 +0000 [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 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index eb6cb75..d4896e0 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.10</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index d3fb40e..ae1db61 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.11-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index a3510cc..e5874c7 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.11-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 5d7b4cd..5a0eea7 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.11-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 692efa5..4e27a31 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.10</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 http://git.nuiton.org/topia.git commit 8494e52bdc9a7a636c8db6dd3458fde29b5c5559 Merge: bd94029 78c8c4b Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:23 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' topia-persistence/src/it/ANOMALIE-1640/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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 http://git.nuiton.org/topia.git commit 402547286335e5fa4c739fa996fa0ad18522ef1b Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 17:15:23 2015 +0000 [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 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d4896e0..eb6cb75 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.10</version> + <version>2.11-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index ae1db61..d3fb40e 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.10</version> + <version>2.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index e5874c7..a3510cc 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.10</version> + <version>2.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 5a0eea7..5d7b4cd 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.10</version> + <version>2.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 4e27a31..692efa5 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.10</version> + <version>2.11-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