You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by na...@apache.org on 2021/11/10 12:54:09 UTC
[ignite] 02/02: IGNITE-15854 Removes documentation notes about
Ignite 2.10 and earlier support for spring-cache and spring-tx
integrations. (#9546)
This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch ignite-2.11
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 65f25703cf9f60fa4c8f69335fa2b7b452bf1577
Author: Mikhail Petrov <32...@users.noreply.github.com>
AuthorDate: Mon Nov 1 14:15:11 2021 +0300
IGNITE-15854 Removes documentation notes about Ignite 2.10 and earlier support for spring-cache and spring-tx integrations. (#9546)
(cherry picked from commit d011f8e5be917d4285c2678e0a6f45fdb42e6039)
---
.../spring/spring-caching.adoc | 83 ++++++++++++++------
.../spring/spring-tx.adoc | 89 ++++++++++++++++------
2 files changed, 124 insertions(+), 48 deletions(-)
diff --git a/docs/_docs/extensions-and-integrations/spring/spring-caching.adoc b/docs/_docs/extensions-and-integrations/spring/spring-caching.adoc
index 437c467..343c07e 100644
--- a/docs/_docs/extensions-and-integrations/spring/spring-caching.adoc
+++ b/docs/_docs/extensions-and-integrations/spring/spring-caching.adoc
@@ -32,17 +32,9 @@ Apache Ignite cluster and perform data caching.
If you use Maven to manage dependencies in your project, you can add Apache Ignite Spring Cache extension
dependencies to the application's `pom.xml` file like this:
-[NOTE]
-====
-For Apache Ignite 2.10.0 and earlier the `ignite-spring-cache-ext` dependency must be added to
-classpath before `ignite-spring`, due to duplication of Spring Cache integration classes. If you use Maven
-to manage dependencies, place `ignite-spring-cache-ext` before the `ignite-spring` dependency in the
-application's `pom.xml` file.
-====
-
[tabs]
--
-tab:pom.xml[]
+tab: For all Apache Ignite versions since 2.12.0[]
[source,xml]
----
<dependency>
@@ -57,20 +49,6 @@ tab:pom.xml[]
<version>${ignite.version}</version>
</dependency>
-<!-- Note, that 'ignite-spring' depends on version of Spring dependencies, that may conflict with version of Spring
- dependencies used in your project. It is safe to exclude Spring dependencies from 'ignite-spring' and add them
- with version updated to match the Spring version used in your project.
-
- For Apache Ignite 2.11.0 and earlier the following list of Spring dependencies must be excluded to
- avoid possible Spring version conflicts:
- - 'spring-core'
- - 'spring-aop'
- - 'spring-context'
- - 'spring-expressions'
- - 'spring-beans'
- - 'spring-jdbc'
- - 'spring-tx'
- -->
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
@@ -83,7 +61,64 @@ tab:pom.xml[]
</exclusions>
</dependency>
- <dependency>
+<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+</dependency>
+----
+tab:For Apache Ignite 2.11.0[]
+[source,xml]
+----
+<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring-cache-ext</artifactId>
+ <version>${ignite-spring-cache-ext.version}</version>
+</dependency>
+
+<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-core</artifactId>
+ <version>${ignite.version}</version>
+</dependency>
+
+<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring</artifactId>
+ <version>${ignite.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </exclusion>
+ </exclusions>
+</dependency>
+
+<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
diff --git a/docs/_docs/extensions-and-integrations/spring/spring-tx.adoc b/docs/_docs/extensions-and-integrations/spring/spring-tx.adoc
index af9ec08..442b03d 100644
--- a/docs/_docs/extensions-and-integrations/spring/spring-tx.adoc
+++ b/docs/_docs/extensions-and-integrations/spring/spring-tx.adoc
@@ -36,17 +36,9 @@ of implementation depends on your preferable way to access the Apache Ignite clu
If you use Maven to manage dependencies in your project, you can add Spring Transactions extension dependencies to
the application's `pom.xml` file like this:
-[NOTE]
-====
-For Apache Ignite 2.10.0 and earlier the `ignite-spring-tx-ext` dependency must be added to
-classpath before `ignite-spring`, due to duplication of Spring Transactions integration classes. If you use Maven
-to manage dependencies, place `ignite-spring-tx-ext` before the `ignite-spring` dependency in the
-application's `pom.xml` file.
-====
-
[tabs]
--
-tab:pom.xml[]
+tab:For all Apache Ignite versions since 2.12.0[]
[source,xml]
----
<dependency>
@@ -61,20 +53,6 @@ tab:pom.xml[]
<version>${ignite.version}</version>
</dependency>
-<!-- Note, that 'ignite-spring' depends on version of Spring dependencies, that may conflict with version of Spring
- dependencies used in your project. It is safe to exclude Spring dependencies from 'ignite-spring' and add them
- with version updated to match the Spring version used in your project.
-
- For Apache Ignite 2.11.0 and earlier the following list of Spring dependencies must be excluded to
- avoid possible Spring versions conflicts:
- - 'spring-core'
- - 'spring-aop'
- - 'spring-context'
- - 'spring-expressions'
- - 'spring-beans'
- - 'spring-jdbc'
- - 'spring-tx'
- -->
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
@@ -87,7 +65,70 @@ tab:pom.xml[]
</exclusions>
</dependency>
- <dependency>
+<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+</dependency>
+
+<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+</dependency>
+----
+tab: For Apache Ignite 2.11.0[]
+[source,xml]
+----
+<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring-tx-ext</artifactId>
+ <version>${ignite-spring-tx-ext.version}</version>
+</dependency>
+
+<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-core</artifactId>
+ <version>${ignite.version}</version>
+</dependency>
+
+<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring</artifactId>
+ <version>${ignite.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </exclusion>
+ </exclusions>
+</dependency>
+
+<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>