branch develop updated (b68a7c6 -> 9bf45e0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from b68a7c6 Merge branch 'feature/7631' into 'develop' Librable #7631. See merge request !2 new ec3dc31 Mise à jour de spring en 4.2.3.RELEASE (See #7801) new cc71889 Revert "Mise à jour de yamlbeans en 1.09 (See #7801)" new 9bf45e0 Revert "Mise à jour de batik en 1.8 (See #7801)" The 3 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 9bf45e03c30b7b3ac3784ee875a4aa9214cc323c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 12 08:27:17 2015 +0100 Revert "Mise à jour de batik en 1.8 (See #7801)" This reverts commit 933bc1a42e2e8320dfa1a1be688fdd0d41bebf19. commit cc718897afeb10b1eb7ed77e61065f7242a0694f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 11 19:40:52 2015 +0100 Revert "Mise à jour de yamlbeans en 1.09 (See #7801)" On ne peut pas utiliser la version 1.09, elle ne fonctionne pas sur les booleans. This reverts commit f6a82a5ac5d81bd3eb30cfc2af767207ed8931d8. commit ec3dc31f9b6a47c3bc1d700d121ed1b76b7ceb73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 5 15:09:44 2015 +0100 Mise à jour de spring en 4.2.3.RELEASE (See #7801) Summary of changes: pom.xml | 28 +++++++++++++++++++++++++--- tutti-persistence/pom.xml | 6 ++++++ tutti-ui-swing/pom.xml | 18 ++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ec3dc31f9b6a47c3bc1d700d121ed1b76b7ceb73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 5 15:09:44 2015 +0100 Mise à jour de spring en 4.2.3.RELEASE (See #7801) --- pom.xml | 24 +++++++++++++++++++++++- tutti-persistence/pom.xml | 6 ++++++ tutti-ui-swing/pom.xml | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2adef7e..de12ac4 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ <adagioVersion>3.8.6.3</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.7.Final</hibernateVersion> - <springVersion>4.1.4.RELEASE</springVersion> + <springVersion>4.2.3.RELEASE</springVersion> <hsqldbVersion>1.8.1.3</hsqldbVersion> <batikVersion>1.8</batikVersion> <xmlApisVersion>1.3.04</xmlApisVersion> @@ -442,6 +442,28 @@ <scope>provided</scope> </dependency> + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${springVersion}</version> + <scope>provided</scope> + </dependency> + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${springVersion}</version> + <scope>provided</scope> + </dependency> + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${springVersion}</version> + <scope>provided</scope> + </dependency> + <!-- Birt --> <dependency> <groupId>org.eclipse.birt.runtime</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 36b1a1b..d3f912b 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -74,6 +74,12 @@ <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> </dependency> + + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 30d513c..604319c 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -266,6 +266,24 @@ <artifactId>spring-tx</artifactId> <scope>runtime</scope> </dependency> + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Utilisé par adagio pour que les versions de spring sont syncho --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <scope>runtime</scope> + </dependency> <!-- Logging --> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm