Repository: ignite Updated Branches: refs/heads/master 7988b6017 -> 25e11e16b
IGNITE-8931 Spring Framework versions upgraded Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25e11e16 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25e11e16 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25e11e16 Branch: refs/heads/master Commit: 25e11e16b92ceea3866cc2a2b5da83bc1db1f159 Parents: 7988b60 Author: Andrey Gura <ag...@apache.org> Authored: Wed Jul 4 22:36:38 2018 +0300 Committer: Andrey Gura <ag...@apache.org> Committed: Thu Jul 5 14:44:53 2018 +0300 ---------------------------------------------------------------------- modules/spring-data/pom.xml | 8 ++++++++ parent/pom.xml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/25e11e16/modules/spring-data/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring-data/pom.xml b/modules/spring-data/pom.xml index 95605c6..6310be1 100644 --- a/modules/spring-data/pom.xml +++ b/modules/spring-data/pom.xml @@ -64,6 +64,14 @@ <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/25e11e16/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 278c59f..478b917 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -113,9 +113,9 @@ <spark.hadoop.version>2.6.5</spark.hadoop.version> <spark.version>2.3.0</spark.version> <spring.data.version>1.13.11.RELEASE</spring.data.version> <!-- don't forget to update spring version --> - <spring.version>4.3.7.RELEASE</spring.version><!-- don't forget to update spring-data version --> + <spring.version>4.3.16.RELEASE</spring.version><!-- don't forget to update spring-data version --> <spring.data-2.0.version>2.0.6.RELEASE</spring.data-2.0.version> <!-- don't forget to update spring-5.0 version --> - <spring-5.0.version>5.0.4.RELEASE</spring-5.0.version><!-- don't forget to update spring-data-2.0 version --> + <spring-5.0.version>5.0.5.RELEASE</spring-5.0.version><!-- don't forget to update spring-data-2.0 version --> <spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version> <storm.version>1.1.1</storm.version> <tomcat.version>8.0.23</tomcat.version>
