[topia] branch develop updated (f287155 -> faae193)
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 f287155 Removes usages of 'dto' and 'dao' stereotypes (fixes #2081) new c75989a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9e247d0 [jgitflow-maven-plugin]updating poms for branch '3.0-beta-14' with snapshot versions new 9fbe575 [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-14' with non-snapshot versions new cd5ad25 Merge branch 'release/3.0-beta-14' new 7f5acd2 Merge branch 'master' into develop new faae193 [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 faae1938240da2b74973eeaddbc86e0abee7789c Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:20 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7f5acd297003b75844937ff7f7d6112063167f97 Merge: c75989a cd5ad25 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:19 2014 +0200 Merge branch 'master' into develop commit c75989a94473a870b393d5d7fa5be4b52bafae23 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:18 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cd5ad258a84e687f3aec1572291a0b0332bf34f8 Merge: e99abdf 9fbe575 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:14 2014 +0200 Merge branch 'release/3.0-beta-14' commit 9fbe575aee3c11c7a3780a95f65b0bd42d86935b Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:51:38 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-14' 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. See http://git.nuiton.org/topia.git commit 9fbe575aee3c11c7a3780a95f65b0bd42d86935b Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:51:38 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-14' with non-snapshot versions --- 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 a46b130..a70d262 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index cfa0ae8..c96005b 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 9e963d7..5e5c305 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 8ebc981..9ffcba5 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index fdfdbd7..c2cbca0 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 42cb308..8e0b732 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 4cf276a..0cdc47f 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 9ed49f8..2b774b3 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 717d9ed..bc53909 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 278f2af..36e1914 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.0-beta-14-SNAPSHOT</version> + <version>3.0-beta-14</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 cd5ad258a84e687f3aec1572291a0b0332bf34f8 Merge: e99abdf 9fbe575 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:14 2014 +0200 Merge branch 'release/3.0-beta-14' pom.xml | 2 +- topia-it/pom.xml | 2 +- .../topiatest/AbstractExtraDAOEntityTopiaDao.java | 39 -- ...Contact2TopiaDao.java => Contact2TopiaDao.java} | 6 +- topia-it/src/main/xmi/topia-it-legacy.zargo | Bin 25927 -> 24499 bytes .../topia/it/legacy/TopiaJpaSupportTest.java | 39 +- .../it/legacy/evo3396/FetchPropertiesTest.java | 3 +- .../topia/persistence/internal/TopiaDaoTest.java | 33 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../topia/persistence/HqlAndParametersBuilder.java | 5 - .../persistence/QueryMissingOrderException.java | 13 + .../persistence/internal/AbstractTopiaDao.java | 43 +- .../internal/support/HibernateTopiaJpaSupport.java | 42 +- .../topia/persistence/support/TopiaJpaSupport.java | 22 +- 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 +- .../org/nuiton/topia/templates/DTOTransformer.java | 480 --------------------- .../topia/templates/EntityDaoTransformer.java | 228 +--------- .../nuiton/topia/templates/EntityTransformer.java | 7 +- .../nuiton/topia/templates/TopiaGeneratorUtil.java | 20 - .../nuiton/topia/templates/TopiaStereoTypes.java | 56 --- .../topia/templates/TopiaTemplateHelper.java | 24 +- 27 files changed, 172 insertions(+), 908 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 c75989a94473a870b393d5d7fa5be4b52bafae23 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:18 2014 +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 fc60c8e..a70d262 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-14</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 587e7b4..c96005b 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 15b61dd..5e5c305 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index dd52c6e..9ffcba5 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 86543ac..c2cbca0 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 630653f..8e0b732 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 4cd26ac..0cdc47f 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index dea028b..2b774b3 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 70820ca..bc53909 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.0-SNAPSHOT</version> + <version>3.0-beta-14</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 47294e4..36e1914 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.0-SNAPSHOT</version> + <version>3.0-beta-14</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 7f5acd297003b75844937ff7f7d6112063167f97 Merge: c75989a cd5ad25 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:19 2014 +0200 Merge branch '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. See http://git.nuiton.org/topia.git commit faae1938240da2b74973eeaddbc86e0abee7789c Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 17 14:55:20 2014 +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 a70d262..fc60c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-beta-14</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index c96005b..587e7b4 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 5e5c305..15b61dd 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 9ffcba5..dd52c6e 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index c2cbca0..86543ac 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 8e0b732..630653f 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 0cdc47f..4cd26ac 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 2b774b3..dea028b 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index bc53909..70820ca 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.0-beta-14</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 36e1914..47294e4 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.0-beta-14</version> + <version>3.0-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