You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/05/25 15:02:02 UTC
ignite git commit: IGNITE-8480 Broken Ignite Examples test Support
Spring Data 2.0 - Fixes #4046.
Repository: ignite
Updated Branches:
refs/heads/master 94c60f5c3 -> 7df2872ca
IGNITE-8480 Broken Ignite Examples test Support Spring Data 2.0 - Fixes #4046.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7df2872c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7df2872c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7df2872c
Branch: refs/heads/master
Commit: 7df2872ca3eb4bae776b012bbed43de027289909
Parents: 94c60f5
Author: Roman_Meerson <Ro...@epam.com>
Authored: Fri May 25 18:01:28 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Fri May 25 18:01:28 2018 +0300
----------------------------------------------------------------------
examples/pom.xml | 16 +++++++++++-----
modules/spring-data-2.0/pom.xml | 24 ++++++++++++++++++++++++
parent/pom.xml | 3 ++-
3 files changed, 37 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7df2872c/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 872f52b..21df3df 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -46,6 +46,17 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
<version>${project.version}</version>
+ <!--Remove exclusion while upgrading ignite-spring version to 5.0-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -59,11 +70,6 @@
<artifactId>ignite-indexing</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-ml</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
http://git-wip-us.apache.org/repos/asf/ignite/blob/7df2872c/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 dc56fcb..cbc01a0 100644
--- a/modules/spring-data-2.0/pom.xml
+++ b/modules/spring-data-2.0/pom.xml
@@ -71,6 +71,30 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
<version>${project.version}</version>
+ <!--Remove exclusion while upgrading ignite-spring version to 5.0-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--Remove spring-core and spring-beans dependencies while upgrading ignite-spring version to 5.0-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-5.0.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring-5.0.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/7df2872c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fb5eb52..768d382 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,8 @@
<spark.version>2.2.0</spark.version>
<spring.data.version>1.13.1.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.data-2.0.version>2.0.5.RELEASE</spring.data-2.0.version> <!-- don't forget to update spring version -->
+ <spring.data-2.0.version>2.0.5.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 -->
<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>