branch develop updated (12d8aed -> 3aca94a)
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 12d8aed fixes #3672: Can't delete some n-n association Merge branch 'feature/3672' into develop new a95d061 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 20e8d8a [jgitflow-maven-plugin]updating poms for branch '2.9.5.1' with snapshot versions new 25e59bf [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.1' with non-snapshot versions new dfe35b1 Merge branch 'release/2.9.5.1' new 2ce2984 Merge branch 'master' into develop new 3aca94a [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 3aca94aae23d75a21ae85e7ddce70e6685f8f569 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:54 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2ce2984ce88ed2631ee36acef1cb7f3b1ddff971 Merge: a95d061 dfe35b1 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:54 2015 +0000 Merge branch 'master' into develop commit a95d061cd46ec1efb58524c45ce89b087b8f5364 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:54 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit dfe35b1d0a0cb6e5411c8da834a65d623d8704d5 Merge: 2249b90 25e59bf Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:52 2015 +0000 Merge branch 'release/2.9.5.1' commit 25e59bfb4bd5e250d05c77ccc4904bd9401d8beb Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:24:23 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.1' 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 25e59bfb4bd5e250d05c77ccc4904bd9401d8beb Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:24:23 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.1' 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 f95805a..55804ba 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.1-SNAPSHOT</version> + <version>2.9.5.1</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 269c1f9..82b8f9a 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.9.5.1-SNAPSHOT</version> + <version>2.9.5.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 80fc305..5fb0fb3 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.9.5.1-SNAPSHOT</version> + <version>2.9.5.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 25f784a..182a27f 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.9.5.1-SNAPSHOT</version> + <version>2.9.5.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index df89375..fa9bcba 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.9.5.1-SNAPSHOT</version> + <version>2.9.5.1</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 dfe35b1d0a0cb6e5411c8da834a65d623d8704d5 Merge: 2249b90 25e59bf Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:52 2015 +0000 Merge branch 'release/2.9.5.1' pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../nuiton/topia/generator/EntityDAOTransformer.java | 18 ++++++++++++------ topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 6 files changed, 17 insertions(+), 11 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 a95d061cd46ec1efb58524c45ce89b087b8f5364 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:54 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 0c201ac..55804ba 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.9.5.1</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 0c5dc84..82b8f9a 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.9.5.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index c1ca805..5fb0fb3 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.9.5.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 200bded..182a27f 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.9.5.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index e3e9608..fa9bcba 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.9.5.1</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 2ce2984ce88ed2631ee36acef1cb7f3b1ddff971 Merge: a95d061 dfe35b1 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:54 2015 +0000 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 3aca94aae23d75a21ae85e7ddce70e6685f8f569 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 05:26:54 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 55804ba..0c201ac 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.1</version> + <version>2.10-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 82b8f9a..0c5dc84 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.9.5.1</version> + <version>2.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 5fb0fb3..c1ca805 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.9.5.1</version> + <version>2.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 182a27f..200bded 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.9.5.1</version> + <version>2.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index fa9bcba..e3e9608 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.9.5.1</version> + <version>2.10-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