[A - Fixes #4754. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcbd297b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcbd297b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcbd297b Branch: refs/heads/ignite-7251 Commit: fcbd297bf8f11a2eecdd225515da87023a27cf00 Parents: 02792e5 Author: Dmitriy Pavlov <dpav...@apache.org> Authored: Thu Sep 13 20:42:04 2018 +0300 Committer: Dmitriy Pavlov <dpav...@apache.org> Committed: Thu Sep 13 20:42:04 2018 +0300 ---------------------------------------------------------------------- modules/spring-data-2.0/pom.xml | 34 +++++++++++++++++++++++++++++++++- parent/pom.xml | 8 ++++---- 2 files changed, 37 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fcbd297b/modules/spring-data-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring-data-2.0/pom.xml b/modules/spring-data-2.0/pom.xml index 53cb254..0751389 100644 --- a/modules/spring-data-2.0/pom.xml +++ b/modules/spring-data-2.0/pom.xml @@ -77,10 +77,30 @@ <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> </exclusion> - <exclusion> + <exclusion> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + </exclusion> </exclusions> </dependency> @@ -98,6 +118,18 @@ </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring-5.0.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring-5.0.version}</version> + </dependency> + + <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/ignite/blob/fcbd297b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 187eb0d..d91bb86 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -110,10 +110,10 @@ <slf4j16.version>1.6.4</slf4j16.version> <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.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.5.RELEASE</spring-5.0.version><!-- don't forget to update spring-data-2.0 version --> + <spring.data.version>1.13.14.RELEASE</spring.data.version> <!-- don't forget to update spring version --> + <spring.version>4.3.18.RELEASE</spring.version><!-- don't forget to update spring-data version --> + <spring.data-2.0.version>2.0.9.RELEASE</spring.data-2.0.version> <!-- don't forget to update spring-5.0 version --> + <spring-5.0.version>5.0.8.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>9.0.10</tomcat.version>
