Skip to content

Commit 65f2570

Browse files
petrov-mgNSAmelchev
petrov-mg
authored and
NSAmelchev
committed
IGNITE-15854 Removes documentation notes about Ignite 2.10 and earlier support for spring-cache and spring-tx integrations. (#9546)
(cherry picked from commit d011f8e)
1 parent 10d829b commit 65f2570

2 files changed

Lines changed: 124 additions & 48 deletions

File tree

‎docs/_docs/extensions-and-integrations/spring/spring-caching.adoc‎

Lines changed: 59 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,9 @@ Apache Ignite cluster and perform data caching.
3232
If you use Maven to manage dependencies in your project, you can add Apache Ignite Spring Cache extension
3333
dependencies to the application's `pom.xml` file like this:
3434

35-
[NOTE]
36-
====
37-
For Apache Ignite 2.10.0 and earlier the `ignite-spring-cache-ext` dependency must be added to
38-
classpath before `ignite-spring`, due to duplication of Spring Cache integration classes. If you use Maven
39-
to manage dependencies, place `ignite-spring-cache-ext` before the `ignite-spring` dependency in the
40-
application's `pom.xml` file.
41-
====
42-
4335
[tabs]
4436
--
45-
tab:pom.xml[]
37+
tab: For all Apache Ignite versions since 2.12.0[]
4638
[source,xml]
4739
----
4840
<dependency>
@@ -57,20 +49,6 @@ tab:pom.xml[]
5749
<version>${ignite.version}</version>
5850
</dependency>
5951
60-
<!-- Note, that 'ignite-spring' depends on version of Spring dependencies, that may conflict with version of Spring
61-
dependencies used in your project. It is safe to exclude Spring dependencies from 'ignite-spring' and add them
62-
with version updated to match the Spring version used in your project.
63-
64-
For Apache Ignite 2.11.0 and earlier the following list of Spring dependencies must be excluded to
65-
avoid possible Spring version conflicts:
66-
- 'spring-core'
67-
- 'spring-aop'
68-
- 'spring-context'
69-
- 'spring-expressions'
70-
- 'spring-beans'
71-
- 'spring-jdbc'
72-
- 'spring-tx'
73-
-->
7452
<dependency>
7553
<groupId>org.apache.ignite</groupId>
7654
<artifactId>ignite-spring</artifactId>
@@ -83,7 +61,64 @@ tab:pom.xml[]
8361
</exclusions>
8462
</dependency>
8563
86-
<dependency>
64+
<dependency>
65+
<groupId>org.springframework</groupId>
66+
<artifactId>spring-context</artifactId>
67+
<version>${spring.version}</version>
68+
</dependency>
69+
----
70+
tab:For Apache Ignite 2.11.0[]
71+
[source,xml]
72+
----
73+
<dependency>
74+
<groupId>org.apache.ignite</groupId>
75+
<artifactId>ignite-spring-cache-ext</artifactId>
76+
<version>${ignite-spring-cache-ext.version}</version>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>org.apache.ignite</groupId>
81+
<artifactId>ignite-core</artifactId>
82+
<version>${ignite.version}</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>org.apache.ignite</groupId>
87+
<artifactId>ignite-spring</artifactId>
88+
<version>${ignite.version}</version>
89+
<exclusions>
90+
<exclusion>
91+
<groupId>org.springframework</groupId>
92+
<artifactId>spring-context</artifactId>
93+
</exclusion>
94+
<exclusion>
95+
<groupId>org.springframework</groupId>
96+
<artifactId>spring-core</artifactId>
97+
</exclusion>
98+
<exclusion>
99+
<groupId>org.springframework</groupId>
100+
<artifactId>spring-aop</artifactId>
101+
</exclusion>
102+
<exclusion>
103+
<groupId>org.springframework</groupId>
104+
<artifactId>spring-expressions</artifactId>
105+
</exclusion>
106+
<exclusion>
107+
<groupId>org.springframework</groupId>
108+
<artifactId>spring-beans</artifactId>
109+
</exclusion>
110+
<exclusion>
111+
<groupId>org.springframework</groupId>
112+
<artifactId>spring-jdbc</artifactId>
113+
</exclusion>
114+
<exclusion>
115+
<groupId>org.springframework</groupId>
116+
<artifactId>spring-tx</artifactId>
117+
</exclusion>
118+
</exclusions>
119+
</dependency>
120+
121+
<dependency>
87122
<groupId>org.springframework</groupId>
88123
<artifactId>spring-context</artifactId>
89124
<version>${spring.version}</version>

‎docs/_docs/extensions-and-integrations/spring/spring-tx.adoc‎

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,9 @@ of implementation depends on your preferable way to access the Apache Ignite clu
3636
If you use Maven to manage dependencies in your project, you can add Spring Transactions extension dependencies to
3737
the application's `pom.xml` file like this:
3838

39-
[NOTE]
40-
====
41-
For Apache Ignite 2.10.0 and earlier the `ignite-spring-tx-ext` dependency must be added to
42-
classpath before `ignite-spring`, due to duplication of Spring Transactions integration classes. If you use Maven
43-
to manage dependencies, place `ignite-spring-tx-ext` before the `ignite-spring` dependency in the
44-
application's `pom.xml` file.
45-
====
46-
4739
[tabs]
4840
--
49-
tab:pom.xml[]
41+
tab:For all Apache Ignite versions since 2.12.0[]
5042
[source,xml]
5143
----
5244
<dependency>
@@ -61,20 +53,6 @@ tab:pom.xml[]
6153
<version>${ignite.version}</version>
6254
</dependency>
6355
64-
<!-- Note, that 'ignite-spring' depends on version of Spring dependencies, that may conflict with version of Spring
65-
dependencies used in your project. It is safe to exclude Spring dependencies from 'ignite-spring' and add them
66-
with version updated to match the Spring version used in your project.
67-
68-
For Apache Ignite 2.11.0 and earlier the following list of Spring dependencies must be excluded to
69-
avoid possible Spring versions conflicts:
70-
- 'spring-core'
71-
- 'spring-aop'
72-
- 'spring-context'
73-
- 'spring-expressions'
74-
- 'spring-beans'
75-
- 'spring-jdbc'
76-
- 'spring-tx'
77-
-->
7856
<dependency>
7957
<groupId>org.apache.ignite</groupId>
8058
<artifactId>ignite-spring</artifactId>
@@ -87,7 +65,70 @@ tab:pom.xml[]
8765
</exclusions>
8866
</dependency>
8967
90-
<dependency>
68+
<dependency>
69+
<groupId>org.springframework</groupId>
70+
<artifactId>spring-context</artifactId>
71+
<version>${spring.version}</version>
72+
</dependency>
73+
74+
<dependency>
75+
<groupId>org.springframework</groupId>
76+
<artifactId>spring-tx</artifactId>
77+
<version>${spring.version}</version>
78+
</dependency>
79+
----
80+
tab: For Apache Ignite 2.11.0[]
81+
[source,xml]
82+
----
83+
<dependency>
84+
<groupId>org.apache.ignite</groupId>
85+
<artifactId>ignite-spring-tx-ext</artifactId>
86+
<version>${ignite-spring-tx-ext.version}</version>
87+
</dependency>
88+
89+
<dependency>
90+
<groupId>org.apache.ignite</groupId>
91+
<artifactId>ignite-core</artifactId>
92+
<version>${ignite.version}</version>
93+
</dependency>
94+
95+
<dependency>
96+
<groupId>org.apache.ignite</groupId>
97+
<artifactId>ignite-spring</artifactId>
98+
<version>${ignite.version}</version>
99+
<exclusions>
100+
<exclusion>
101+
<groupId>org.springframework</groupId>
102+
<artifactId>spring-context</artifactId>
103+
</exclusion>
104+
<exclusion>
105+
<groupId>org.springframework</groupId>
106+
<artifactId>spring-core</artifactId>
107+
</exclusion>
108+
<exclusion>
109+
<groupId>org.springframework</groupId>
110+
<artifactId>spring-aop</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>org.springframework</groupId>
114+
<artifactId>spring-expressions</artifactId>
115+
</exclusion>
116+
<exclusion>
117+
<groupId>org.springframework</groupId>
118+
<artifactId>spring-beans</artifactId>
119+
</exclusion>
120+
<exclusion>
121+
<groupId>org.springframework</groupId>
122+
<artifactId>spring-jdbc</artifactId>
123+
</exclusion>
124+
<exclusion>
125+
<groupId>org.springframework</groupId>
126+
<artifactId>spring-tx</artifactId>
127+
</exclusion>
128+
</exclusions>
129+
</dependency>
130+
131+
<dependency>
91132
<groupId>org.springframework</groupId>
92133
<artifactId>spring-context</artifactId>
93134
<version>${spring.version}</version>

0 commit comments

Comments
 (0)