Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Commit 9bdef54

Browse files
gregturngregturn
committed
Upgrade to support Spring Boot 2.2.
* Remove unused profiles and plugins from the build. * Update the main README.
1 parent 54fa3f9 commit 9bdef54

File tree

3 files changed

+56
-191
lines changed

3 files changed

+56
-191
lines changed

‎README.adoc

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,67 +17,64 @@ as possible.
1717
Check the matrix below to see the status of supported versions:
1818

1919
.Spring Session for MongoDB Status
20-
[cols=3]
20+
[cols=4]
2121
|===
22-
| Job | `master` branch (`2.1`) | `2.0.x` branch (`2.0.x`)
22+
| Job | `master` branch (`2.2`) | `2.1.x` | `2.0.x`
2323

2424
| Test - JDK 8
2525
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
26+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"]
2627
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
2728

28-
| Test - JDK 8 and Spring.NEXT
29+
| Test - JDK 8 and Spring.NEXT (snapshots)
2930
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
31+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"]
3032
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
3133

32-
| Test - JDK 8 and Spring.NEXT 5.1
33-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
34-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
35-
36-
| Test - JDK 8 and Spring Data.NEXT
37-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%208%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
38-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%208%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
39-
4034
| Test - JDK 11
4135
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
42-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
36+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"]
37+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"] *
4338

44-
| Test - JDK 11 and Spring.NEXT
39+
| Test - JDK 11 and Spring.NEXT (snapshots)
4540
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
46-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
47-
48-
| Test - JDK 11 and Spring.NEXT 5.1
49-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
50-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
51-
52-
| Test - JDK 11 and Spring Data.NEXT
53-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2011%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
54-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
41+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"]
42+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"] *
5543

5644
| Test - JDK 13*
57-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
58-
|
59-
60-
| Test - JDK 13* and Spring.NEXT
61-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
62-
|
63-
64-
| Test - JDK 13* and Spring.NEXT 5.1
65-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
45+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"] *
46+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"] *
6647
|
6748

68-
| Test - JDK 13* and Spring Data.NEXT
69-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
49+
| Test - JDK 13* and Spring.NEXT (snapshots)
50+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"] *
51+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Test%20-%20JDK%2013%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"] *
7052
|
7153

7254
| Build - Release to repo.spring.io
7355
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
56+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.1.x"]
7457
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
58+
59+
| _* Not officially supported_
60+
|
61+
|
62+
|
7563
|===
7664

77-
IMPORTANT: Spring Session for MongoDB 2.1 runs on Spring Framework 5.1, which has support for *JDK 11*. Spring Session for MongoDB 2.0.x runs on Spring Framework 5.0 and is NOT supported on *JDK 11* despite our pipelines testing against it. The extra
78-
tests are designed to give you a smooth upgrade path. If you are going into production on JDK 11, should need to be using Spring Session for MongoDB 2.1.
65+
[IMPORTANT]
66+
====
67+
* Spring Session for MongoDB 2.2 runs on Spring Framework 5.2.
68+
* Spring Session for MongoDB 2.1 runs on Spring Framework 5.1.
69+
70+
Both of these have support for *JDK 11*.
71+
72+
Spring Session for MongoDB *2.0* runs on Spring Framework 5.0 and is NOT supported on *JDK 11* despite
73+
our pipelines testing against it. The extra tests are designed to give you a smooth upgrade path. If you are going into production on
74+
JDK 11, you should be using at least Spring Session for MongoDB *2.1*.
75+
====
7976

80-
IMPORTANT: *JDK 12* is Java's latest version and is unstable. We are testing against it to catch issues early on, but don't support it directly on any version of Spring Session for MongoDB.
77+
IMPORTANT: *JDK 13* is Java's latest version and is unstable. We are testing against it to catch issues early on, but don't support it directly on any version of Spring Session for MongoDB.
8178

8279
== Building Spring Session MongoDB
8380

‎pom.xml

Lines changed: 21 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
<groupId>org.springframework.session</groupId>
66
<artifactId>spring-session-data-mongodb</artifactId>
7-
<version>2.1.3.BUILD-SNAPSHOT</version>
7+
<version>2.2.0.BUILD-SNAPSHOT</version>
88

99
<name>Spring Session MongoDB</name>
1010
<url>https://spring.io/projects/spring-session-data-mongodb</url>
1111
<description>
1212
Persist session data in MongoDB
1313
</description>
1414

15-
<inceptionYear>2014-2018</inceptionYear>
15+
<inceptionYear>2014-2019</inceptionYear>
1616

1717
<organization>
1818
<name>Pivotal, Inc.</name>
@@ -47,7 +47,7 @@
4747
<name>Apache License, Version 2.0</name>
4848
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
4949
<comments>
50-
Copyright 2011-2018 the original author or authors.
50+
Copyright 2011-2019 the original author or authors.
5151

5252
Licensed under the Apache License, Version 2.0 (the "License");
5353
you may not use this file except in compliance with the License.
@@ -69,21 +69,21 @@
6969
<source.level>1.8</source.level>
7070
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7171

72-
<assertj.version>3.9.1</assertj.version>
73-
<flapdoodle.version>1.50.5</flapdoodle.version>
72+
<assertj.version>3.12.2</assertj.version>
73+
<flapdoodle.version>2.2.0</flapdoodle.version>
7474
<hamcrest.version>1.3</hamcrest.version>
75-
<jackson.version>2.9.1</jackson.version>
75+
<jackson.version>2.9.8</jackson.version>
7676
<jsr305.version>3.0.2</jsr305.version>
7777
<junit.version>4.12</junit.version>
78-
<lombok.version>1.18.0</lombok.version>
79-
<mockito.version>2.18.3</mockito.version>
80-
<mongo.version>3.8.0</mongo.version>
81-
<mongo-reactivestreams.version>1.9.0</mongo-reactivestreams.version>
78+
<lombok.version>1.18.6</lombok.version>
79+
<mockito.version>2.25.1</mockito.version>
80+
<mongo.version>3.10.1</mongo.version>
81+
<mongo-reactivestreams.version>1.11.0</mongo-reactivestreams.version>
8282
<reactor.version>Californium-SR5</reactor.version>
83-
<spring.version>5.1.5.RELEASE</spring.version>
84-
<spring-data.version>Lovelace-SR5</spring-data.version>
83+
<spring.version>5.2.0.BUILD-SNAPSHOT</spring.version>
84+
<spring-data.version>Moore-M2</spring-data.version>
8585
<spring-security.version>5.1.4.RELEASE</spring-security.version>
86-
<spring-session.version>2.1.2.RELEASE</spring-session.version>
86+
<spring-session.version>2.2.0.BUILD-SNAPSHOT</spring-session.version>
8787
</properties>
8888

8989
<profiles>
@@ -92,10 +92,8 @@
9292
<id>spring-next</id>
9393
<properties>
9494
<reactor.version>Californium-BUILD-SNAPSHOT</reactor.version>
95-
<spring.version>5.1.6.BUILD-SNAPSHOT</spring.version>
96-
<spring-data.version>Lovelace-BUILD-SNAPSHOT</spring-data.version>
95+
<spring-data.version>Moore-BUILD-SNAPSHOT</spring-data.version>
9796
<spring-security.version>5.1.5.BUILD-SNAPSHOT</spring-security.version>
98-
<spring-session.version>2.1.3.BUILD-SNAPSHOT</spring-session.version>
9997
</properties>
10098
<repositories>
10199
<repository>
@@ -175,134 +173,7 @@
175173
</plugins>
176174
</build>
177175
</profile>
178-
179-
<profile>
180-
<id>gpg</id>
181-
182-
<properties>
183-
<gpg.useagent>true</gpg.useagent>
184-
</properties>
185-
186-
<build>
187-
<plugins>
188-
<plugin>
189-
<groupId>org.apache.maven.plugins</groupId>
190-
<artifactId>maven-gpg-plugin</artifactId>
191-
<version>1.6</version>
192-
<executions>
193-
<execution>
194-
<id>sign-artifact</id>
195-
<phase>verify</phase>
196-
<goals>
197-
<goal>sign</goal>
198-
</goals>
199-
</execution>
200-
</executions>
201-
</plugin>
202-
</plugins>
203-
</build>
204-
</profile>
205-
206-
<profile>
207-
<id>milestone</id>
208-
209-
<build>
210-
<plugins>
211-
<plugin>
212-
<groupId>org.jfrog.buildinfo</groupId>
213-
<artifactId>artifactory-maven-plugin</artifactId>
214-
<version>2.6.1</version>
215-
<inherited>false</inherited>
216-
<executions>
217-
<execution>
218-
<id>build-info</id>
219-
<goals>
220-
<goal>publish</goal>
221-
</goals>
222-
<configuration>
223-
<deployProperties>
224-
<archives>*:*:*:*@zip zip.name:spring-session-data-mongodb, zip.displayname:Spring Session MongoDB, zip.deployed:false</archives>
225-
</deployProperties>
226-
<publisher>
227-
<contextUrl>https://repo.spring.io</contextUrl>
228-
<username>{{USERNAME}}</username>
229-
<password>{{PASSWORD}}</password>
230-
<repoKey>libs-milestone-local</repoKey>
231-
<snapshotRepoKey>libs-snapshot-local</snapshotRepoKey>
232-
</publisher>
233-
</configuration>
234-
</execution>
235-
</executions>
236-
</plugin>
237-
</plugins>
238-
</build>
239-
</profile>
240-
241-
<profile>
242-
<id>release</id>
243-
244-
<build>
245-
<plugins>
246-
<plugin>
247-
<groupId>org.jfrog.buildinfo</groupId>
248-
<artifactId>artifactory-maven-plugin</artifactId>
249-
<version>2.6.1</version>
250-
<inherited>false</inherited>
251-
<executions>
252-
<execution>
253-
<id>build-info</id>
254-
<goals>
255-
<goal>publish</goal>
256-
</goals>
257-
<configuration>
258-
<deployProperties>
259-
<archives>*:*:*:*@zip zip.name:spring-session-data-mongodb, zip.displayname:Spring Session MongoDB, zip.deployed:false</archives>
260-
</deployProperties>
261-
<publisher>
262-
<contextUrl>https://repo.spring.io</contextUrl>
263-
<username>{{USERNAME}}</username>
264-
<password>{{PASSWORD}}</password>
265-
<repoKey>libs-release-local</repoKey>
266-
<snapshotRepoKey>libs-snapshot-local</snapshotRepoKey>
267-
</publisher>
268-
</configuration>
269-
</execution>
270-
</executions>
271-
</plugin>
272-
</plugins>
273-
</build>
274-
</profile>
275-
276-
<profile>
277-
<id>central</id>
278-
279-
<build>
280-
<plugins>
281-
<plugin>
282-
<groupId>org.apache.maven.plugins</groupId>
283-
<artifactId>maven-deploy-plugin</artifactId>
284-
<version>2.8.2</version>
285-
<configuration>
286-
<skip>false</skip>
287-
</configuration>
288-
</plugin>
289-
</plugins>
290-
</build>
291-
292-
<distributionManagement>
293-
<snapshotRepository>
294-
<id>sonatype-nexus-snapshots</id>
295-
<name>Sonatype Nexus Snapshots</name>
296-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
297-
</snapshotRepository>
298-
<repository>
299-
<id>sonatype-nexus-staging</id>
300-
<name>Nexus Release Repository</name>
301-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
302-
</repository>
303-
</distributionManagement>
304-
</profile>
305-
176+
306177
<profile>
307178
<id>docs</id>
308179

@@ -589,6 +460,12 @@
589460
<artifactId>mongodb-driver-reactivestreams</artifactId>
590461
<version>${mongo-reactivestreams.version}</version>
591462
<scope>test</scope>
463+
<exclusions>
464+
<exclusion>
465+
<groupId>org.mongodb</groupId>
466+
<artifactId>mongodb-driver-async</artifactId>
467+
</exclusion>
468+
</exclusions>
592469
</dependency>
593470

594471
<dependency>
@@ -602,14 +479,6 @@
602479

603480
<build>
604481

605-
<extensions>
606-
<extension>
607-
<groupId>org.apache.maven.wagon</groupId>
608-
<artifactId>wagon-ssh</artifactId>
609-
<version>2.5</version>
610-
</extension>
611-
</extensions>
612-
613482
<plugins>
614483
<plugin>
615484
<groupId>org.apache.maven.plugins</groupId>

‎src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void defaultSessionConverterShouldBeJdkWhenOnClasspath() throws IllegalAc
101101

102102
AbstractMongoSessionConverter converter = findMongoSessionConverter(repository);
103103

104-
assertThat(converter).extracting(AbstractMongoSessionConverter::getClass).contains(JdkMongoSessionConverter.class);
104+
assertThat(converter).isOfAnyClassIn(JdkMongoSessionConverter.class);
105105
}
106106

107107
@Test
@@ -116,8 +116,7 @@ public void overridingMongoSessionConverterWithBeanShouldWork() throws IllegalAc
116116

117117
AbstractMongoSessionConverter converter = findMongoSessionConverter(repository);
118118

119-
assertThat(converter).extracting(AbstractMongoSessionConverter::getClass)
120-
.contains(JacksonMongoSessionConverter.class);
119+
assertThat(converter).isOfAnyClassIn(JacksonMongoSessionConverter.class);
121120
}
122121

123122
@Test

0 commit comments

Comments
 (0)